From 88516226a41bf14c88df83ed9279d15a92ee226d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 31 Mar 2018 05:16:01 +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 dbfb4723e..130c82a01 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -3,6 +3,7 @@ Name=KDE Connect SMS 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[nl]=KDE Connect SMS Name[pt]=SMS do KDE Connect Name[sv]=KDE-anslut SMS @@ -12,6 +13,7 @@ GenericName=SMS GenericName[ca]=SMS GenericName[ca@valencia]=SMS GenericName[cs]=SMS +GenericName[en_GB]=SMS GenericName[nl]=SMS GenericName[pt]=SMS GenericName[sv]=SMS @@ -22,6 +24,7 @@ Comment=Text Messaging Comment[ca]=Missatgeria de text Comment[ca@valencia]=Missatgeria de text Comment[cs]=Zprávy +Comment[en_GB]=Text Messaging Comment[nl]=Tekstberichten versturen Comment[pt]=Mensagem de Texto Comment[sv]=Textmeddelanden