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

@@ -347,6 +347,7 @@ Action=Popup
 Name=Impossible to send email
 Name[ca]=És impossible enviar el correu
 Name[ca@valencia]=És impossible enviar el correu
+Name[de]=Nachrichten kann nicht versendet werden
 Name[en_GB]=Impossible to send email
 Name[es]=No es posible enviar correo
 Name[fi]=Sähköpostin lähettäminen on mahdotonta
@@ -364,6 +365,7 @@ Name[x-test]=xxImpossible to send emailxx
 Comment=Problem during send mail
 Comment[ca]=Problema durant l'enviament del correu
 Comment[ca@valencia]=Problema durant l'enviament del correu
+Comment[de]=Probleme beim Versenden der E-Mail
 Comment[en_GB]=Problem during send mail
 Comment[es]=Problema al enviar correo
 Comment[fi]=Ongelma lähetettäessä sähköpostia