diff options
| author | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
| commit | a1d5d75bea304aad11eb4ae08198f552e7f8f0a1 (patch) | |
| tree | e4a75d6715b1081995f1e4d76b2f7bd235e5c98c /src/views | |
| parent | 745fdeece31af9d9b7a64a0ad8cfc04d1a759864 (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index ec0bbbcd3..d2fd13dae 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -44,6 +44,7 @@ Comment[sr@latin]=Priključak upravljanja verzijama za fajl prikaze Comment[sv]=Insticksprogram för versionskontroll i filvyer Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi Comment[uk]=Додаток керування версіями для панелей перегляду файлів +Comment[vi]=Phần bổ sung Quản lí Phiên bản cho khung xem tập tin Comment[x-test]=xxVersion Control Plugin for File Viewsxx Comment[zh_CN]=文件视图的版本控制插件 Comment[zh_TW]=檔案檢視的版本控制外掛程式 |