From b275198cc69b56d1be9449f00f44dc5447feb49a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Oct 2017 04:37:56 +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, 1 insertion(+), 1 deletion(-) diff --git a/src/Gui/org.kde.trojita.desktop b/src/Gui/org.kde.trojita.desktop index c0609d38..38af0c79 100644 --- a/src/Gui/org.kde.trojita.desktop +++ b/src/Gui/org.kde.trojita.desktop @@ -95,7 +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[gl]=correo;mail;electrónico;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; Keywords[ko]=mail;e-mail;IMAP;SMTP;eml;MUA;메일;이메일; -- 2.11.4.GIT