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 de02ff90d46aadaf4e4f866402d7473e27224c91..380c0d831ed51eb57c5d1f56f12aaf5b864a9aed 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -127,6 +127,15 @@ GenericName[x-test]=xxFile Managerxx
 GenericName[zh_CN]=文件管理器
 GenericName[zh_TW]=檔案管理員
 Comment=Manage your files
+Comment[ca]=Gestioneu els fitxers
+Comment[ca@valencia]=Gestioneu els fitxers
+Comment[es]=Gestión de archivos
+Comment[eu]=Kudeatu zure fitxategiak
+Comment[ka]=მართეთ თქვენი ფაილები
+Comment[nl]=Uw bestanden beheren
+Comment[sl]=Upravlja vaše datoteke
+Comment[uk]=Керування вашими файлами
+Comment[x-test]=xxManage your filesxx
 MimeType=inode/directory;
 InitialPreference=10
 Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder;