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"

kcmkwin/kwinoptions/kwinactions.desktop

@@ -32,7 +32,7 @@ Name[pl]=Zachowanie okien
 Name[pt]=Acções das Janelas
 Name[pt_BR]=Ações da janela
 Name[ru]=Действия с окнами
-Name[sk]=Akcie ok&na
+Name[sk]=Akcie okna
 Name[sv]=Fönsteråtgärder
 Name[uk]=Дії з вікнами
 Name[x-test]=xxWindow Actionsxx