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"
This commit is contained in:
l10n daemon script 2019-11-06 05:33:56 +01:00
parent 96b7fc21f5
commit 876dafaedb
32 changed files with 39 additions and 17 deletions

View File

@ -60,7 +60,7 @@ Keywords[ia]=plasma;bugzilla;bug;development;support;
Keywords[id]=plasma;bugzilla;bug;development;support;
Keywords[it]=plasma;bugzilla;bug;sviluppo;supporto;
Keywords[ko]=plasma;bugzilla;bug;development;support;;;;
Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas;
Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas;programavimas;strigtis;
Keywords[nb]=plasma;bugzilla;feil;utvikling;støtte;
Keywords[nl]=plasma;bugzilla;bug;ontwikkeling;ondersteuning;
Keywords[nn]=plasma;bugzilla;feil;utvikling;støtte;
@ -101,7 +101,7 @@ Name[ia]=Bug
Name[id]=Bug
Name[it]=Bug
Name[ko]=
Name[lt]=Vabalas
Name[lt]=Klaida
Name[nb]=Feil
Name[nds]=Fehler
Name[nl]=Bug

View File

@ -22,7 +22,7 @@ Name[ia]=Salute mundo
Name[id]=halo dunia
Name[it]=ciao mondo
Name[ko]=hello world
Name[lt]=sveikas pasauli
Name[lt]=sveikas, pasauli
Name[nb]=hallo verden
Name[nds]=Moin Welt
Name[nl]=hallo wereld

View File

@ -22,7 +22,7 @@ Name[ia]=Salute mundo
Name[id]=halo dunia
Name[it]=ciao mondo
Name[ko]=hello world
Name[lt]=sveikas pasauli
Name[lt]=sveikas, pasauli
Name[nb]=hallo verden
Name[nds]=Moin Welt
Name[nl]=hallo wereld

View File

@ -19,7 +19,7 @@ Name[ia]=Ora reproducente (QML)
Name[id]=Sekarang memutar (QML)
Name[it]=In riproduzione (QML)
Name[ko]= (QML)
Name[lt]=Dabar grojama (QML)
Name[lt]=Dabar atkuriama (QML)
Name[nb]=Spiller nå (QML)
Name[nds]=Lopen Stück (QML)
Name[nl]=Speelt nu (QML)

View File

@ -57,7 +57,7 @@ Name[ia]=Bug
Name[id]=Bug
Name[it]=Bug
Name[ko]=
Name[lt]=Vabalas
Name[lt]=Klaida
Name[nb]=Feil
Name[nds]=Fehler
Name[nl]=Bug

View File

@ -19,7 +19,7 @@ Name[ia]=Brisa obscure
Name[id]=Breeze Gelap
Name[it]=Brezza scuro
Name[ko]= Breeze
Name[lt]=Breeze tamsi
Name[lt]=Breeze tamsus
Name[nb]=Mørk bris
Name[nds]=Breeze düüster
Name[nl]=Breeze Dark

View File

@ -19,6 +19,7 @@ Name[ia]=Brisa legier
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
Name[lt]=Breeze šviesus
Name[nl]=Breeze Light
Name[nn]=Breeze lys
Name[pl]=Jasna Bryza
@ -54,6 +55,7 @@ Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro del KDE VDG
Comment[ko]=KDE Breeze Light
Comment[lt]=Breeze šviesus pagal KDE VDG
Comment[nl]=Breeze Light door de KDE VDG
Comment[nn]=Breeze lys frå KDE VDG
Comment[pl]=Jasna Bryza autorstwa KDE VDG

View File

@ -66,7 +66,7 @@ Comment[ia]=Thema facite in le stilo de Oxygen
Comment[id]=Tema dikelarkan dalam gaya Oxygen
Comment[it]=Tema realizzato nello stile di Oxygen
Comment[ko]=Oxygen
Comment[lt]=Apipavidalinimas padarytas Oxygen stiliumi
Comment[lt]=Oxygen stiliumi sukurtas apipavidalinimas
Comment[mr]=
Comment[nb]=Tema laget i Oxygen-stil
Comment[nds]=Muster in den Oxygen-Stil

