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-12-09 05:18:11 +01:00
parent e19cb44cd4
commit d2fba8a760
33 changed files with 40 additions and 0 deletions

View File

@ -20,6 +20,7 @@ Comment[id]=Laporkan bug di Plasma
Comment[it]=Segnala un bug in Plasma
Comment[ko]=Plasma
Comment[lt]=Pranešti apie Plasma klaidą
Comment[lv]=Ziņot par Plasma kļūdu
Comment[nb]=Rapporter feil i Plasma
Comment[nds]=En Fehler binnen Plasma künnig maken
Comment[nl]=Een bug in Plasma rapporteren
@ -102,6 +103,7 @@ Name[id]=Bug
Name[it]=Bug
Name[ko]=
Name[lt]=Klaida
Name[lv]=Kļūda
Name[nb]=Feil
Name[nds]=Fehler
Name[nl]=Bug

View File

@ -23,6 +23,7 @@ Name[id]=halo dunia
Name[it]=ciao mondo
Name[ko]=hello world
Name[lt]=sveikas, pasauli
Name[lv]=sveika pasaule
Name[nb]=hallo verden
Name[nds]=Moin Welt
Name[nl]=hallo wereld

View File

@ -22,6 +22,7 @@ Name[id]=Uji Applet
Name[it]=Prova applet
Name[ko]=릿
Name[lt]=Programėlės testas
Name[lv]=Lietotnes tests
Name[mr]=
Name[nb]=Applet-test
Name[nds]=Lüttprogramm-Test

View File

@ -22,6 +22,7 @@ Name[id]=Uji konfigurasi
Name[it]=Prova di configurazione
Name[ko]=
Name[lt]=Konfigūracijos testas
Name[lv]=Konfigurācijas tests
Name[nb]=Oppsettstest
Name[nds]=Instellen-Test
Name[nl]=Test van instellingen

View File

@ -57,6 +57,7 @@ Name[ia]=Modello de Dataengine (Motor de datos)
Name[id]=Model Dataengine
Name[it]=Modello del motore di dati
Name[ko]=
Name[lv]=Datu dzinēja modelis
Name[nb]=Dataengine-modell
Name[nds]=Datenkarn-Modell
Name[nl]=Model van gegevensengine

View File

@ -23,6 +23,7 @@ Name[id]=halo dunia
Name[it]=ciao mondo
Name[ko]=hello world
Name[lt]=sveikas, pasauli
Name[lv]=sveika pasaule
Name[nb]=hallo verden
Name[nds]=Moin Welt
Name[nl]=hallo wereld

View File

@ -20,6 +20,7 @@ Name[id]=Sekarang memutar (QML)
Name[it]=In riproduzione (QML)
Name[ko]= (QML)
Name[lt]=Dabar atkuriama (QML)
Name[lv]=Tagad atskaņo (QML)
Name[nb]=Spiller nå (QML)
Name[nds]=Lopen Stück (QML)
Name[nl]=Speelt nu (QML)

View File

@ -19,6 +19,7 @@ Name[ia]=Mesme Joco (QML)
Name[id]=Permainan Same (QML)
Name[it]=Same game (QML)
Name[ko]= (QML)
Name[lv]=Tā pati spēle (QML)
Name[nb]=Same game (QML)
Name[nds]=SameGame (QML)
Name[nl]=Zelfde spel (QML)

View File

@ -21,6 +21,7 @@ Name[id]=Uji Komponen
Name[it]=Prova dei componenti
Name[ko]=
Name[lt]=Komponentų testas
Name[lv]=Komponentu tests
Name[mr]=
Name[nb]=Komponent-test
Name[nds]=Komponententest

View File

@ -20,6 +20,7 @@ Name[ia]=Essayo de Thema
Name[id]=Uji Tema
Name[it]=Prova del tema
Name[ko]=
Name[lv]=Tēmas tests
Name[nb]=Tema-test
Name[nds]=Mustertest
Name[nl]=Test van thema

View File

@ -20,6 +20,7 @@ Name[ia]=Galleria de widget
Name[id]=Galeri widget
Name[it]=Galleria dei widget
Name[ko]=
Name[lv]=Logdaļu galerija
Name[nb]=Elementgalleri
Name[nds]=Lüttprogramm-Galerie
Name[nl]=Galerij van widgets

View File

@ -19,6 +19,7 @@ Name[ia]=Essayo de Containment
Name[id]=Containment Test
Name[it]=Prova del contenitore
Name[ko]=
Name[lv]=Ietveršanas tests
Name[mr]=
Name[nb]=Oppsamlingstest
Name[nds]=Gelaatstest

View File

