From 77756ed73edee950e98ddf1d5ed1fd7d482318b4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Oct 2016 09:28:09 +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" --- kcm/org.kde.kdeconnect.kcm.desktop | 1 + org.kde.kdeconnect.nonplasma.desktop | 2 ++ plugins/battery/kdeconnect_battery.json | 2 +- plugins/findmyphone/kdeconnect_findmyphone.json | 2 ++ plugins/kdeconnect.notifyrc | 5 +++-- plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 2 +- plugins/notifications/kdeconnect_notifications.json | 2 ++ plugins/ping/kdeconnect_ping.json | 2 +- plugins/remotecommands/kdeconnect_remotecommands.json | 2 ++ plugins/runcommand/kdeconnect_runcommand.json | 2 ++ plugins/runcommand/kdeconnect_runcommand_config.desktop | 1 + plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ .../kdeconnect_sendnotifications_config.desktop | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 14 files changed, 22 insertions(+), 5 deletions(-) diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop index 78929b93c..128298f8a 100755 --- a/kcm/org.kde.kdeconnect.kcm.desktop +++ b/kcm/org.kde.kdeconnect.kcm.desktop @@ -22,6 +22,7 @@ Name[hu]=A KDE Connect beállításai Name[it]=Impostazioni di KDE Connect Name[ko]=KDE Connect 설정 Name[nl]=Instellingen van KDE Connect +Name[nn]=Innstillingar for KDE Connect Name[pl]=Ustawienia KDE Connect Name[pt]=Configuração do KDE Connect Name[pt_BR]=Configurações do KDE Connect diff --git a/org.kde.kdeconnect.nonplasma.desktop b/org.kde.kdeconnect.nonplasma.desktop index 8967d852b..1e30b106c 100755 --- a/org.kde.kdeconnect.nonplasma.desktop +++ b/org.kde.kdeconnect.nonplasma.desktop @@ -18,6 +18,7 @@ Name[hu]=KDE Connect monitor Name[it]=Monitor di KDE Connect Name[ko]=KDE Connect 모니터 Name[nl]=KDE-Connectmonitor +Name[nn]=Overvak KDE Connect Name[pl]=Monitor KDE Connect Name[pt]=Monitor do KDE Connect Name[pt_BR]=Monitor do KDE Connect @@ -48,6 +49,7 @@ Comment[hu]=Információk megjelenítése az eszközeiről Comment[it]=Visualizza informazioni sui tuoi dispositivi Comment[ko]=장치 정보 표시 Comment[nl]=Toon informatie over uw apparaten +Comment[nn]=Vis informasjon om einingane dine Comment[pl]=Wyświetl informacje o twoich urządzeniach Comment[pt]=Mostrar informações sobre os seus dispositivos Comment[pt_BR]=Mostra informações sobre seus dispositivos diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 072796d4f..64bcfdc79 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -25,7 +25,7 @@ "Description[it]": "Mostra la batteria del telefono accanto alla batteria del computer", "Description[ko]": "컴퓨터 배터리와 함께 휴대폰 배터리 표시", "Description[nl]": "Uw telefoonbatterij naast uw computerbatterij tonen", - "Description[nn]": "Vis telefonbatteriet ved sidan av datamaskinbatteriet", + "Description[nn]": "Vis telefonbatteriet ved sida av datamaskinbatteriet", "Description[pl]": "Pokaż baterię swojego telefonu obok baterii komputera", "Description[pt]": "Mostrar a bateria do seu telefone ao lado da do seu computador", "Description[pt_BR]": "Mostra a bateria do seu celular ao lado da bateria do computador", diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 525a5cd1d..f17cf7258 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -27,6 +27,7 @@ "Description[gl]": "Reproducir un son de alarma nun teléfono móbil perdido para atopalo.", "Description[it]": "Trova il tuo telefono smarrito facendogli suonare un allarme sonoro", "Description[nl]": "Zoek uw verloren telefoon door het een wekkersignaal te laten spelen", + "Description[nn]": "Finn telefonen din ved å la han spela eit lydsignal", "Description[pl]": "Znajdź twój zgubiony telefon odgrywając na nim dźwięk", "Description[pt]": "Descobrir o seu telefone perdido, fazendo-o tocar um som de alarme", "Description[pt_BR]": "Encontre seu telefone fazendo ele reproduzir um som", @@ -55,6 +56,7 @@ "Name[gl]": "Facer soar o meu móbil", "Name[it]": "Fai squillare il mio telefono", "Name[nl]": "Bel mijn telefoon", + "Name[nn]": "Ring telefonen", "Name[pl]": "Dzwoń z mojego telefonu", "Name[pt]": "Tocar o meu telefone", "Name[pt_BR]": "Tocar meu telefone", diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index aeace646a..c5c866f25 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -123,6 +123,7 @@ Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo. Comment[he]=התקבלה בקשת התאמה מהתקן Comment[it]=Richiesta di associazione ricevuta da un dispositivo Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten +Comment[nn]=Fekk parringsførespurnad frå eining Comment[pl]=Otrzymano żądanie parowania z urządzenia Comment[pt]=Pedido de emparelhamento recebido de um dispositivo Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo @@ -438,7 +439,7 @@ Name[hu]=Ping érkezett Name[it]=Ping ricevuto Name[ko]=핑 받음 Name[nl]=Ping ontvangen -Name[nn]=Ping motteke +Name[nn]=Pingsignal motteke Name[pl]=Otrzymano ping Name[pt]=Contacto Recebido Name[pt_BR]=Ping recebido @@ -472,7 +473,7 @@ Comment[hu]=Ping érkezett Comment[it]=Hai ricevuto un ping Comment[ko]=핑 받음 Comment[nl]=Ping ontvangen -Comment[nn]=Ping motteke +Comment[nn]=Pingsignal motteke Comment[pl]=Otrzymano ping Comment[pt]=Pedido de rede recebido Comment[pt_BR]=Ping recebido diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index a8fd7cd93..81bdbff22 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -58,7 +58,7 @@ "Name[it]": "Ricevitore di controllo multimediale", "Name[ko]": "멀티미디어 제어 수신기", "Name[nl]": "Ontvanger van bediening voor multimedia", - "Name[nn]": "Multimedie-fjernkontroll", + "Name[nn]": "Mediefjernkontroll", "Name[pl]": "Odbiornik sterowania multimediami", "Name[pt]": "Receptor de controlo multimédia", "Name[pt_BR]": "Receptor de controle multimídia", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index c5cd5c2a7..f22d2d431 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -23,6 +23,7 @@ "Description[gl]": "Mostrar as notificacións do dispositivo neste computador e mantelas sincronizadas.", "Description[it]": "Mostra le notifiche del telefono sul tuo computer e tienile sincronizzate", "Description[nl]": "Apparaatmeldingen op deze computer tonen en ze gesynchroniseerd houden", + "Description[nn]": "Vis telefonvarslingar på datamaskina og hald dei synkronisert", "Description[pl]": "Pokaż powiadomienia urządzenia na swoim komputerze i synchronizuj je", "Description[pt]": "Mostrar as notificações do dispositivo neste computador e mantê-las sincronizadas", "Description[pt_BR]": "Mostra as notificações do aparelho neste computador e as mantém sincronizadas", @@ -50,6 +51,7 @@ "Name[gl]": "Recibir notificacións", "Name[it]": "Ricevi notifiche", "Name[nl]": "Meldingen ontvangen", + "Name[nn]": "Få varslingar", "Name[pl]": "Otrzymuj powiadomienia", "Name[pt]": "Receber as notificações", "Name[pt_BR]": "Receber notificações", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index 1b3ec5ef3..a9d3a6773 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -25,7 +25,7 @@ "Description[it]": "Invia e ricevi ping", "Description[ko]": "핑 보내고 받기", "Description[nl]": "Pings verzenden en ontvangen", - "Description[nn]": "Send og ta imot ping-signal", + "Description[nn]": "Send og ta imot pingsignal", "Description[pl]": "Wysyłaj i otrzymuj pingi", "Description[pt]": "Enviar e receber contactos", "Description[pt_BR]": "Envia e recebe pings", diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index cf029a7fc..0c100e6e6 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -22,6 +22,7 @@ "Description[fi]": "Suorita ennakkoon määriteltyjä komentoja etälaitteella", "Description[it]": "Innesca comandi predefiniti sul dispositivo remoto", "Description[nl]": "Start commando's voorgedefinieerd op het apparaat op afstand", + "Description[nn]": "Løys ut ferdigdefinerte kommandoar på eininga", "Description[pl]": "Wyzwalaj polecenia określone na zdalnym urządzeniu", "Description[pt]": "Despoletar os comandos predefinidos para o dispositivo remoto", "Description[sk]": "Vyvolať príkazy preddefinované na vzdialenom zariadení", @@ -43,6 +44,7 @@ "Name[fi]": "Etäkomennot", "Name[it]": "Comandi remoti host", "Name[nl]": "Host voor commando's op afstand", + "Name[nn]": "Fjernkommandoar", "Name[pl]": "Wykonuj polecenia zdalne", "Name[pt]": "Alojar os comandos remotos", "Name[sv]": "Fjärrkommandon för värddator", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index 68317eaee..1abe56690 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -29,6 +29,7 @@ "Description[it]": "Esegui da remoto comandi della console", "Description[ko]": "원격으로 콘솔 명령 실행", "Description[nl]": "Commando's in de terminal op afstand laten uitvoeren", + "Description[nn]": "Køyr konsollkommandoar på eininga", "Description[pl]": "Wykonaj polecenie konsoli zdalnie", "Description[pt]": "Executar de forma remota comandos da consola", "Description[pt_BR]": "Executa comandos do console remotamente", @@ -60,6 +61,7 @@ "Name[it]": "Esegui comandi", "Name[ko]": "명령 실행", "Name[nl]": "Commando's uitvoeren", + "Name[nn]": "Køyr kommandoar", "Name[pl]": "Wykonywanie polecenie", "Name[pt]": "Executar comandos", "Name[pt_BR]": "Executar comandos", diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop index c09ba64bc..f536be3e8 100644 --- a/plugins/runcommand/kdeconnect_runcommand_config.desktop +++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop @@ -23,6 +23,7 @@ Name[he]=הגדרת התוסף הרץ פקודה Name[it]=Impostazioni estensione Esegui comando Name[ko]=명령 실행 플러그인 설정 Name[nl]=Plug-in-instellingen van commando Uitvoeren +Name[nn]=Innstillingar for kommandokøyring Name[pl]=Ustawienia wtyczki wykonywania polecenia Name[pt]=Configuração do 'plugin' de execução de comandos Name[pt_BR]=Configurações do plugin de execução de comandos diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 30478f684..fa369958e 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -22,6 +22,7 @@ "Description[fi]": "Lähetä tämän tietokoneen ilmoitukset, jotta ne voidaan näyttää muilla laitteilla.", "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[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 possam ser apresentadas noutros dispositivos.", "Description[sk]": "Vysielať upozornenia tohto počítača, aby sa zobrazili na druhom zariadení.", @@ -48,6 +49,7 @@ "Name[gl]": "Enviar notificacións", "Name[it]": "Invia notifiche", "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", diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop index 326a542b9..decf18804 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop +++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop @@ -22,6 +22,7 @@ Name[gl]=Configuración do complemento de sincronización de notificacións Name[he]=הגדרת התוסף סנכרון התראות Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen +Name[nn]=Innstillingar for tillegg for synkronisering av varslingar Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia Name[pt]=Configuração do 'plugin' de sincronização das notificações Name[pt_BR]=Configuração do plugin de sincronização das notificações diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 4915a82cf..8bf028b7c 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -19,6 +19,7 @@ "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", "Description[it]": "Mostra notifiche per le chiamate e per gli 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[sv]": "Visa underrättelser om samtal och SMS",