View File

@ -23,7 +23,7 @@ Comment[ia]=Applet Plasma
Comment[id]=Applet Plasma
Comment[it]=Applet di Plasma
Comment[ko]=Plasma 릿
Comment[lt]=Plasma papildinys
Comment[lt]=Plasma programėlė
Comment[mr]=
Comment[nb]=Plasma miniprogram
Comment[nds]=Plasma-Lüttprogramm

View File

@ -22,7 +22,7 @@ Comment[ia]=Receptaculo applet Plasma e pictor de fundo
Comment[id]=Wadah applet Plasma dan pelukis latarbelakang
Comment[it]=Contenitore di applet di Plasma e creazione sfondo
Comment[ko]=Plasma 릿
Comment[lt]=Plasma programėlės dėklas ir fono piešimas
Comment[lt]=Plasma programėlės konteineris ir fono piešimas
Comment[mr]=
Comment[nb]=Plasma beholder for miniprogram og bakgrunnsopptegner
Comment[nds]=Plasma-Gelaats för Lüttprogrammen un Achtergrundpleger

View File

@ -23,7 +23,7 @@ Comment[ia]=Motor de datos de Plasma
Comment[id]=Mesin Data Plasma
Comment[it]=Motore di dati di Plasma
Comment[ko]=Plasma
Comment[lt]=Plasma duomenų varikliukas
Comment[lt]=Plasma duomenų variklis
Comment[mr]= ि
Comment[nb]=Plasma datamotor
Comment[nds]=Plasma-Datenkarn

View File

@ -22,7 +22,7 @@ Comment[ia]=Definition del structura de pacchetto de Plasma
Comment[id]=Definisi struktur paket Plasma
Comment[it]=Definizione della struttura di un pacchetto di Plasma
Comment[ko]=Plasma
Comment[lt]=Plasma paketo struktūros aprašymas
Comment[lt]=Plasma paketo struktūros apibrėžimas
Comment[mr]=
Comment[nb]=Definisjon av Plasma pakkestruktur
Comment[nds]=Paketstruktuur-Fastleggen vun Plasma

View File

@ -22,7 +22,7 @@ Comment[ia]=Extension del language de script de Plasma
Comment[id]=Ekstensi bahasa penskripan untuk Plasma
Comment[it]=Estensione del linguaggio di creazione script per Plasma
Comment[ko]=Plasma
Comment[lt]=Scenarijų kalbos praplėtimas, skirtas Plasma
Comment[lt]=Scenarijų kalbos plėtinys, skirtas Plasma
Comment[mr]= ि
Comment[nb]=Skriptspråk-utvidelse for Plasma
Comment[nds]=Skriptspraak-Verwiedern för Plasma

View File

@ -23,6 +23,7 @@
"Name[id]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[ko]": "Aaron Seigo",
"Name[lt]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
"Name[nn]": "Aaron Seigo",
"Name[pl]": "Aaron Seigo",
@ -63,6 +64,7 @@
"Name[id]": "Containment Actions",
"Name[it]": "Azioni dei contenitori",
"Name[ko]": "컨테이너 동작",
"Name[lt]": "Suvaržymo veiksmai",
"Name[nl]": "Containeracties",
"Name[nn]": "Behaldarhandlingar",
"Name[pl]": "Działania pojemnika",

View File

@ -23,6 +23,7 @@
"Name[id]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[ko]": "Aaron Seigo",
"Name[lt]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
"Name[nn]": "Aaron Seigo",
"Name[pl]": "Aaron Seigo",
@ -65,6 +66,7 @@
"Name[id]": "Mesin Data",
"Name[it]": "Motore dati",
"Name[ko]": "데이터 엔진",
"Name[lt]": "Duomenų variklis",
"Name[nl]": "Gegevensengine",
"Name[nn]": "Datamotor",
"Name[pl]": "Silnik danych",

