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"
2019-12-09 05:18:11 +01:00 · 2019-12-09 05:18:11 +01:00 · d2fba8a760
commit d2fba8a760
parent e19cb44cd4
33 changed files with 40 additions and 0 deletions
--- a/examples/applets/bugreport/metadata.desktop
+++ b/examples/applets/bugreport/metadata.desktop
@ -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
--- a/examples/applets/compactrepresentation/metadata.desktop
+++ b/examples/applets/compactrepresentation/metadata.desktop
@ -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
--- a/examples/applets/conditionalloader/metadata.desktop
+++ b/examples/applets/conditionalloader/metadata.desktop
@ -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
--- a/examples/applets/config/metadata.desktop
+++ b/examples/applets/config/metadata.desktop
@ -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
--- a/examples/applets/dataenginemodel/metadata.desktop
+++ b/examples/applets/dataenginemodel/metadata.desktop
@ -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
--- a/examples/applets/helloworld/metadata.desktop
+++ b/examples/applets/helloworld/metadata.desktop
@ -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
--- a/examples/applets/nowplaying/metadata.desktop
+++ b/examples/applets/nowplaying/metadata.desktop
@ -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)
--- a/examples/applets/samegame/metadata.desktop
+++ b/examples/applets/samegame/metadata.desktop
@ -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)
--- a/examples/applets/testcomponents/metadata.desktop
+++ b/examples/applets/testcomponents/metadata.desktop
@ -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
--- a/examples/applets/testtheme/metadata.desktop
+++ b/examples/applets/testtheme/metadata.desktop
@ -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
--- a/examples/applets/widgetgallery/metadata.desktop
+++ b/examples/applets/widgetgallery/metadata.desktop
@ -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
--- a/examples/containments/testcontainment/metadata.desktop
+++ b/examples/containments/testcontainment/metadata.desktop
@ -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
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@ -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
--- a/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
+++ b/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
@ -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
--- a/examples/wallpapers/autumn/metadata.desktop
+++ b/examples/wallpapers/autumn/metadata.desktop
@ -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
--- a/src/desktoptheme/air/metadata.desktop.cmake
+++ b/src/desktoptheme/air/metadata.desktop.cmake
@ -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
--- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake
+++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake
@ -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
--- a/src/desktoptheme/breeze-light/metadata.desktop.cmake
+++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake
@ -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
--- a/src/desktoptheme/breeze/metadata.desktop.cmake
+++ b/src/desktoptheme/breeze/metadata.desktop.cmake
@ -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
--- a/src/desktoptheme/oxygen/metadata.desktop.cmake
+++ b/src/desktoptheme/oxygen/metadata.desktop.cmake
@ -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
--- a/src/plasma/data/servicetypes/plasma-applet.desktop
+++ b/src/plasma/data/servicetypes/plasma-applet.desktop
@ -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
--- a/src/plasma/data/servicetypes/plasma-dataengine.desktop
+++ b/src/plasma/data/servicetypes/plasma-dataengine.desktop
@ -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
--- a/src/plasma/data/servicetypes/plasma-generic.desktop
+++ b/src/plasma/data/servicetypes/plasma-generic.desktop
@ -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
--- a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop
+++ b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop
@ -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
--- a/src/plasma/data/servicetypes/plasma-service.desktop
+++ b/src/plasma/data/servicetypes/plasma-service.desktop
@ -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
--- a/src/plasma/data/servicetypes/plasma-shell.desktop
+++ b/src/plasma/data/servicetypes/plasma-shell.desktop
@ -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
--- a/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
+++ b/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
@ -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
--- a/src/scriptengines/python/plasma-scriptengine-runner-python.desktop
+++ b/src/scriptengines/python/plasma-scriptengine-runner-python.desktop
@ -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
--- a/src/scriptengines/qml/data/plasma-wallpaper.desktop
+++ b/src/scriptengines/qml/data/plasma-wallpaper.desktop
@ -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
--- a/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop
+++ b/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop
@ -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
--- a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate
+++ b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate
@ -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
--- a/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate
+++ b/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate
@ -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
--- a/templates/qml-plasmoid/qml-plasmoid.kdevtemplate
+++ b/templates/qml-plasmoid/qml-plasmoid.kdevtemplate
@ -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