From 0332d2e2e87e5e2bcb95336abda49435a780bec1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Jul 2020 05:38:19 +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 ea71b6052..a7cb9a7cf 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -492,6 +492,7 @@ Action=Popup [Event/undosend] Name=Email added to the send later queue Name[ca]=Correu afegit a la cua d'enviar més tard +Name[ca@valencia]=Correu afegit a la cua d'enviar més tard Name[cs]=E-maily přidané do fronty pro pozdější odeslání Name[de]=E-Mail zur Später-Senden-Warteschlange hinzugefügt Name[en_GB]=Email added to the send later queue @@ -512,6 +513,7 @@ Name[uk]=Повідомлення додано до черги відкладе Name[x-test]=xxEmail added to the send later queuexx Comment=A delayed email delivery is configured and can be canceled Comment[ca]=S'ha configurat un lliurament de correu retardat i es pot cancel·lar +Comment[ca@valencia]=S'ha configurat un lliurament de correu retardat i es pot cancel·lar Comment[en_GB]=A delayed email delivery is configured and can be cancelled Comment[es]=Se ha configurado un envío de correo aplazado, que se puede cancelar Comment[et]=Seadistatud on viivitusega kirja saatmine, nii et sellest võib ka loobuda