From 96bb3e76450841b459fd0a5baa9326bad533b9b2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 21 Oct 2016 09:28:41 +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" --- src/desktoptheme/breeze-light/metadata.desktop | 1 + .../packagestructure/containmentactions-packagestructure.json | 1 + src/plasma/packagestructure/dataengine-packagestructure.json | 1 + src/plasma/packagestructure/plasmageneric-packagestructure.json | 1 + src/plasma/packagestructure/plasmatheme-packagestructure.json | 1 + templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate | 2 ++ templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate | 2 ++ templates/qml-plasmoid/qml-plasmoid.kdevtemplate | 2 ++ 8 files changed, 11 insertions(+) diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index 882b47838..908d53cf9 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -12,6 +12,7 @@ Name[fi]=Breeze Light Name[gd]=Oiteag shoilleir Name[gl]=Breeze claro Name[it]=Brezza chiaro +Name[ko]=Breeze Light Name[nl]=Breeze Light Name[nn]=Breeze lys Name[pl]=Lekka Bryza diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json index fc9e3f8ee..0819613e5 100644 --- a/src/plasma/packagestructure/containmentactions-packagestructure.json +++ b/src/plasma/packagestructure/containmentactions-packagestructure.json @@ -22,6 +22,7 @@ "Name[et]": "Konteineritoimingud", "Name[fi]": "Sovelmasäiliön toiminnot", "Name[it]": "Azioni dei contenitori", + "Name[ko]": "컨테이너 동작", "Name[nl]": "Containeracties", "Name[nn]": "Behaldarhandlingar", "Name[pl]": "Działania pojemnika", diff --git a/src/plasma/packagestructure/dataengine-packagestructure.json b/src/plasma/packagestructure/dataengine-packagestructure.json index bc551d4ba..0729343b6 100644 --- a/src/plasma/packagestructure/dataengine-packagestructure.json +++ b/src/plasma/packagestructure/dataengine-packagestructure.json @@ -23,6 +23,7 @@ "Name[et]": "Andmemootor", "Name[fi]": "Tietomoottori", "Name[it]": "Motore dati", + "Name[ko]": "데이터 엔진", "Name[nl]": "Gegevensengine", "Name[nn]": "Datamotor", "Name[pl]": "Silnik danych", diff --git a/src/plasma/packagestructure/plasmageneric-packagestructure.json b/src/plasma/packagestructure/plasmageneric-packagestructure.json index a98abd542..76d2e7d3c 100644 --- a/src/plasma/packagestructure/plasmageneric-packagestructure.json +++ b/src/plasma/packagestructure/plasmageneric-packagestructure.json @@ -22,6 +22,7 @@ "Name[et]": "Üldine", "Name[fi]": "Yleinen", "Name[it]": "Generico", + "Name[ko]": "일반", "Name[nl]": "Algemeen", "Name[nn]": "Generisk", "Name[pl]": "Ogólne", diff --git a/src/plasma/packagestructure/plasmatheme-packagestructure.json b/src/plasma/packagestructure/plasmatheme-packagestructure.json index 6d20fef2e..c9a273f57 100644 --- a/src/plasma/packagestructure/plasmatheme-packagestructure.json +++ b/src/plasma/packagestructure/plasmatheme-packagestructure.json @@ -23,6 +23,7 @@ "Name[et]": "Plasma teema", "Name[fi]": "Plasma-teema", "Name[it]": "Tema di Plasma", + "Name[ko]": "Plasma 테마", "Name[nl]": "Plasma-thema", "Name[nn]": "Plasma-tema", "Name[pl]": "Wystrój Plazmy", diff --git a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate index 272dec9dd..b16a60624 100644 --- a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate +++ b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate @@ -8,6 +8,7 @@ Name[en_GB]=Plasma QML/C++ Applet Name[es]=Miniaplicación en QML/C++ para Plasma Name[fi]=Plasman QML/C++-sovelma Name[it]=Applet QML/C++ di Plasma +Name[ko]=Plasma QML/C++ 애플릿 Name[nl]=Plasma-applet voor QML/C++ Applet Name[nn]=Plasma QML/C++-element Name[pl]=Aplet QML/C++ Plazmy @@ -23,6 +24,7 @@ Comment[ca@valencia]=Una plantilla de miniaplicació del Plasma escrita en una b Comment[en_GB]=A Plasma Applet template written in an hybrid mix of QML and C++: a Plasma applet template displaying a SVG picture and a text Comment[es]=Una plantilla de miniaplicación para Plasma escrita en una mezcla híbrida de QML y C++: una plantilla de miniaplicación para Plasma que muestra una imagen SVG y un texto Comment[it]=Un modello di applet di Plasma scritto in un misto di QML e C++: un modello di applet di Plasma che visualizza un'immagine SVG e un testo +Comment[ko]=QML과 C++가 섞여 있는 Plasma 애플릿 템플릿: SVG 그림과 텍스트를 표시하는 Plasma 애플릿 템플릿 Comment[nl]=Een sjabloon voor Plasma-applet geschreven in een hybride mengel van QML en C++: een Plasma-appletsjabloon die een SVG afbeelding en een tekst toont Comment[nn]=Plasma-elementmal skriven i ei blanding av QML og C++: Ein mal for eit Plasma-element som viser eit SVG-bilete og litt tekst Comment[pl]=Szablon apletu Plazmy napisany jako mieszanina QML i C: szablon apletu plazmy wyświetlający obraz SVG i tekst diff --git a/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate b/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate index fb891a64b..2d647b582 100644 --- a/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate +++ b/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate @@ -8,6 +8,7 @@ Name[en_GB]=Simple Plasma Wallpaper Name[es]=Fondo de escritorio sencillo para Plasma Name[fi]=Yksinkertainen Plasma-taustakuva Name[it]=Sfondo semplice di Plasma +Name[ko]=간단한 Plasma 배경 그림 Name[nl]=Eenvoudige Plasma-bureaubladachtergrond Name[nn]=Enkelt Plasma-bakgrunnsbilete Name[pl]=Prosta Tapeta Plazmy @@ -23,6 +24,7 @@ Comment[ca@valencia]=Plantilla de fons d'escriptori senzill del Plasma: una plan Comment[en_GB]=Simple Plasma Wallpaper template: a Plasma wallpaper template displaying a text Comment[es]=Plantilla de fondo de escritorio sencillo para Plasma: una plantilla de fondo de escritorio para Plasma que muestra un texto Comment[it]=Modello di sfondo semplice di Plasma: un modello di sfondo di Plasma che visualizza un testo +Comment[ko]=간단한 Plasma 배경 그림 템플릿: 텍스트를 표시하는 Plasma 배경 그림 템플릿 Comment[nl]=Sjabloon voor eenvoudige Plasma-bureaubladachtergrond: een sjabloon voor het tonen een Plasma-bureaubladachtergrond met een tekst Comment[nn]=Enkel mal for Plasma-bakgrunnsbilete: Eit Plasma-bakgrunnsbilete med litt tekst Comment[pl]=Szablon Prostej Tapety Plazmy: tapeta Plazmy wyświetlająca tekst diff --git a/templates/qml-plasmoid/qml-plasmoid.kdevtemplate b/templates/qml-plasmoid/qml-plasmoid.kdevtemplate index 5985beade..888ba86d8 100644 --- a/templates/qml-plasmoid/qml-plasmoid.kdevtemplate +++ b/templates/qml-plasmoid/qml-plasmoid.kdevtemplate @@ -9,6 +9,7 @@ Name[en_GB]=Plasma QML Applet Name[es]=Miniaplicación en QML para Plasma Name[fi]=Plasman QML-sovelma Name[it]=Applet QML di Plasma +Name[ko]=Plasma QML 애플릿 Name[nb]=Plasma QML-miniprogram Name[nl]=Plasma QML-applet Name[nn]=Plasma QML-element @@ -25,6 +26,7 @@ Comment[ca@valencia]=Una plantilla de miniaplicació del Plasma en QML: una plan Comment[en_GB]=Plasma QML Applet template: a Plasma applet template displaying a SVG picture and a text Comment[es]=Una plantilla de miniaplicación en QML para Plasma: una plantilla de miniaplicación para Plasma que muestra una imagen SVG y un texto Comment[it]=Un modello di applet di Plasma scritto in QML: un modello di applet di Plasma che visualizza un'immagine SVG e un testo +Comment[ko]=Plasma QML 애플릿 템플릿: SVG 그림과 텍스트를 표시하는 Plasma 애플릿 템플릿 Comment[nl]=Sjabloon voor Plasma-QML-applet: een sjabloon voor een plasma-applet dat een svg-afbeelding en een tekst toont Comment[nn]=Plasma-elementmal skriven i QML: Ein mal for eit Plasma-element som viser eit SVG-bilete og litt tekst Comment[pl]=Szablon apletu Plazmy QML: szablon apletu plazmy wyświetlający obraz SVG i tekst