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 b82eaaecc8ab92769e68101019d0201f7d2e44bd..c114295ec8fd72ad3b68478cac5bad3072ee475b 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -138,6 +138,7 @@ Comment[fr]=Gérer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=ניהול הקבצים שלך
 Comment[ia]=Gere tu files
+Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[nl]=Uw bestanden beheren