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/services/plasma-runner-services.desktop

@@ -46,7 +46,7 @@ Name[ka]=პროგრამები
 Name[kk]=Қолданбалар
 Name[km]=កម្មវិធី
 Name[kn]=ಅನ್ವಯಗಳು
-Name[ko]=응용 프로그램
+Name[ko]=프로그램
 Name[ku]=Sepan
 Name[lt]=Programos
 Name[lv]=Programmas