From 45c00f8db454718b47400e0961f9305f8b321bb7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Mar 2018 05:19:36 +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" --- smsapp/org.kde.kdeconnect.sms.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index c6a2625a5..dbfb4723e 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -2,6 +2,7 @@ Name=KDE Connect SMS Name[ca]=SMS del KDE Connect Name[ca@valencia]=SMS del KDE Connect +Name[cs]=KDE Connect SMS Name[nl]=KDE Connect SMS Name[pt]=SMS do KDE Connect Name[sv]=KDE-anslut SMS @@ -10,14 +11,17 @@ Name[x-test]=xxKDE Connect SMSxx GenericName=SMS GenericName[ca]=SMS GenericName[ca@valencia]=SMS +GenericName[cs]=SMS GenericName[nl]=SMS GenericName[pt]=SMS GenericName[sv]=SMS GenericName[uk]=SMS GenericName[x-test]=xxSMSxx +GenericName[zh_CN]=SMS Comment=Text Messaging Comment[ca]=Missatgeria de text Comment[ca@valencia]=Missatgeria de text +Comment[cs]=Zprávy Comment[nl]=Tekstberichten versturen Comment[pt]=Mensagem de Texto Comment[sv]=Textmeddelanden