From 633b08d83e1f7fa86156e7c4780601791a658138 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Mar 2019 06:07:48 +0100 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/photo/kdeconnect_photo.json | 4 +++ plugins/telephony/kdeconnect_telephony.json | 34 ------------------- ...asma-runner-kdeconnect-findmyphone.desktop | 4 +++ ...a-runner-kdeconnect-remotecommands.desktop | 4 +++ .../org.kde.kdeconnect.telhandler.desktop | 1 + 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/plugins/photo/kdeconnect_photo.json b/plugins/photo/kdeconnect_photo.json index 5a9e5ca86..18ec5b4df 100644 --- a/plugins/photo/kdeconnect_photo.json +++ b/plugins/photo/kdeconnect_photo.json @@ -35,7 +35,9 @@ "Description[es]": "Usar un dispositivo conectado para tomar una fotografía", "Description[gl]": "Usar un dispositivo conectado para sacar unha foto", "Description[nl]": "Gebruik een verbonden apparaat om een foto te nemen", + "Description[nn]": "Bruk tilkopla eining til å ta eit bilete", "Description[pt_BR]": "Usa um dispositivo conectado para tirar uma foto", + "Description[sk]": "Použiť pripojené zariadenie na vytvorenie fotky", "Description[sv]": "Använd en ansluten apparat för att ta ett foto", "Description[uk]": "Скористатися з'єднаним пристроєм для фотографування", "Description[x-test]": "xxUse a connected device to take a photoxx", @@ -50,7 +52,9 @@ "Name[es]": "Fotografía", "Name[gl]": "Foto", "Name[nl]": "Foto", + "Name[nn]": "Foto", "Name[pt_BR]": "Foto", + "Name[sk]": "Fotka", "Name[sv]": "Foto", "Name[uk]": "Фото", "Name[x-test]": "xxPhotoxx", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 6d93ad941..3cc8196e3 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -41,40 +41,6 @@ } ], "Description": "Show notifications for incoming calls", - "Description[ar]": "أظهر إخطارات المكالمات والرّسائل", - "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", - "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", - "Description[el]": "Εμφάνιση ειδοποιήσεων για κλήσεις και SMS", - "Description[en_GB]": "Show notifications for calls and SMS", - "Description[es]": "Mostrar notificaciones de llamadas y SMS", - "Description[et]": "Kõnede ja SMS-ide märguannete näitamine", - "Description[eu]": "Erakutsi deien eta SMS mezuen jakinarazpenak", - "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[id]": "Tampilkan notifikasi untuk panggilan dan SMS", - "Description[it]": "Mostra notifiche per chiamate ed SMS", - "Description[ko]": "통화와 SMS 알림 표시", - "Description[nl]": "Meldingen tonen van oproepen en SMSjes", - "Description[nn]": "Vis varslingar for oppringingar og SMS", - "Description[pl]": "Powiadamiaj o dzwonieniu i esemesach", - "Description[pt]": "Mostrar notificações para as chamadas e SMS", - "Description[pt_BR]": "Mostra notificações para chamadas e SMS", - "Description[ru]": "Показ уведомлений для звонков и SMS", - "Description[sk]": "Zobraziť oznámenia pre hovory a SMS", - "Description[sr@ijekavian]": "Приказује обавештења за позиве и СМС", - "Description[sr@ijekavianlatin]": "Prikazuje obaveštenja za pozive i SMS", - "Description[sr@latin]": "Prikazuje obaveštenja za pozive i SMS", - "Description[sr]": "Приказује обавештења за позиве и СМС", - "Description[sv]": "Visa underrättelser om samtal och SMS", - "Description[tr]": "Çağrı ve SMS'ler için bildirim göster", - "Description[uk]": "Показ сповіщень щодо дзвінків і SMS", - "Description[x-test]": "xxShow notifications for calls and SMSxx", - "Description[zh_CN]": "显示来电和短信通知", - "Description[zh_TW]": "顯示來電與短訊通知", "EnabledByDefault": true, "Icon": "call-start", "Id": "kdeconnect_telephony", diff --git a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop index f73be6e94..96ab3254e 100644 --- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop +++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop @@ -7,8 +7,10 @@ Name[es]=Encontrar mi dispositivo Name[gl]=Atopar o meu dispositivo Name[it]= Trova il mio dispositivo Name[nl]= Zoek mijn apparaat +Name[nn]=Finn eininga mi Name[pt]= Procurar o meu dispositivo Name[pt_BR]= Localizar meu dispositivo +Name[sk]=Nájsť moje zariadenie Name[sv]=Hitta min apparat Name[uk]=Знайти пристрій Name[x-test]=xx Find my devicexx @@ -21,8 +23,10 @@ Comment[es]=Hacer sonar los dispositivos conectados Comment[gl]=Facer soar os dispositivos conectados Comment[it]=Fa squillare i dispositivi connessi Comment[nl]=Bel verbonden apparaten +Comment[nn]=Ring tilkopla einingar Comment[pt]=Tocar os dispositivos ligados Comment[pt_BR]=Toca os dispositivos conectados +Comment[sk]=Prezvoniť pripojené zariadenia Comment[sv]=Ring anslutna apparater Comment[uk]=Дзвінок на з'єднаних пристроях Comment[x-test]=xxRing connected devicesxx diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop index 3e4b740c7..5ee3fa20e 100644 --- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop +++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop @@ -7,8 +7,10 @@ Name[es]=Ejecutar orden Name[gl]=Executar unha orde Name[it]=Esegui comando Name[nl]=Commando uitvoeren +Name[nn]=Køyr kommando Name[pt]=Executar um comando Name[pt_BR]=Executar comando +Name[sk]=Spustiť príkaz Name[sv]=Kör kommando Name[uk]=Виконати команду Name[x-test]=xxRun commandxx @@ -21,8 +23,10 @@ Comment[es]=Ejecutar órdenes en los dispositivos conectados Comment[gl]=Executar ordes nos dispositivos conectados Comment[it]=Esegue dei comandi sui dispositivi connessi Comment[nl]=Commando's op verbonden apparaten uitvoeren +Comment[nn]=Køyr kommandoar på tilkopla einingar Comment[pt]=Executar comandos nos dispositivos ligados Comment[pt_BR]=Executa comandos nos dispositivos conectados +Comment[sk]=Spustiť príkaz na pripojených zariadeniach Comment[sv]=Kör kommando på anslutna apparater Comment[uk]=Виконання команд на з'єднаних пристроях Comment[x-test]=xxRun commands on connected devicesxx diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index 6ecb76da9..004107964 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -21,6 +21,7 @@ Name[pl]=KDE Connect - obsługa URL telefonu Name[pt]=Tratamento de URL's Telefónicos do KDE Connect Name[pt_BR]=Tratamento de URLs do KDE Connect Name[ru]=Обработчик телефонных ссылок KDE Connect +Name[sk]=KDE Connect manažér URL telefónu Name[sr]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима Name[sr@ijekavian]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима Name[sr@ijekavianlatin]=KDE‑konekcijin rukovalac telefonskim URL‑ovima