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"

diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index 889c1232aabbd768bc449876f48d45cfde997764..05b4a6e908a90dc4668cc5c5770f3a654450b86e 100644 (file)
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -17,7 +17,7 @@ Comment[fr]=Module externe pour le contrôle de version applicable aux vues de f
 Comment[gl]=Complemento de control de versión para vistas de ficheiros.
 Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez
 Comment[ia]=Plugin de controlo de version pro vistas de file
-Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas
+Comment[id]=Plugin Kendali Versi untuk Tampilan Berkas
 Comment[it]=Estensione di controllo delle versioni per le viste dei file
 Comment[ja]=ファイルビューのためのバージョン管理プラグイン
 Comment[ko]=파일 보기를 위한 버전 관리 플러그인