From abd5d5940fd2fa8853f0c61af4c975cd0bfa9e05 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 20 Oct 2016 12:06: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" --- .../kdeconnect_remotecommands.json | 1 + .../kdeconnect_sendnotifications.json | 34 ++++++++++++++++++- plugins/telephony/kdeconnect_telephony.json | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index be065195f..50b724b90 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -33,6 +33,7 @@ "Name": "Host remote commands", "Name[ca@valencia]": "Ordes a la màquina remota", "Name[ca]": "Ordres a la màquina remota", + "Name[cs]": "Přijímat vzdálené příkazy", "Name[da]": "Vært for eksterne kommandoer", "Name[es]": "Órdenes en servidor remoto", "Name[fi]": "Etäkomennot", diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 2656205ec..76ed14e95 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -4,15 +4,47 @@ "Authors": [ { "Email": "holger.k@elberer.de", - "Name": "Holger Kaelberer" + "Name": "Holger Kaelberer", + "Name[da]": "Holger Freyther", + "Name[it]": "Holger Freyther", + "Name[x-test]": "xxHolger Kaelbererxx" } ], "Description": "Broadcast this computer's notifications, so they can be shown on other devices.", + "Description[ca@valencia]": "Transmet les notificacions d'este ordinador, perquè puguen mostrar-se en altres dispositius.", + "Description[ca]": "Transmet les notificacions d'aquest ordinador, perquè puguin mostrar-se en altres dispositius.", + "Description[cs]": "Posílat upozornění tohoto počítače, takže mohou být zobrazena na jiných zařízeních.", + "Description[da]": "Udsend denne computers bekendtgørelser, så de kan vises på andre enheder.", + "Description[de]": "Die Benachrichtigungen dieses Rechners aussenden, sodass sie auf anderen Geräten angezeigt werden können.", + "Description[et]": "Arvuti märguannete levitamine, et neid oleks näha ka teistes seadmetes", + "Description[it]": "Trasmetti le notifiche di questo computer, affinché possano essere mostrate su altri dispositivi.", + "Description[nl]": "De meldingen van deze computer rondsturen, zodat ze op andere apparaten getoond kunnen worden.", + "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 possam ser apresentadas noutros dispositivos.", + "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.", + "Description[uk]": "Транслювати сповіщення з цього комп’ютера так, щоб їх було показано на інших пристроях.", + "Description[x-test]": "xxBroadcast this computer's notifications, so they can be shown on other devices.xx", "EnabledByDefault": false, "Icon": "preferences-desktop-notification", "Id": "kdeconnect_sendnotifications", "License": "GPL", "Name": "Send notifications", + "Name[ca@valencia]": "Envia les notificacions", + "Name[ca]": "Envia les notificacions", + "Name[cs]": "Posílat oznamování", + "Name[da]": "Send bekendtgørelser", + "Name[de]": "Benachrichtigungen senden", + "Name[et]": "Märguannete saatmine", + "Name[it]": "Invia notifiche", + "Name[nl]": "Stuur meldingen", + "Name[pl]": "Wysyłaj powiadomienia", + "Name[pt]": "Enviar as notificações", + "Name[pt_BR]": "Enviar notificações", + "Name[sk]": "Posielať upozornenia", + "Name[sv]": "Skicka underrättelser", + "Name[uk]": "Надіслати сповіщення", + "Name[x-test]": "xxSend notificationsxx", "ServiceTypes": [ "KdeConnect/Plugin" ], diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 7fce311c1..28fdd1982 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -11,6 +11,7 @@ "Description": "Show notifications for calls and SMS", "Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS", "Description[ca]": "Mostra les notificacions de les trucades i els SMS", + "Description[cs]": "Zobrazit upozornění pro telefonáty a SMS", "Description[da]": "Vis bekendtgørelser for opkald og SMS'er", "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", "Description[es]": "Mostrar notificaciones de llamadas y SMS",