@ -18,6 +18,7 @@ Comment[ia]=App Basic
Comment[id]=App Dasar
Comment[it]=Applicazione di base
Comment[ko]=
Comment[lv]=Vienkārša programma
Comment[nl]=Basis app
Comment[nn]=Grunnleggjande program
Comment[pl]=Podstawowa aplikacja
@ -58,6 +59,7 @@ Name[id]=Bug
Name[it]=Bug
Name[ko]=
Name[lt]=Klaida
Name[lv]=Kļūda
Name[nb]=Feil
Name[nds]=Fehler
Name[nl]=Bug

View File

@ -21,6 +21,7 @@ Name[id]=Uji
Name[it]=Prova
Name[ko]=
Name[lt]=Testas
Name[lv]=Tests
Name[mr]=
Name[nb]=Test
Name[nds]=Test

View File

@ -22,6 +22,7 @@ Name[id]=Autumn
Name[it]=Autunno
Name[ko]=
Name[lt]=Ruduo
Name[lv]=Rudens
Name[mr]=
Name[nb]=Høst
Name[nds]=Harvsttiet

View File

@ -21,6 +21,7 @@ Name[id]=Air
Name[it]=Aria
Name[ko]=
Name[lt]=Oras
Name[lv]=Gaiss
Name[mr]=
Name[nb]=Luft
Name[nds]=Luft
@ -67,6 +68,7 @@ Comment[id]=Sebuah hirupan udara yang segar
Comment[it]=Una ventata di aria fresca
Comment[ko]=
Comment[lt]=Gryno oro gurkšnis
Comment[lv]=Svaiga gaisa malks
Comment[mr]=
Comment[nb]=Et pust av frisk luft
Comment[nds]=Wat frische Luft

View File

@ -20,6 +20,7 @@ Name[id]=Breeze Gelap
Name[it]=Brezza scuro
Name[ko]= Breeze
Name[lt]=Breeze tamsus
Name[lv]=Tumšā brīze
Name[nb]=Mørk bris
Name[nds]=Breeze düüster
Name[nl]=Breeze Dark

View File

@ -20,6 +20,7 @@ Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
Name[lt]=Breeze šviesus
Name[lv]=Gaišā brīze
Name[nl]=Breeze Light
Name[nn]=Breeze lys
Name[pl]=Jasna Bryza

View File

@ -20,6 +20,7 @@ Name[id]=Breeze
Name[it]=Brezza
Name[ko]=Breeze
Name[lt]=Breeze
Name[lv]=Brīze
Name[nb]=Bris
Name[nds]=Breeze
Name[nl]=Breeze

View File

@ -21,6 +21,7 @@ Name[id]=Oxygen
Name[it]=Oxygen
Name[ko]=Oxygen
Name[lt]=Oxygen
Name[lv]=Skābeklis
Name[mr]=
Name[nb]=Oxygen
Name[nds]=Oxygen

View File

@ -24,6 +24,7 @@ Comment[id]=Applet Plasma
Comment[it]=Applet di Plasma
Comment[ko]=Plasma 릿
Comment[lt]=Plasma programėlė
Comment[lv]=Plasma lietotne
Comment[mr]=
Comment[nb]=Plasma miniprogram
Comment[nds]=Plasma-Lüttprogramm

View File

@ -24,6 +24,7 @@ Comment[id]=Mesin Data Plasma
Comment[it]=Motore di dati di Plasma
Comment[ko]=Plasma
Comment[lt]=Plasma duomenų variklis
Comment[lv]=Plasma datu dzinējs
Comment[mr]= ि
Comment[nb]=Plasma datamotor
Comment[nds]=Plasma-Datenkarn

View File

@ -23,6 +23,7 @@ Name[id]=Plasma Package
Name[it]=Pacchetto di Plasma
Name[ko]=Plasma
Name[lt]=Plasma paketas
Name[lv]=Plasma pakotne
Name[nb]=Plasma-pakke
Name[nds]=Plasma-Paket
Name[nl]=Plasma-pakket
@ -66,6 +67,7 @@ Comment[ia]=Plasma generic
Comment[id]=Paket Plasma Generik
Comment[it]=Pacchetto generico di Plasma
Comment[ko]= Plasma
Comment[lv]=Vispārēja Plasma pakotne
Comment[nb]=Generisk Plasma-pakke
Comment[nds]=Allmeen Plasma-Paket
Comment[nl]=Algemeen plasma-pakket

View File

@ -22,6 +22,7 @@ Name[ia]=Aspecto (Look and feel) de Plasma
Name[id]=Plasma Look and Feel
Name[it]=Aspetto di Plasma
Name[ko]=Plasma
Name[lv]=Plasma izskats un izturēšanās
Name[nb]=Plasma utseende og oppførsel
Name[nds]=Utsehn un Bedenen vun Plasma
Name[nl]=Plasma uiterlijk en gedrag

