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/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 98c7cae26ad7d2a252b20241cf0781b23dae5eee..d2285b61ff0d887cf90bbb650d617e22fadc8c53 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -144,6 +144,7 @@ Comment[ka]=მართეთ თქვენი ფაილები
 Comment[ko]=내 파일 관리
 Comment[nl]=Uw bestanden beheren
 Comment[pl]=Zarządzaj swoimi plikami
 Comment[ko]=내 파일 관리
 Comment[nl]=Uw bestanden beheren
 Comment[pl]=Zarządzaj swoimi plikami

+Comment[pt_BR]=Gerencie seus arquivos

 Comment[sl]=Upravlja vaše datoteke
 Comment[sv]=Hantera filer
 Comment[tr]=Dosyalarınızı yönetin
 Comment[sl]=Upravlja vaše datoteke
 Comment[sv]=Hantera filer
 Comment[tr]=Dosyalarınızı yönetin