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

@@ -90,6 +90,7 @@ Comment[de]=Einstellungsmodul
 Comment[en_GB]=Settings Plugins
 Comment[es]=Preferencias de complementos
 Comment[et]=Seadistusplugin
+Comment[fi]=Asetusliitännäiset
 Comment[it]=Estensioni per le impostazioni
 Comment[nl]=Plug-ins voor instellingen
 Comment[pl]=Wtyczki ustawień
@@ -106,6 +107,7 @@ X-KDE-Keywords[de]=KMail,Module
 X-KDE-Keywords[en_GB]=kmail,plugins
 X-KDE-Keywords[es]=kmail,complementos
 X-KDE-Keywords[et]=kmail,pluginad
+X-KDE-Keywords[fi]=kmail,liitännäiset
 X-KDE-Keywords[it]=kmail,estensioni
 X-KDE-Keywords[nl]=kmail,plug-ins
 X-KDE-Keywords[pl]=kmail,wtyczki