From de5b15c2aacccaedf1f2e6dbeb8a3c6a83e803ef Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Aug 2022 01:47:29 +0000 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/contacts/kdeconnect_contacts.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index d8878f270..76b088229 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -61,6 +61,7 @@ "Description[nn]": "Synkroniser kontaktar frå tilkopla eining og til skrivebordet", "Description[pl]": "Współdzieli kontakty podłączonego urządzenia z komputerem", "Description[pt]": "Sincronizar os Contactos do Dispositivo Ligado para o Sistema", + "Description[pt_BR]": "Sincroniza os contatos entre do dispositivo conectado para a área de trabalho", "Description[ro]": "Sincronizare contacte de pe dispozitivul conectat pe calculator", "Description[ru]": "Синхронизация контактов с подключённого устройства на компьютер", "Description[sl]": "Uskladi stike iz povezane naprave na namizje",