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 ec8d2b13699233e7fd9bfb94510ac2d110750997..b82eaaecc8ab92769e68101019d0201f7d2e44bd 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -128,6 +128,7 @@ GenericName[zh_CN]=文件管理器
 GenericName[zh_TW]=檔案管理員
 Comment=Manage your files
 Comment[ar]=أدر ملفاتك
+Comment[bg]=Управление на файловете
 Comment[ca]=Gestioneu els fitxers
 Comment[ca@valencia]=Gestioneu els fitxers
 Comment[es]=Gestión de archivos
@@ -140,6 +141,7 @@ Comment[ia]=Gere tu files
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[nl]=Uw bestanden beheren
+Comment[pl]=Zarządzaj swoimi plikami
 Comment[sl]=Upravlja vaše datoteke
 Comment[sv]=Hantera filer
 Comment[tr]=Dosyalarınızı yönetin