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/org.kde.kmail.desktop

@@ -200,6 +200,7 @@ Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[cs]=Nová zpráva
 Name[de]=Neue Nachricht
+Name[en_GB]=New Message
 Name[es]=Mensaje nuevo
 Name[et]=Uus kiri
 Name[fi]=Uusi viesti
@@ -225,6 +226,7 @@ Name[ca]=Comprova el correu
 Name[ca@valencia]=Comprova el correu
 Name[cs]=Zkontrolovat poštu
 Name[de]=Nach E-Mail sehen
+Name[en_GB]=Check Mail
 Name[es]=Comprobar correo
 Name[et]=E-posti kontrollimine
 Name[fi]=Tarkista posti