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 8884408442f59f82226928a4ce4514efb41c6573..ec8d2b13699233e7fd9bfb94510ac2d110750997 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -136,10 +136,12 @@ Comment[fi]=Hallinnoi tiedostojasi
 Comment[fr]=Gérer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=ניהול הקבצים שלך
+Comment[ia]=Gere tu files
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[nl]=Uw bestanden beheren
 Comment[sl]=Upravlja vaše datoteke
+Comment[sv]=Hantera filer
 Comment[tr]=Dosyalarınızı yönetin
 Comment[uk]=Керування вашими файлами
 Comment[x-test]=xxManage your filesxx