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"

runners/appstream/plasma-runner-appstream.desktop

@@ -14,7 +14,7 @@ Name[fr]=Logithèque
 Name[gl]=Centro de Software
 Name[he]=מרכז התוכנות
 Name[hu]=Szoftverközpont
-Name[id]=Pusat Software
+Name[id]=Sentra Perangkat Lunak
 Name[it]=Software Center
 Name[ko]=소프트웨어 센터
 Name[lt]=Programinės įrangos centras