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 66f4ddf701e07f126e97e50991e1edf89afdabc2..0d99a03ef8b117f1f68ea18c534b16cc6c53d343 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -135,7 +135,7 @@ Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ;
 Keywords[hi]=फ़ाइलें;फ़ाइल प्रबंधन;फ़ाइल ब्राउज़िंग;सांबा;नेटवर्क शेयर;एक्सप्लोरर;खोजक;
 Keywords[hu]=fájlok;fájlkezelés;fájlböngészés;samba;hálózati megosztások;Explorer;Finder;
 Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Explorator;Trovator;
-Keywords[id]=files;file management;file browsing;samba;network shares;Explorer;Finder;manajer;
+Keywords[id]=file;berkas;pengelola file;peramban file;samba;pembagian jaringan;Explorer;Finder;
 Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder;
 Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder;
 Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder;