From 78fe5256f222c0180d6c05aedafd7152f1d902d0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 May 2017 04:19:42 +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 c34621af..9950ef99 100644 --- a/src/Gui/org.kde.trojita.desktop +++ b/src/Gui/org.kde.trojita.desktop @@ -109,7 +109,7 @@ Keywords[sv]=brev;e-post;IMAP;SMTP;eml;MUA; Keywords[tr]=posta;e-posta;IMAP;SMTP;eml;MUA; Keywords[uk]=mail;e-mail;IMAP;SMTP;eml;MUA;пошта;електронна;емейл;імейл;імап;аймап;смтп;емл; Keywords[x-test]=xxmailxx;xxe-mailxx;xxIMAPxx;xxSMTPxx;xxemlxx;xxMUAxx; -Keywords[zh_CN]=mail;e-mail;IMAP;SMTP;eml;MUA;电子邮件;邮件;电邮;邮箱 +Keywords[zh_CN]=mail;e-mail;IMAP;SMTP;eml;MUA;电子邮件;邮件;电邮;邮箱; StartupNotify=true MimeType=x-scheme-handler/mailto; Actions=Composer; -- 2.11.4.GIT