From 473a6c14ac422188a9a06c35e989fde7c8a7d07c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 30 Jul 2017 04:49:43 +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" --- indicator/org.kde.kdeconnect.nonplasma.desktop | 1 + plugins/remotecommands/kdeconnect_remotecommands.json | 2 ++ plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 ++ plugins/sendnotifications/kdeconnect_sendnotifications.json | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + urlhandler/org.kde.kdeconnect.telhandler.desktop | 1 + 6 files changed, 8 insertions(+) diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index 4e5998eed..91674321f 100755 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -7,6 +7,7 @@ Name[da]=KDE Connect-indikator Name[de]=KDE-Connect-Anzeige Name[es]=Indicador de KDE Connect Name[fr]=Indicateur de KDE Connect +Name[gl]=Indicador de KDE Connect Name[it]=Indicatore di KDE Connect Name[nl]=KDE-Connect indicator Name[nn]=KDE Connect-indikator diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 60847e5bf..eb6ec9dd6 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -24,6 +24,7 @@ "Description[et]": "Kaugseadmes määratud käskude käivitamine", "Description[fi]": "Suorita ennakkoon määriteltyjä komentoja etälaitteella", "Description[fr]": "Exécuter des commandes prédéfinies sur le périphérique distant", + "Description[gl]": "Provocar ordes predefinidas no dispositivo remoto.", "Description[it]": "Innesca comandi predefiniti sul dispositivo remoto", "Description[ko]": "원격 장치에 미리 정의한 트리거 명령", "Description[nl]": "Start commando's voorgedefinieerd op het apparaat op afstand", @@ -57,6 +58,7 @@ "Name[et]": "Kaugkäsud", "Name[fi]": "Etäkomennot", "Name[fr]": "Exécuter des commandes distantes", + "Name[gl]": "Ordes remotas do servidor", "Name[it]": "Comandi remoti host", "Name[ko]": "호스트 원격 명령", "Name[nl]": "Host voor commando's op afstand", diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index b871385b4..2ae2042e5 100644 --- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json +++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json @@ -19,6 +19,7 @@ "Description[da]": "Brug dit tastatur til at sende tastehændelser til din parrede enhed", "Description[es]": "Use su teclado para enviar eventos de teclado a su dispositivo vinculado", "Description[fr]": "Utiliser votre clavier pour envoyer des évènements de touche au périphérique associé", + "Description[gl]": "Usar o teclado para enviar eventos de tecla ao dispositivo emparellado.", "Description[it]": "Utilizza la tua tastiera per inviare eventi di pressione dei tasti al dispositivo associato", "Description[nl]": "Uw toetsenbord gebruiken om toetsgebeurtenissen naar uw gepaarde apparaat te verzenden", "Description[nn]": "Bruk tastaturet til å senda tastetrykk til den para eininga", @@ -45,6 +46,7 @@ "Name[da]": "Eksternt tastatur fra desktoppen", "Name[es]": "Teclado remoto desde el equipo de escritorio", "Name[fr]": "Clavier distant depuis le bureau", + "Name[gl]": "Teclado remoto do escritorio", "Name[it]": "Tastiera remota dal desktop", "Name[nl]": "Toetsenbord op afstand vanaf het bureaublad", "Name[nn]": "Fjerntastatur frå skrivebordet", diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 0b7ec42ef..5cbb3d826 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -24,6 +24,7 @@ "Description[et]": "Arvuti märguannete levitamine, et neid oleks näha ka teistes seadmetes", "Description[fi]": "Lähetä tämän tietokoneen ilmoitukset, jotta ne voidaan näyttää muilla laitteilla.", "Description[fr]": "Diffuser les notifications de cet ordinateur pour qu'elles puissent être vues par d'autres périphériques.", + "Description[gl]": "Emitir as notificacións deste computador para que se mostren noutros dispositivos.", "Description[it]": "Trasmetti le notifiche di questo computer, affinché possano essere mostrate su altri dispositivi.", "Description[ko]": "이 컴퓨터의 알림을 다른 장치에도 표시합니다.", "Description[nl]": "De meldingen van deze computer rondsturen, zodat ze op andere apparaten getoond kunnen worden.", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 99be523dc..ad014894a 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -24,6 +24,7 @@ "Description[et]": "Kõnede ja SMS-ide märguannete näitamine", "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", "Description[fr]": "Affichez les notifications pour les appels et les SMS", + "Description[gl]": "Mostrar notificacións de chamadas e mensaxes SMS.", "Description[it]": "Mostra notifiche per le chiamate e per gli SMS", "Description[ko]": "통화와 SMS 알림 표시", "Description[nl]": "Meldingen tonen van oproepen en SMSjes", diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index cd34ca742..880edb97b 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -6,6 +6,7 @@ Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect Name[da]=Telefon-URL-håndtering til KDE Connect Name[es]=Controlador de URL de teléfonos de KDE Connect Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect +Name[gl]=Manexador de URL de teléfono de KDE Connect Name[it]=Gestore URL del telefono di KDE Connect Name[nl]=URL behandelaar van KDE-Connect-telefoon Name[nn]=Telefon-URL-handsamar for KDE Connect