From 80183cda73a7d9e2923ca147e5262384e2862b63 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Apr 2019 09:00:27 +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" --- fileitemactionplugin/kdeconnectsendfile.desktop | 2 ++ plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ plugins/telephony/kdeconnect_telephony.json | 1 + 3 files changed, 5 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index 5cd0f11be..e0b492173 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -9,6 +9,7 @@ Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect Name[it]=Invia il file tramite il servizio KDE Connect Name[nl]=Bestand via KDE Connect-service versturen Name[nn]=Send fil med KDE Connect-tenesta +Name[pt]=Enviar o ficheiro pelo serviços KDE Connect Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect Name[sv]=Skicka via tjänsten KDE-anslut Name[uk]=Надсилання файла за допомогою служби з’єднання KDE @@ -39,6 +40,7 @@ X-KDE-Submenu[ko]=연결 X-KDE-Submenu[nl]=Verbinden X-KDE-Submenu[nn]=Kopla til X-KDE-Submenu[pl]=Połącz +X-KDE-Submenu[pt]=Ligar X-KDE-Submenu[pt_BR]=Conectar X-KDE-Submenu[ru]=KDE Connect X-KDE-Submenu[sk]=Pripojiť diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index af17284ef..ded4ed3b0 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -59,6 +59,7 @@ "Description[nl]": "De meldingen van deze computer rondsturen, zodat ze op andere apparaten getoond kunnen worden.", "Description[nn]": "Vidaresend varslingar frå datamaskina til andre einingar", "Description[pl]": "Rozgłaszaj powiadomienia tego komputera, tak aby można je było wyświetlać na innych urządzeniach.", + "Description[pt]": "Difunde as notificações deste computador, para que as mesmas possam ser vistas noutros dispositivos.", "Description[ru]": "Трансляция уведомления с этого компьютера, чтобы они могли быть видны на других устройствах", "Description[sk]": "Vysielať upozornenia tohto počítača, aby sa zobrazili na druhom zariadení.", "Description[sv]": "Sänd ut datorns underrättelser så att de kan visas på andra enheter.", @@ -89,6 +90,7 @@ "Name[nl]": "Stuur meldingen", "Name[nn]": "Send varslingar", "Name[pl]": "Wysyłaj powiadomienia", + "Name[pt]": "Enviar as notificações", "Name[pt_BR]": "Enviar notificações", "Name[ru]": "Отправка уведомлений", "Name[sk]": "Posielať upozornenia", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 42148a274..07e0e2328 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -49,6 +49,7 @@ "Description[it]": "Mostra notifiche per chiamate ed SMS", "Description[nl]": "Meldingen tonen van oproepen en SMSjes", "Description[nn]": "Vis varslingar for oppringingar og SMS", + "Description[pt]": "Mostrar notificações para as chamadas e SMS", "Description[pt_BR]": "Mostra notificações para chamadas e SMS", "Description[sr@ijekavian]": "Приказује обавештења за позиве и СМС", "Description[sr@ijekavianlatin]": "Prikazuje obaveštenja za pozive i SMS",