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

@@ -345,6 +345,7 @@ Action=Popup
 [Event/sent-mail-error]
 Name=Impossible to send email
 Name[ca]=És impossible enviar el correu
+Name[ca@valencia]=És impossible enviar el correu
 Name[en_GB]=Impossible to send email
 Name[gl]=Non se pode enviar a mensaxe
 Name[it]=Impossibile inviare il messaggio di posta
@@ -355,6 +356,7 @@ Name[uk]=Не вдалося надіслати повідомлення
 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[en_GB]=Problem during send mail
 Comment[gl]=Problema ao enviar o correo
 Comment[it]=Problema durante l'invio della posta