View File

@ -24,6 +24,7 @@ Comment[id]=Layanan Plasma
Comment[it]=Servizio di Plasma
Comment[ko]=Plasma
Comment[lt]=Plasma tarnyba
Comment[lv]=Plasma serviss
Comment[mr]=
Comment[nb]=Plasma-tjeneste
Comment[nds]=Plasma-Deenst

View File

@ -23,6 +23,7 @@ Name[id]=Plasma Shell
Name[it]=Shell di Plasma
Name[ko]=Plasma
Name[lt]=Plasma apvalkalas
Name[lv]=Plasma čaula
Name[nb]=Plasma-skall
Name[nds]=Plasma-Konsool
Name[nl]=Plasma Shell
@ -66,6 +67,7 @@ Comment[ia]=Componentes de Plasma Shell
Comment[id]=Komponen Shell Plasma
Comment[it]=Componenti della shella di Plasma
Comment[ko]=Plasma
Comment[lv]=Plasma čaulas komponenti
Comment[nb]=Plasma-skall komponenter
Comment[nds]=Plasma-Konsoolkomponenten
Comment[nl]=Plasma Shell-componenten

View File

@ -20,6 +20,7 @@ Name[id]=Mesin data Python
Name[it]=Motore di dati Python
Name[ko]=
Name[lt]=Python duomenų variklis
Name[lv]=Python datu dzinējs
Name[nb]=Python datamotor
Name[nds]=Python-Datenkarn
Name[nl]=Gegevensengine van Python
@ -63,6 +64,7 @@ Comment[id]=Dukungan mesin data Plasma untuk Python
Comment[it]=Supporto per Python del motore di dati di Plasma
Comment[ko]= Plasma
Comment[lt]=Plasma duomenų variklio palaikymas Python kalbai
Comment[lv]=Plasma datu dzinēja atbalsts priekš Python
Comment[nb]=Plasma datamotor-støtte for Python
Comment[nds]=Plasma-Datenkarnünnerstütten för Python
Comment[nl]=Ondersteuning voor Plasma-gegevensengine voor Python

View File

@ -20,6 +20,7 @@ Name[id]=Python Runner
Name[it]=Esecutore Python
Name[ko]=
Name[lt]=Python paleidiklis
Name[lv]=Python darbinātājs
Name[nb]=Python-kjører
Name[nds]=Python-Dreger
Name[nl]=Python-starter
@ -63,6 +64,7 @@ Comment[id]=Dukungan Pejalan Plasma untuk Python
Comment[it]=Supporto esecutore di Plasma per Python
Comment[ko]=Plasma
Comment[lt]=Plasma paleidiklio palaikymas Python kalbai
Comment[lv]=Plasma darbinātāja atbalsts priekš Python
Comment[nb]=Plasma kjørerstøtte for Python
Comment[nds]=Plasma-Dregerünnerstütten för Python
Comment[nl]=Ondersteuning voor Plasma-starter voor Python

View File

@ -24,6 +24,7 @@ Comment[id]=Wallpaper Plasma
Comment[it]=Sfondo di plasma
Comment[ko]=Plasma
Comment[lt]=Plasma darbalaukio fonas
Comment[lv]=Plasma tapete
Comment[nb]=Plasma tapet
Comment[nds]=Plasma-Achtergrundbild
Comment[nl]=Plasma-bureaubladachtergrond

View File

@ -20,6 +20,7 @@ Name[id]=Ruby Widget
Name[it]=Widget Ruby
Name[ko]=
Name[lt]=Ruby valdiklis
Name[lv]=Ruby logdaļa
Name[nb]=Ruby-element
Name[nds]=Ruby-Lüttprogramm
Name[nl]=Ruby-widget

View File

@ -20,6 +20,7 @@ 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[lv]=Plasma QML/C++ lietotne
Name[nl]=Plasma-applet voor QML/C++ Applet
Name[nn]=Plasma QML/C++-element
Name[pl]=Aplet QML/C++ Plazmy

View File

@ -20,6 +20,7 @@ Name[id]=Wallpaper Plasma Sederhana
Name[it]=Sfondo semplice di Plasma
Name[ko]=간단한 Plasma 배경 그림
Name[lt]=Paprastas Plasma darbalaukio fonas
Name[lv]=Vienkārša Plasma tapete
Name[nl]=Eenvoudige Plasma-bureaubladachtergrond
Name[nn]=Enkelt Plasma-bakgrunnsbilete
Name[pl]=Prosta Tapeta Plazmy

View File

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