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"

kcms/autostart/kcm_autostart.desktop

@@ -25,7 +25,7 @@ Name[ml]=സ്വയം തുടങ്ങുന്നവ
 Name[nl]=Autostart
 Name[nn]=Autostart
 Name[pa]=ਆਟੋ-ਸਟਾਰਟ
-Name[pl]=Samo-uruchamiane
+Name[pl]=Samouruchamiane
 Name[pt]=Arranque
 Name[pt_BR]=Iniciar automaticamente
 Name[ro]=Pornire automată