From 7e0ebdf1c3288332dd91651bdec212fbecc85530 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 1 Apr 2019 05:49:03 +0200 Subject: [PATCH] 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index 54352a67c..cb90e2770 100644 --- a/src/data/kmail2.notifyrc +++ b/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