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

@@ -93,6 +93,7 @@ Comment[en_GB]=Settings Plugins
 Comment[es]=Preferencias de complementos
 Comment[et]=Seadistusplugin
 Comment[fi]=Asetusliitännäiset
+Comment[fr]=Modules de paramètres
 Comment[it]=Estensioni per le impostazioni
 Comment[nl]=Plug-ins voor instellingen
 Comment[pl]=Wtyczki ustawień
@@ -118,6 +119,7 @@ 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[fr]=kmail,modules
 X-KDE-Keywords[it]=kmail,estensioni
 X-KDE-Keywords[nl]=kmail,plug-ins
 X-KDE-Keywords[pl]=kmail,wtyczki

src/data/org.kde.kmail.desktop

@@ -205,6 +205,7 @@ Name[en_GB]=New Message
 Name[es]=Mensaje nuevo
 Name[et]=Uus kiri
 Name[fi]=Uusi viesti
+Name[fr]=Nouveau message
 Name[it]=Nuovo messaggio
 Name[nl]=Nieuw bericht
 Name[pl]=Nowa wiadomość
@@ -234,6 +235,7 @@ Name[en_GB]=Check Mail
 Name[es]=Comprobar correo
 Name[et]=E-posti kontrollimine
 Name[fi]=Tarkista posti
+Name[fr]=Relever le courriel
 Name[it]=Controlla posta
 Name[nl]=E-mail controleren
 Name[pl]=Sprawdź pocztę