View File

@ -23,6 +23,7 @@
"Name[id]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[ko]": "Aaron Seigo",
"Name[lt]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
"Name[nn]": "Aaron Seigo",
"Name[pl]": "Aaron Seigo",
@ -64,6 +65,7 @@
"Name[id]": "Generik",
"Name[it]": "Generico",
"Name[ko]": "일반",
"Name[lt]": "Bendrinis",
"Name[nl]": "Algemeen",
"Name[nn]": "Generisk",
"Name[pl]": "Ogólne",

View File

@ -23,6 +23,7 @@
"Name[id]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[ko]": "Aaron Seigo",
"Name[lt]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
"Name[nn]": "Aaron Seigo",
"Name[pl]": "Aaron Seigo",
@ -65,6 +66,7 @@
"Name[id]": "Tema Plasma",
"Name[it]": "Tema di Plasma",
"Name[ko]": "Plasma 테마",
"Name[lt]": "Plasma apipavidalinimas",
"Name[nl]": "Plasma-thema",
"Name[nn]": "Plasma-tema",
"Name[pl]": "Wystrój Plazmy",

View File

@ -23,6 +23,7 @@
"Name[id]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[ko]": "Aaron Seigo",
"Name[lt]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
"Name[nn]": "Aaron Seigo",
"Name[pl]": "Aaron Seigo",
@ -65,6 +66,7 @@
"Name[id]": "Plasmoid",
"Name[it]": "Plasmoide",
"Name[ko]": "Plasmoid",
"Name[lt]": "Plasma įskiepis",
"Name[nl]": "Plasmoid",
"Name[nn]": "Plasmoide",
"Name[pl]": "Plazmoid",

View File

@ -19,7 +19,7 @@ Name[ia]=Python Runner (Executor de Python)
Name[id]=Python Runner
Name[it]=Esecutore Python
Name[ko]=
Name[lt]=Python leistukas
Name[lt]=Python paleidiklis
Name[nb]=Python-kjører
Name[nds]=Python-Dreger
Name[nl]=Python-starter

View File

@ -64,7 +64,7 @@ Comment[ia]=Widget native de Plasma scribite in QLM e JavaScript
Comment[id]=Widget Plasma bawaan ditulis dalam QML dan JavaScript
Comment[it]=Widget nativo di Plasma scritto in QML e JavaScript
Comment[ko]=QML Plasma
Comment[lt]=Nuosavas Plasma valdiklis parašytas QML ir JavaScript kalba
Comment[lt]=Savas Plasma valdiklis parašytas QML ir JavaScript kalba
Comment[mr]=ि QML ि ि
Comment[nb]=Plasmaelement for dette systemet, skrevet i QML og JavaScript
Comment[nds]=En orginaal Plasma-Lüttprogramm, schreven in QML un JavaScript

View File

@ -23,7 +23,7 @@ Comment[ia]=Tapete de papiro de Plasma
Comment[id]=Wallpaper Plasma
Comment[it]=Sfondo di plasma
Comment[ko]=Plasma
Comment[lt]=Plasma apmušalas
Comment[lt]=Plasma darbalaukio fonas
Comment[nb]=Plasma tapet
Comment[nds]=Plasma-Achtergrundbild
Comment[nl]=Plasma-bureaubladachtergrond

View File

@ -62,7 +62,7 @@ Comment[ia]=Widget native de Plasma scribite in Ruby
Comment[id]=Widget Plasma bawaan ditulis dalam Ruby
Comment[it]=Widget nativo di Plasma scritto in Ruby
Comment[ko]= Plasma
Comment[lt]=Nuosavas Plasma valdiklis parašytas Ruby kalba
Comment[lt]=Savas Plasma valdiklis parašytas Ruby kalba
Comment[nb]=Plasmaelement for dette systemet, skrevet i Ruby
Comment[nds]=En orginaal Plasma-Lüttprogramm, schreven in Ruby
Comment[nl]=Plasma-widget geschreven in Ruby

