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"
2016-10-28 11:59:13 +00:00 · 2016-10-28 11:59:13 +00:00 · 760c2a8a7e
commit 760c2a8a7e
parent ee4e77fb4f
14 changed files with 22 additions and 5 deletions
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@ -18,6 +18,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
--- a/org.kde.kdeconnect.nonplasma.desktop
+++ b/org.kde.kdeconnect.nonplasma.desktop
@ -14,6 +14,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
@ -40,6 +41,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
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@ -22,7 +22,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", 
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@ -23,6 +23,7 @@
        "Description[fi]": "Löydä hukkaamasi puhelin laittamalla se soittamaan hälytysääntä", 
        "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", 
@ -47,6 +48,7 @@
        "Name[fi]": "Soita puhelimeeni", 
        "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", 
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@ -106,6 +106,7 @@ Comment[et]=Seadmelt saadi paardumissoov
 Comment[fi]=Saatiin paripyyntö laitteelta
 Comment[it]=Richiesta di associazione ricevuta da un dispositivo
 Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
+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
@ -386,7 +387,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
@ -416,7 +417,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
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@ -52,7 +52,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", 
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@ -19,6 +19,7 @@
        "Description[fi]": "Näytä laitteen ilmoitukset tällä tietokoneella ja pidä ne ajan tasalla", 
        "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", 
@ -42,6 +43,7 @@
        "Name[fi]": "Vastaanota ilmoituksia", 
        "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", 
--- a/plugins/ping/kdeconnect_ping.json
+++ b/plugins/ping/kdeconnect_ping.json
@ -22,7 +22,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", 
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@ -19,6 +19,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í", 
@ -39,6 +40,7 @@
        "Name[fi]": "Etäkomennot", 
        "Name[it]": "Comandi remoti host", 
        "Name[nl]": "Commando's op afstand hosten", 
+        "Name[nn]": "Fjernkommandoar", 
        "Name[pl]": "Wykonuj polecenia zdalne", 
        "Name[pt]": "Alojar os comandos remotos", 
        "Name[sk]": "Vzdialené príkazy hostiteľa", 
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@ -24,6 +24,7 @@
        "Description[fi]": "Suorita konsolikomentoja etänä", 
        "Description[it]": "Esegui da remoto comandi della console", 
        "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", 
@ -49,6 +50,7 @@
        "Name[fi]": "Suorita komentoja", 
        "Name[it]": "Esegui comandi", 
        "Name[nl]": "Commando's uitvoeren", 
+        "Name[nn]": "Køyr kommandoar", 
        "Name[pl]": "Wykonywanie polecenie", 
        "Name[pt]": "Executar comandos", 
        "Name[pt_BR]": "Executar comandos", 
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@ -17,6 +17,7 @@ Name[et]=Käsu käivitamise plugina seadistused
 Name[fi]=Suorita komento -liitännäisen asetukset
 Name[it]=Impostazioni estensione Esegui comando
 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
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@ -19,6 +19,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í.", 
@ -39,6 +40,7 @@
        "Name[fi]": "Lähetä ilmoituksia", 
        "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", 
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@ -17,6 +17,7 @@ Name[et]=Märguande sünkroonimise plugina seaditused
 Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset
 Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
 Name[nl]=Instellingen voor meldingen van synchronisatie plug-in
+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
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@ -18,6 +18,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[sk]": "Zobraziť oznámenia pre hovory a SMS",