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

@@ -95,6 +95,7 @@ Comment[es]=Preferencias de complementos
 Comment[et]=Seadistusplugin
 Comment[fi]=Asetusliitännäiset
 Comment[fr]=Modules de paramètres
+Comment[gl]=Complementos de configuración
 Comment[it]=Estensioni per le impostazioni
 Comment[ko]=설정 플러그인
 Comment[nl]=Plug-ins voor instellingen
@@ -125,6 +126,7 @@ 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[gl]=kmail,complementos
 X-KDE-Keywords[it]=kmail,estensioni
 X-KDE-Keywords[ko]=kmail,plugins,플러그인
 X-KDE-Keywords[nl]=kmail,plug-ins

src/data/org.kde.kmail2.desktop

@@ -207,6 +207,7 @@ Name[en_GB]=New Message...
 Name[es]=Nuevo mensaje...
 Name[fi]=Uusi viesti…
 Name[fr]=Nouveau message...
+Name[gl]=Nova mensaxe…
 Name[it]=Nuovo messaggio...
 Name[nl]=Nieuw bericht...
 Name[pl]=Nowa wiadomość...
@@ -233,6 +234,7 @@ Name[es]=Comprobar correo
 Name[et]=E-posti kontrollimine
 Name[fi]=Tarkista posti
 Name[fr]=Relever le courriel
+Name[gl]=Comprobar o correo
 Name[it]=Controlla posta
 Name[ko]=메일 확인
 Name[nl]=E-mail controleren