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"

components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc

@@ -1,5 +1,9 @@
 [KNewStuff3]
 Name=Wallpaper Plugins
+Name[ca]=Connectors de fons de pantalla
+Name[sv]=Insticksprogram för skrivbordsunderlägg
+Name[uk]=Додатки зображень тла
+Name[x-test]=xxWallpaper Pluginsxx
 
 ProvidersUrl=https://download.kde.org/ocs/providers.xml
 Categories=Plasma Wallpaper Plugin

gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop

@@ -4,6 +4,7 @@ Name=GMenuDBusMenuProxy
 Name[ca]=GMenuDBusMenuProxy
 Name[ca@valencia]=GMenuDBusMenuProxy
 Name[da]=GMenuDBusMenuProxy
+Name[de]=GMenuDBusMenuProxy
 Name[en_GB]=GMenuDBusMenuProxy
 Name[es]=GMenuDBusMenuProxy
 Name[eu]=GMenuDBusMenuProxy