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"

dataengines/executable/plasma-dataengine-executable.desktop

@@ -100,7 +100,7 @@ Comment[hne]=चलाय वाले डाटा इंजन चलाव
 Comment[hr]=Pokreni izvršive podatkovne mehanizme
 Comment[hu]=Adatkezelő futtatása
 Comment[ia]=Motor per exequer datos executabile
-Comment[id]=Jalankan Mesin Data Yang Dapat Dieksekusi
+Comment[id]=Jalankan Mesin Data Yang Dapat-dilaksanakan
 Comment[is]=Gagnavél fyrir keyrslu forrita
 Comment[it]=Motore di dati per esecuzione di comandi
 Comment[ja]=コマンド実行のデータエンジン