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 380c0d831ed51eb57c5d1f56f12aaf5b864a9aed..1f90595dc4a188d50bde266ff42c0e07d0614ef2 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -131,11 +131,14 @@ Comment[ca]=Gestioneu els fitxers
 Comment[ca@valencia]=Gestioneu els fitxers
 Comment[es]=Gestión de archivos
 Comment[eu]=Kudeatu zure fitxategiak
+Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[nl]=Uw bestanden beheren
 Comment[sl]=Upravlja vaše datoteke
+Comment[tr]=Dosyalarınızı yönetin
 Comment[uk]=Керування вашими файлами
 Comment[x-test]=xxManage your filesxx
+Comment[zh_TW]=管理您的檔案
 MimeType=inode/directory;
 InitialPreference=10
 Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder;