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/kmail2.notifyrc

@@ -473,6 +473,7 @@ Action=Popup
 Name=An email can be undo send
 Name[ca]=Un correu electrònic es pot desfer l'enviament
 Name[cs]=Odeslaný e-mail lze vrátit
+Name[en_GB]=An email can be undo send
 Name[gl]=O envío dun correo electrónico pode desfacerse
 Name[nl]=Verzenden van een e-mailbericht kan ongedaan gemaakt worden
 Name[pt]=Pode ser anulado o envio de um e-mail