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

@@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinactions
 Name=Window Actions
 Name[ca]=Accions de la finestra
 Name[cs]=Činnosti oken
+Name[da]=Vindueshandlinger
 Name[de]=Fensteraktionen
 Name[en_GB]=Window Actions
 Name[es]=Acciones de ventanas