From 9689974ee75487635d62966372471fc21575b480 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 17 May 2018 05:33:07 +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/Gui/org.kde.trojita.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Gui/org.kde.trojita.desktop b/src/Gui/org.kde.trojita.desktop index e0e0bafb..4c8c90d2 100644 --- a/src/Gui/org.kde.trojita.desktop +++ b/src/Gui/org.kde.trojita.desktop @@ -95,6 +95,7 @@ Keywords[en_GB]=mail;e-mail;IMAP;SMTP;eml;MUA; Keywords[es]=mail;e-mail;IMAP;SMTP;eml;MUA;correo electrónico; Keywords[et]=meil;meilid;kiri;kirjad;e-post;e-kirjad;IMAP;SMTP;eml;MUA; Keywords[fi]=mail;e-mail;posti;sähköposti;IMAP;SMTP;eml;MUA; +Keywords[fr]=mail;e-mail;IMAP;SMTP;eml;MUA; Keywords[gl]=correo;correo electrónico;IMAP;SMTP;eml;MUA; Keywords[hu]=levél;e-mail;IMAP;SMTP;eml;MUA; Keywords[it]=posta;posta elettronica;mail;e-mail;IMAP;SMTP;eml;MUA; @@ -127,6 +128,7 @@ Name[el]=Νέο μήνυμα Name[en_GB]=New Message Name[es]=Nuevo mensaje Name[fi]=Uusi viesti +Name[fr]=Nouveau message Name[gl]=Mensaxe nova Name[it]=Nuovo messaggio Name[nl]=Nieuw bericht -- 2.11.4.GIT