From c718ba4b48c45fe3f8f1adc7bb8a3018a7709bea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 26 Aug 2015 10:19:25 +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" --- autotests/data/signedPackage/metadata.desktop | 1 + autotests/data/testfallbackpackage/metadata.desktop | 1 + autotests/data/testpackage/metadata.desktop | 1 + autotests/packagemetadatatest.desktop | 2 ++ examples/applets/bugreport/metadata.desktop | 2 ++ examples/applets/compactrepresentation/metadata.desktop | 1 + examples/applets/config/metadata.desktop | 2 +- examples/applets/helloworld/metadata.desktop | 1 + examples/wallpapers/autumn/metadata.desktop | 1 + src/desktoptheme/air/metadata.desktop | 2 ++ src/desktoptheme/breeze-dark/metadata.desktop | 1 + src/desktoptheme/breeze/metadata.desktop | 1 + src/desktoptheme/oxygen/metadata.desktop | 2 ++ src/kpart/plasma-kpart.desktop | 1 + src/plasma/data/servicetypes/plasma-applet.desktop | 1 + src/plasma/data/servicetypes/plasma-containment.desktop | 1 + src/plasma/data/servicetypes/plasma-lookandfeel.desktop | 1 + src/plasma/data/servicetypes/plasma-service.desktop | 1 + 18 files changed, 22 insertions(+), 1 deletion(-) diff --git a/autotests/data/signedPackage/metadata.desktop b/autotests/data/signedPackage/metadata.desktop index b7e203e29..6c3c08929 100644 --- a/autotests/data/signedPackage/metadata.desktop +++ b/autotests/data/signedPackage/metadata.desktop @@ -58,6 +58,7 @@ Comment[mr]=जावास्क्रिप्ट मध्ये डेटा Comment[nb]=Demonstrerer tilgang til data via HTTP i JavaScript Comment[nds]=Wiest, wodennig een op Daten över HTTP in JavaScript togriepen kann Comment[nl]=Demonstreert toegang tot gegevens via HTTP in JavaScript +Comment[nn]=Demonstrerer JavaScript-tilgang til data via HTTP Comment[pl]=Przedstawia uzyskiwanie dostępu do danych przez HTTP w JavaScript Comment[pt]=Demonstra o acesso a dados por HTTP em JavaScript Comment[pt_BR]=Demonstra o acesso a dados por HTTP em JavaScript diff --git a/autotests/data/testfallbackpackage/metadata.desktop b/autotests/data/testfallbackpackage/metadata.desktop index d463271f2..1bfe1d973 100644 --- a/autotests/data/testfallbackpackage/metadata.desktop +++ b/autotests/data/testfallbackpackage/metadata.desktop @@ -18,6 +18,7 @@ Name[lt]=Bandomasis surogatinis paketas Name[nb]=Test reservepakke Name[nds]=Test-Torüchfallpaket Name[nl]=Testterugvalpakket +Name[nn]=Test-reservepakke Name[pl]=Awaryjny pakiet próbny Name[pt]=Pacote de Salvaguarda de Testes Name[pt_BR]=Pacote de teste secundário diff --git a/autotests/data/testpackage/metadata.desktop b/autotests/data/testpackage/metadata.desktop index a38ef8d3f..34c715f93 100644 --- a/autotests/data/testpackage/metadata.desktop +++ b/autotests/data/testpackage/metadata.desktop @@ -23,6 +23,7 @@ Name[mr]=चाचणी पॅकेज Name[nb]=Test pakke Name[nds]=Testpaket Name[nl]=Testpakket +Name[nn]=Testpakke Name[pa]=ਟੈਸਟ ਪੈਕੇਜ Name[pl]=Pakiet próbny Name[pt]=Pacote de Teste diff --git a/autotests/packagemetadatatest.desktop b/autotests/packagemetadatatest.desktop index 947642755..5747d18d6 100644 --- a/autotests/packagemetadatatest.desktop +++ b/autotests/packagemetadatatest.desktop @@ -21,6 +21,7 @@ Name[mr]=पॅकेज मेटाडेटा चाचणी फाईल Name[nb]=Testfil for Package metadata Name[nds]=Paketmetadaten-Testdatei Name[nl]=Testbestand voor pakketmetadata +Name[nn]=Testfil for pakkemetadata Name[pa]=ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਟੈਸਟ ਫਾਈਲ Name[pl]=Plik próbny pakietu metadanych Name[pt]=Ficheiro de testes de meta-dados dos pacotes @@ -61,6 +62,7 @@ Comment[mr]=पॅकेज मेटाडेटा वर्ग चाचण Comment[nb]=En skrivebordsfil med testdata for klassen PackageMetaData. Comment[nds]=En Test-Schriefdischdatei för't Utproberen vun de Klass „PackageMetaData“. Comment[nl]=Een desktop-bestand voor het testen van de PackageMetaData-klasse. +Comment[nn]=Ei .desktop-fil for testing av PackageMetaData-klassen. Comment[pa]=PackageMetaData ਕਲਾਸ ਟੈਸਟ ਕਰਨ ਲਈ ਟੈਸਟ ਡੈਸਕਟਾਪ ਫਾਈਲ Comment[pl]=Plik próbny desktop do wypróbowania klasy PackageMetaData. Comment[pt]=Um ficheiro 'desktop' de testes da classe PackageMetaData. diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index 98b29d1e6..d01c537f6 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -19,6 +19,7 @@ Comment[lt]=Pranešti apie Plasma klaidą Comment[nb]=Rapporter feil i Plasma Comment[nds]=En Fehler binnen Plasma künnig maken Comment[nl]=Een bug in Plasma rapporteren +Comment[nn]=Meld frå om feil i Plasma Comment[pa]=ਪਲਾਜ਼ਮਾ ਵਿੱਚ ਬੱਗ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ Comment[pl]=Zgłoś błąd w Plazmie Comment[pt]=Comunicar um erro no Plasma @@ -52,6 +53,7 @@ Keywords[ko]=plasma;bugzilla;bug;development;support;버그;개발;지원 Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas; Keywords[nb]=plasma;bugzilla;feil;utvikling;støtte; Keywords[nl]=plasma;bugzilla;bug;ontwikkeling;ondersteuning; +Keywords[nn]=plasma;bugzilla;feil;utvikling;støtte; Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa Keywords[pt]=plasma;bugzilla;erro;desenvolvimento;suporte; Keywords[pt_BR]=plasma;bugzilla;erro;bug;desenvolvimento;suporte; diff --git a/examples/applets/compactrepresentation/metadata.desktop b/examples/applets/compactrepresentation/metadata.desktop index 9e2b7f776..1cd474639 100644 --- a/examples/applets/compactrepresentation/metadata.desktop +++ b/examples/applets/compactrepresentation/metadata.desktop @@ -24,6 +24,7 @@ Name[lt]=sveikas pasauli Name[nb]=hallo verden Name[nds]=Moin Welt Name[nl]=hallo wereld +Name[nn]=hei, verda Name[pl]=witaj świecie Name[pt]=olá mundo Name[pt_BR]=Olá mundo diff --git a/examples/applets/config/metadata.desktop b/examples/applets/config/metadata.desktop index 910201758..84c7b3c66 100644 --- a/examples/applets/config/metadata.desktop +++ b/examples/applets/config/metadata.desktop @@ -21,7 +21,7 @@ Name[lt]=Konfigūracijos testas Name[nb]=Oppsettstest Name[nds]=Instellen-Test Name[nl]=Test van instellingen -Name[nn]=Oppsettest +Name[nn]=Oppsett-test Name[pa]=ਸੰਰਚਨਾ ਟੈਸਟ Name[pl]=Próba ustawień Name[pt]=Teste de configuração diff --git a/examples/applets/helloworld/metadata.desktop b/examples/applets/helloworld/metadata.desktop index fb48b091e..54c1f5806 100644 --- a/examples/applets/helloworld/metadata.desktop +++ b/examples/applets/helloworld/metadata.desktop @@ -24,6 +24,7 @@ Name[lt]=sveikas pasauli Name[nb]=hallo verden Name[nds]=Moin Welt Name[nl]=hallo wereld +Name[nn]=hei, verda Name[pl]=witaj świecie Name[pt]=olá mundo Name[pt_BR]=Olá mundo diff --git a/examples/wallpapers/autumn/metadata.desktop b/examples/wallpapers/autumn/metadata.desktop index 7920e602c..7f36a1e28 100644 --- a/examples/wallpapers/autumn/metadata.desktop +++ b/examples/wallpapers/autumn/metadata.desktop @@ -23,6 +23,7 @@ Name[mr]=शरद ऋतु Name[nb]=Høst Name[nds]=Harvsttiet Name[nl]=Herfst +Name[nn]=Haust Name[pa]=ਪਤਝੜ Name[pl]=Jesień Name[pt]=Outono diff --git a/src/desktoptheme/air/metadata.desktop b/src/desktoptheme/air/metadata.desktop index 286968717..9ec698780 100644 --- a/src/desktoptheme/air/metadata.desktop +++ b/src/desktoptheme/air/metadata.desktop @@ -21,6 +21,7 @@ Name[mr]=एअर Name[nb]=Luft Name[nds]=Luft Name[nl]=Air +Name[nn]=Luft Name[pa]=ਏਅਰ Name[pl]=Powietrze Name[pt]=Air @@ -61,6 +62,7 @@ Comment[mr]=शुद्ध हवेचा श्वास Comment[nb]=Et pust av frisk luft Comment[nds]=Wat frische Luft Comment[nl]=Een hap frisse lucht +Comment[nn]=Eit friskt pust Comment[pa]=ਤਾਜ਼ਾ ਹਵਾ ਵਿੱਚ ਸਾਹ ਲਵੋ Comment[pl]=Powiew świeżego powietrza Comment[pt]=Uma brisa de ar fresco diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index 2776a8434..77647a42f 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -19,6 +19,7 @@ Name[lt]=Breeze tamsi Name[nb]=Mørk bris Name[nds]=Breeze düüster Name[nl]=Breeze Dark +Name[nn]=Bris (mørk) Name[pl]=Ciemna bryza Name[pt]=Brisa Escura Name[pt_BR]=Breeze Dark diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index 079847b4a..07bbfc3d1 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -19,6 +19,7 @@ Name[lt]=Breeze Name[nb]=Bris Name[nds]=Breeze Name[nl]=Breeze +Name[nn]=Bris Name[pl]=Bryza Name[pt]=Brisa Name[pt_BR]=Breeze diff --git a/src/desktoptheme/oxygen/metadata.desktop b/src/desktoptheme/oxygen/metadata.desktop index 5aaec7196..66d91df99 100644 --- a/src/desktoptheme/oxygen/metadata.desktop +++ b/src/desktoptheme/oxygen/metadata.desktop @@ -21,6 +21,7 @@ Name[mr]=ऑक्सीजन Name[nb]=Oxygen Name[nds]=Oxygen Name[nl]=Oxygen +Name[nn]=Oksygen Name[pa]=ਆਕਸੀਜਨ Name[pl]=Tlen Name[pt]=Oxygen @@ -61,6 +62,7 @@ Comment[mr]=ऑक्सीजन शैली मध्ये शैली त Comment[nb]=Tema laget i Oxygen-stil Comment[nds]=Muster in den Oxygen-Stil Comment[nl]=Thema in Oxygen-stijl +Comment[nn]=Tema laga i Oksygen-stilen Comment[pa]=ਥੀਮ ਆਕਸੀਜਨ ਸਟਾਇਲ 'ਚ Comment[pl]=Wystrój wzorowany na stylu Tlen Comment[pt]=Um tema feito com o estilo Oxygen diff --git a/src/kpart/plasma-kpart.desktop b/src/kpart/plasma-kpart.desktop index 6b5038eca..8a2890578 100644 --- a/src/kpart/plasma-kpart.desktop +++ b/src/kpart/plasma-kpart.desktop @@ -20,6 +20,7 @@ Name[mr]=प्लाज्मा-kpart Name[nb]=plasma-kpart Name[nds]=Plasma-KPart Name[nl]=plasma-kpart +Name[nn]=plasma-kpart Name[pa]=plasma-kpart Name[pl]=plasma-kpart Name[pt]=plasma-kpart diff --git a/src/plasma/data/servicetypes/plasma-applet.desktop b/src/plasma/data/servicetypes/plasma-applet.desktop index 868c131db..fbb79117a 100644 --- a/src/plasma/data/servicetypes/plasma-applet.desktop +++ b/src/plasma/data/servicetypes/plasma-applet.desktop @@ -24,6 +24,7 @@ Comment[mr]=प्लाज्मा एप्लेट Comment[nb]=Plasma miniprogram Comment[nds]=Plasma-Lüttprogramm Comment[nl]=Plasma-applet +Comment[nn]=Plasma-element Comment[pa]=ਪਾਲਜ਼ਮਾ ਐਪਲਿਟ Comment[pl]=Aplet Plazmy Comment[pt]='Applet' do Plasma diff --git a/src/plasma/data/servicetypes/plasma-containment.desktop b/src/plasma/data/servicetypes/plasma-containment.desktop index f9c139e65..d9e974644 100644 --- a/src/plasma/data/servicetypes/plasma-containment.desktop +++ b/src/plasma/data/servicetypes/plasma-containment.desktop @@ -23,6 +23,7 @@ Comment[mr]=प्लाज्मा एप्लेट कंटेनर व Comment[nb]=Plasma beholder for miniprogram og bakgrunnsopptegner Comment[nds]=Plasma-Gelaats för Lüttprogrammen un Achtergrundpleger Comment[nl]=Container voor plasma-applets en achtergrondinvulling +Comment[nn]=Plasma-behaldar og bakgrunnsmålar Comment[pa]=ਪਲਾਜ਼ਮਾ ਐਪਲਿਟ ਕੰਨਟੇਨਰ ਅਤੇ ਬੈਕਗਰਾਊਂਡ ਪੇਂਟਰ Comment[pl]=Pojemnik apletu Plazmy i malowanie w tle Comment[pt]=Contentor de 'applets' do Plasma e pintor do fundo diff --git a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop index de6f1f303..973d1cbe2 100644 --- a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop +++ b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop @@ -21,6 +21,7 @@ Name[ko]=Plasma 모습과 느낌 Name[nb]=Plasma utseende og oppførsel Name[nds]=Utsehn un Bedenen vun Plasma Name[nl]=Plasma Look-and-Feel +Name[nn]=Utsjånad for Plasma Name[pa]=ਪਲਾਜ਼ਮਾ ਦਿੱਖ ਤੇ ਪਰਭਾਵ Name[pl]=Odczucia i wygląd Plazmy Name[pt]=Aparência e Comportamento do Plasma diff --git a/src/plasma/data/servicetypes/plasma-service.desktop b/src/plasma/data/servicetypes/plasma-service.desktop index f2c070f9f..8ace50bcb 100644 --- a/src/plasma/data/servicetypes/plasma-service.desktop +++ b/src/plasma/data/servicetypes/plasma-service.desktop @@ -24,6 +24,7 @@ Comment[mr]=प्लाज्मा सेवा Comment[nb]=Plasma-tjeneste Comment[nds]=Plasma-Deenst Comment[nl]=Plasma-service +Comment[nn]=Plasma-teneste Comment[pa]=ਪਲਾਜ਼ਮਾ ਸਰਵਿਸ Comment[pl]=Usługa Plazmy Comment[pt]=Serviço do Plasma