From a0c6047a41c4f2ae7091e178e3607b645aac019d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 13 Sep 2018 05:52:26 +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" --- plugins/sms/kdeconnect_sms.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/sms/kdeconnect_sms.json b/plugins/sms/kdeconnect_sms.json index a47c0a00e..74350e3e0 100644 --- a/plugins/sms/kdeconnect_sms.json +++ b/plugins/sms/kdeconnect_sms.json @@ -11,6 +11,7 @@ "Description[ca]": "Envia i rep SMS", "Description[nl]": "SMS verzenden en ontvangen", "Description[pt]": "Enviar e receber SMS's", + "Description[pt_BR]": "Envia e recebe SMS", "Description[uk]": "Надсилання і отримання SMS", "Description[x-test]": "xxSend and receive SMSxx", "EnabledByDefault": true,