From 64bc9941fc6dd06d598ecea1eda386cdb1273397 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Aug 2017 04:31:59 +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" --- applets/activitybar/metadata.desktop | 2 +- applets/appmenu/package/metadata.desktop | 1 + kioslave/desktop/desktopnotifier.desktop | 1 + lookandfeel/metadata.desktop | 1 + runners/baloo/plasma-runner-baloosearch.desktop | 1 + templates/ion-dataengine/ion-dataengine.kdevtemplate | 1 + wallpapers/color/metadata.desktop | 1 + wallpapers/image/slideshowpackage/metadata.desktop | 1 + 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/applets/activitybar/metadata.desktop b/applets/activitybar/metadata.desktop index 09f76e22b..48f545b01 100644 --- a/applets/activitybar/metadata.desktop +++ b/applets/activitybar/metadata.desktop @@ -115,7 +115,7 @@ Comment[nb]=Fanelinje for å bytte mellom aktiviteter Comment[nds]=Paneelbalken, mit den sik Aktiviteten wesseln laat Comment[nl]=Tabbalk om van activiteit te wisselen Comment[nn]=Fanelinje for å byta mellom aktivitetar -Comment[pa]=ਸਰਗਰਮੀਆਂ ਨੂੰ ਬਦਲਣ ਲਈ ਟੈਬਬਾਰ +Comment[pa]=ਸਰਗਰਮੀਆਂ ਨੂੰ ਬਦਲਣ ਲਈ ਟੈਬ ਪੱਟੀ Comment[pl]=Pasek kart do przełączania aktywności Comment[pt]=Barra de páginas para mudar de actividades Comment[pt_BR]=Barra de abas para alternar atividades diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index 5a4b4703f..98d01e4dc 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -54,6 +54,7 @@ Comment[it]=Menu classico per trovare e avviare le applicazioni Comment[lt]=Klasikinis meniu programų paieškai ir paleidimui Comment[nl]=Klassiek menu voor zoeken en starten van toepassingen Comment[nn]=Klassisk meny for å finna og starta program +Comment[pa]=ਐਪਲੀਕੇਸ਼ਨ ਲੱਭਣ ਤੇ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕਲਾਸਿਕ ਮੇਨੂ Comment[pl]=Klasyczne menu do znajdowania i uruchamiania aplikacji Comment[pt]=Menu clássico para descobrir e iniciar as aplicações Comment[pt_BR]=Menu clássico para encontrar e iniciar aplicativos diff --git a/kioslave/desktop/desktopnotifier.desktop b/kioslave/desktop/desktopnotifier.desktop index 51a48a5b4..48940f064 100644 --- a/kioslave/desktop/desktopnotifier.desktop +++ b/kioslave/desktop/desktopnotifier.desktop @@ -70,6 +70,7 @@ Comment[ko]=디렉터리 변경 사항을 감시합니다 Comment[lt]=Stebi aplanko pakeitimus Comment[nl]=Mappen monitoren op wijzigingen Comment[nn]=Overvakar mapper for endringar +Comment[pa]=ਬਦਲਣ ਲਈ ਮਾਨੀਟਰਾਂ ਦੀਆਂ ਦਿਸ਼ਾਵਾਂ Comment[pl]=Monitoruje katalogi w poszukiwaniu zmian Comment[pt]=Vigia as modificações em determinadas pastas Comment[pt_BR]=Monitora as alterações nas pastas diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index de58b0813..731e98e47 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -63,6 +63,7 @@ Keywords[ko]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shut Keywords[lt]=Darbalaukis;Erdvė;Išvaizda;Išvaizda ir turinys;Atsijungti;užrakinti;sulaikyti;Išjungti;Hibernuoti; Keywords[nl]=Bureaublad;Werkruimte;Uiterlijk;Uiterlijk en gedrag;Afmelden;Vergrendelen;Onderbreken;Afsluiten;Slapen naar schijf; Keywords[nn]=skrivebord;arbeidsområde;arbeidsflate;ustjånad;åtferd;utlogging;logga ut;låsa;låsing;pausemodus;kvilemodus;dvalemodus;avslutting; +Keywords[pa]=ਡੈਸਕਟਾਪ;ਵਰਕਸਪੇਸ;ਦਿੱਖ;ਲਾਗਆਉਟ;ਲਾਕ;ਸਸਪੈਂਡ;ਬੰਦ ਕਰੋ;ਹਾਈਬਰਨੇਟ; Keywords[pl]=Pulpit;Przestrzeń robocza;Wygląd;Wygląd i Odczucia;Wylogowanie;Zablokowanie ;Wstrzymanie;Zamknięcie;Hibernowanie;Wrażenia; Keywords[pt]=Ecrã;Área de Trabalho;Aparência;Aparência e Comportamento;Encerrar;Bloquear;Suspender;Desligar;Hibernar; Keywords[pt_BR]=Área de trabalho;Espaço de trabalho;Aparência;Aparência e Comportamento;Encerrar sessão;Bloquear;Suspender;Desligar;Hibernar; diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop index 3b654d725..073d1536a 100644 --- a/runners/baloo/plasma-runner-baloosearch.desktop +++ b/runners/baloo/plasma-runner-baloosearch.desktop @@ -64,6 +64,7 @@ Comment[ko]=파일, 이메일, 연락처 검색 Comment[lt]=Ieško failuose, el. laiškuose ir kontaktuose Comment[nl]=Doorzoekt bestanden, e-mailberichten en contactpersonen Comment[nn]=Søk gjennom filer, e-postar og kontaktar +Comment[pa]=ਫ਼ਾਇਲਾਂ, ਈਮੇਲਾਂ ਅਤੇ ਸੰਪਰਕਾਂ 'ਚੋਂ ਲੱਭੋ Comment[pl]=Wyszukuje w plikach, poczcie i kontaktach Comment[pt]=Pesquisa nos ficheiros, e-mails e contactos Comment[pt_BR]=Pesquisa nos arquivos, e-mails e contatos diff --git a/templates/ion-dataengine/ion-dataengine.kdevtemplate b/templates/ion-dataengine/ion-dataengine.kdevtemplate index f9b19bcac..a3075c8f4 100644 --- a/templates/ion-dataengine/ion-dataengine.kdevtemplate +++ b/templates/ion-dataengine/ion-dataengine.kdevtemplate @@ -19,6 +19,7 @@ Name[it]=Motore Ion di Plasma Weather Name[ko]=Plasma 날씨 Ion 데이터 엔진 Name[nl]=Plasma gegevensengine voor weersvoorspelling Name[nn]=Plasma Ion-datamotor for vêr +Name[pa]=ਪਲਾਜ਼ਮਾ ਮੌਸਮ ਆਈਨ ਡਾਟਾ-ਇੰਜਣ Name[pl]=Jonowy silnik danych pogody Plazmy Name[pt]=Motor de Dados Meteorológicos Ion do Plasma Name[pt_BR]=Plasma Weather Ion Dataengine diff --git a/wallpapers/color/metadata.desktop b/wallpapers/color/metadata.desktop index c3b744d51..f4f1acdc5 100644 --- a/wallpapers/color/metadata.desktop +++ b/wallpapers/color/metadata.desktop @@ -57,6 +57,7 @@ Comment[es]=Fondo del escritorio de color liso Comment[eu]=Kolore bakarreko horma-papera Comment[it]=Sfondo con colore semplice Comment[nl]=Vlakke kleur achtergrond +Comment[pa]=ਇੱਕ ਰੰਗ ਦਾ ਵਾਲਪੇਪਰ Comment[pt]=Papel de parede de cor simples Comment[sk]=Tapeta obyčajná farba Comment[sr]=Проста боја као тапет diff --git a/wallpapers/image/slideshowpackage/metadata.desktop b/wallpapers/image/slideshowpackage/metadata.desktop index bb8f0435f..e1a3b3140 100644 --- a/wallpapers/image/slideshowpackage/metadata.desktop +++ b/wallpapers/image/slideshowpackage/metadata.desktop @@ -85,6 +85,7 @@ Comment[es]=Fondo de escritorio de presentación Comment[eu]=Filmina erakusketa horma-papera Comment[it]=Sfondo con presentazione Comment[nl]=Achtergrond met diavoorstelling +Comment[pa]=ਸਲਾਈਡ-ਸ਼ੋ ਵਾਲਪੇਪਰ Comment[pt]=Papel de parede da apresentação Comment[sk]=Tapeta prezentácia Comment[sr]=Слајд‑шоу као тапет