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"

src/data/kmail_config_plugins.desktop

@@ -94,6 +94,7 @@ Comment[x-test]=xxSettings Pluginsxx
 X-KDE-Keywords=kmail,plugins
 X-KDE-Keywords[ca]=kmail,connectors
 X-KDE-Keywords[ca@valencia]=kmail,connectors
+X-KDE-Keywords[de]=KMail,Module
 X-KDE-Keywords[et]=kmail,pluginad
 X-KDE-Keywords[nl]=kmail,plug-ins
 X-KDE-Keywords[pl]=kmail,wtyczki