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 232cc16006d1c6af01473e9542e39de5f31f4c09..de074fa4f77ff31935e8406622c122362bcad5a9 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -133,6 +133,7 @@ Comment[es]=Gestión de archivos
 Comment[eu]=Kudeatu zure fitxategiak
 Comment[fi]=Hallinnoi tiedostojasi
 Comment[fr]=Gérer vos fichiers
+Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=ניהול הקבצים שלך
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
@@ -141,6 +142,7 @@ Comment[sl]=Upravlja vaše datoteke
 Comment[tr]=Dosyalarınızı yönetin
 Comment[uk]=Керування вашими файлами
 Comment[x-test]=xxManage your filesxx
+Comment[zh_CN]=文件管理应用
 Comment[zh_TW]=管理您的檔案
 MimeType=inode/directory;
 InitialPreference=10