diff options
| author | l10n daemon script <[email protected]> | 2021-08-23 02:29:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-23 02:29:46 +0000 |
| commit | 696414069907b41f7738e3212ac0d68b58fed1bc (patch) | |
| tree | e8310c09c5892090b93d9878e3b89ceafce1c4cc /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 943af95605c480fef0f98cbfabbabdef04d743dc (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/versioncontrol/fileviewversioncontrolplugin.desktop')
| -rw-r--r-- | src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 26bee0bce..b82ac8483 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -49,5 +49,5 @@ Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi Comment[uk]=Додаток керування версіями для панелей перегляду файлів Comment[vi]=Phần cài cắm "Quản lí phiên bản" cho khung xem tệp Comment[x-test]=xxVersion Control Plugin for File Viewsxx -Comment[zh_CN]=文件视图的版本控制插件 +Comment[zh_CN]=文件视图的版本控制系统插件 Comment[zh_TW]=檔案檢視的版本控制外掛程式 |