View File

@ -19,6 +19,7 @@ Name[ia]=Applet QML/C++ de Plasma
Name[id]=Applet QML/C++ Plasma
Name[it]=Applet QML/C++ di Plasma
Name[ko]=Plasma QML/C++ 애플릿
Name[lt]=Plasma QML/C++ programėlė
Name[nl]=Plasma-applet voor QML/C++ Applet
Name[nn]=Plasma QML/C++-element
Name[pl]=Aplet QML/C++ Plazmy

View File

@ -19,6 +19,7 @@ Name[ia]=%{APPNAME}
Name[id]=%{APPNAME}
Name[it]=%{APPNAME}
Name[ko]=%{APPNAME}
Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}

View File

@ -19,6 +19,7 @@ Name[ia]=%{APPNAME}
Name[id]=%{APPNAME}
Name[it]=%{APPNAME}
Name[ko]=%{APPNAME}
Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}

View File

@ -16,6 +16,7 @@ Name[hu]=Egyszerű Plasma háttérkép QML bővítménnyel
Name[id]=Wallpaper Plasma sederhana dengan ektensi QML
Name[it]=Semplice sfondo di Plasma con estensione QML
Name[ko]=QML 확장을 사용하는 간단한 Plasma 배경 그림
Name[lt]=Paprastas Plasma darbalaukio fonas su QML plėtiniu
Name[nl]=Eenvoudige Plasma-bureaubladachtergrond met QML-extensie
Name[nn]=Enkelt Plasma-bakgrunnsbilete med QML-utviding
Name[pl]=Prosta tapeta Plazmy z rozszerzeniami QML

View File

@ -19,6 +19,7 @@ Name[ia]=%{APPNAME}
Name[id]=%{APPNAME}
Name[it]=%{APPNAME}
Name[ko]=%{APPNAME}
Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}

View File

@ -19,6 +19,7 @@ Name[ia]=Simple tapete de papiro de Plasma
Name[id]=Wallpaper Plasma Sederhana
Name[it]=Sfondo semplice di Plasma
Name[ko]=간단한 Plasma 배경 그림
Name[lt]=Paprastas Plasma darbalaukio fonas
Name[nl]=Eenvoudige Plasma-bureaubladachtergrond
Name[nn]=Enkelt Plasma-bakgrunnsbilete
Name[pl]=Prosta Tapeta Plazmy

View File

@ -19,6 +19,7 @@ Name[ia]=%{APPNAME}
Name[id]=%{APPNAME}
Name[it]=%{APPNAME}
Name[ko]=%{APPNAME}
Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}

View File

@ -17,6 +17,7 @@ Name[ia]=Applet QML de Plasma con extension QML
Name[id]=Applet QML Plasma dengan ektensi QML
Name[it]=Applet QML di Plasma con estensione QML
Name[ko]=QML 확장을 사용하는 Plasma QML 애플릿
Name[lt]=Plasma QML programėlė su QML plėtiniu
Name[nl]=Plasma QML-applet met QML-extensie
Name[nn]=Plasma QML-element med QML-utviding
Name[pl]=Aplet QML Plazmy z rozszerzeniami QML

View File

@ -19,6 +19,7 @@ Name[ia]=%{APPNAME}
Name[id]=%{APPNAME}
Name[it]=%{APPNAME}
Name[ko]=%{APPNAME}
Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}

View File

@ -19,6 +19,7 @@ Name[ia]=Applet QML de Plasma
Name[id]=Applet QML Plasma
Name[it]=Applet QML di Plasma
Name[ko]=Plasma QML 애플릿
Name[lt]=Plasma QML programėlė
Name[nb]=Plasma QML-miniprogram
Name[nl]=Plasma QML-applet
Name[nn]=Plasma QML-element