From ca9995741e135fb1816dfa2a69f29e809fc45a8d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 27 Oct 2019 04:26:48 +0100 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 f3f8a1df4..4a01e31e7 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -472,9 +472,11 @@ Action=Popup [Event/undosend] Name=An email can be undo send Name[ca]=Un correu electrònic es pot desfer l'enviament +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 Name[pt_BR]=O envio de um e-mail pode ser desfeito +Name[sv]=Sändning av ett brev kan ångras Name[uk]=Не можна скасувати надсилання пошти Name[x-test]=xxAn email can be undo sendxx Action=Popup