From a35ac8706c902a3dad5b921a0147f6e6fbf37ea9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 Apr 2018 05:27:53 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index 130c82a01..a179f6e85 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -4,6 +4,7 @@ Name[ca]=SMS del KDE Connect Name[ca@valencia]=SMS del KDE Connect Name[cs]=KDE Connect SMS Name[en_GB]=KDE Connect SMS +Name[es]=SMS de KDE Connect Name[nl]=KDE Connect SMS Name[pt]=SMS do KDE Connect Name[sv]=KDE-anslut SMS @@ -14,6 +15,7 @@ GenericName[ca]=SMS GenericName[ca@valencia]=SMS GenericName[cs]=SMS GenericName[en_GB]=SMS +GenericName[es]=SMS GenericName[nl]=SMS GenericName[pt]=SMS GenericName[sv]=SMS @@ -25,6 +27,7 @@ Comment[ca]=Missatgeria de text Comment[ca@valencia]=Missatgeria de text Comment[cs]=Zprávy Comment[en_GB]=Text Messaging +Comment[es]=Envío de mensajes de texto Comment[nl]=Tekstberichten versturen Comment[pt]=Mensagem de Texto Comment[sv]=Textmeddelanden