From 5663500132aafc7cb0ba60ce214aff16b15d1ae1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Aug 2018 05:51:51 +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" --- examples/applets/conditionalloader/metadata.desktop | 2 +- examples/applets/dataenginemodel/metadata.desktop | 2 +- examples/containments/testcontainment/metadata.desktop | 2 +- .../plasma-dataengine-example-customDataContainers.desktop | 4 ++-- src/plasma/data/servicetypes/plasma-applet.desktop | 2 +- src/plasma/data/servicetypes/plasma-containment.desktop | 2 +- .../data/servicetypes/plasma-containmentactions.desktop | 2 +- .../packagestructure/containmentactions-packagestructure.json | 2 +- templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate | 4 ++-- .../qml-plasmoid-with-qml-extension.kdevtemplate | 4 ++-- templates/qml-plasmoid/qml-plasmoid.kdevtemplate | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/applets/conditionalloader/metadata.desktop b/examples/applets/conditionalloader/metadata.desktop index 67de48e70..8e0b3f049 100644 --- a/examples/applets/conditionalloader/metadata.desktop +++ b/examples/applets/conditionalloader/metadata.desktop @@ -12,7 +12,7 @@ Name[de]=Miniprogrammtest Name[en_GB]=Applet Test Name[es]=Prueba de miniaplicación Name[et]=Apleti test -Name[eu]=Applet proba +Name[eu]=Aplikaziotxo-proba Name[fi]=Sovelmatesti Name[fr]=Applet test Name[gd]=Deuchainn air aplaid diff --git a/examples/applets/dataenginemodel/metadata.desktop b/examples/applets/dataenginemodel/metadata.desktop index 1084add10..ff14d9569 100644 --- a/examples/applets/dataenginemodel/metadata.desktop +++ b/examples/applets/dataenginemodel/metadata.desktop @@ -7,7 +7,7 @@ Comment[de]=Miniprogramm-Beispiel, das die Anwendung von Modellen eingebettet in Comment[en_GB]=Example applet that shows how to use Models embedded in DataEngines Comment[es]=Miniaplicación de ejemplo que muestra cómo usar modelos empotrados en motores de datos Comment[et]=Näidisaplett selle kohta, kuidas kasutada andmemootoritesse põimitud mudeleid -Comment[eu]=Adibide appleta, erakusten duena 'DataEngine'tan txertatutako ereduak nola erabili +Comment[eu]=Adibide aplikaziotxoa, «DataEngine»etan kapsulatutako modeloak nola erabili erakusten duena Comment[fi]=Esimerkkisovelma, joka näyttää, miten tietomoottoreihin upotettuja malleja käytetään Comment[fr]=Exemple d'applet qui montre comment utiliser les modèles embarqués dans DataEngines Comment[gd]=Aplaid-eisimpleir a sheallas mar a chleachdas tu modailean leabaichte ann an DataEngines diff --git a/examples/containments/testcontainment/metadata.desktop b/examples/containments/testcontainment/metadata.desktop index 84b11bbf5..f836c4e6d 100644 --- a/examples/containments/testcontainment/metadata.desktop +++ b/examples/containments/testcontainment/metadata.desktop @@ -9,7 +9,7 @@ Name[de]=Container-Test Name[en_GB]=Containment Test Name[es]=Prueba de contenedor Name[et]=Konteineri test -Name[eu]=Edukiontzi proba +Name[eu]=Konfinamendu-proba Name[fi]=Sovelmasäiiliötesti Name[fr]=Test du conteneur Name[gd]=Deuchainn air soithichean diff --git a/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop b/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop index be9112430..55db74bcf 100644 --- a/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop +++ b/examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop @@ -8,7 +8,7 @@ Name[de]=Benutzerdefinierte Datencontainer Name[en_GB]=Custom DataContainers Name[es]=«DataContainers» personalizados Name[et]=Kohandatud andmekonteinerid -Name[eu]='DataContainer' pertsonalizatuak +Name[eu]=Norberak finkatutako «DataContainer»rak Name[fi]=Mukautetut DataContainerit Name[fr]=DataContainers personnalisés Name[gd]=DataContainers gnàthaichte @@ -47,7 +47,7 @@ Comment[de]=Eine Demonstration wie Unterklassen von Datencontainern erstellt wer Comment[en_GB]=A demonstration of how to subclass DataContainer Comment[es]=Una demostración de cómo derivar una clase de «DataContainer» Comment[et]=Näidis, kuidas muuta andmekonteiner alamklassiks -Comment[eu]='DataContainer' azpiklase bat egiteko erakustaldi bat +Comment[eu]=«DataContainer» azpiklase bat egiteko erakustaldi bat Comment[fi]=Demonstraatio DataContainerin aliluokittamisesta Comment[fr]=Une démonstration de comment faire une sous-classe de « DataContainer » Comment[gd]=Taisbeanadh air mar a chruthaicheas tu fo-chlasaichean aig DataContainer diff --git a/src/plasma/data/servicetypes/plasma-applet.desktop b/src/plasma/data/servicetypes/plasma-applet.desktop index 0736a4d5d..67c06779b 100644 --- a/src/plasma/data/servicetypes/plasma-applet.desktop +++ b/src/plasma/data/servicetypes/plasma-applet.desktop @@ -14,7 +14,7 @@ Comment[de]=Plasma-Miniprogramm Comment[en_GB]=Plasma applet Comment[es]=Miniaplicación para Plasma Comment[et]=Plasma aplett -Comment[eu]=Plasma appleta +Comment[eu]=Plasma aplikaziotxoa Comment[fi]=Plasma-sovelma Comment[fr]=Applet Plasma Comment[gd]=Aplaid Plasma diff --git a/src/plasma/data/servicetypes/plasma-containment.desktop b/src/plasma/data/servicetypes/plasma-containment.desktop index bf8609e27..728469501 100644 --- a/src/plasma/data/servicetypes/plasma-containment.desktop +++ b/src/plasma/data/servicetypes/plasma-containment.desktop @@ -12,7 +12,7 @@ Comment[de]=Plasma-Programmcontainer und Hintergrund-Zeichnung Comment[en_GB]=Plasma applet container and background painter Comment[es]=Contenedor de miniaplicación de Plasma y pintor de fondo Comment[et]=Plasma apleti konteiner ja tausta joonistaja -Comment[eu]=Plasma applet edukitzailea eta atzealdeko margotzailea +Comment[eu]=Plasmaren aplikaziotxo edukitzailea eta atzealdeko margotzailea Comment[fi]=Plasma-sovelmasäiliö ja taustan piirrin Comment[fr]=Conteneur d'applets Plasma et décor d'arrière-plan Comment[gd]=Soitheach aplaidean agus peantair cùlaibh Plasma diff --git a/src/plasma/data/servicetypes/plasma-containmentactions.desktop b/src/plasma/data/servicetypes/plasma-containmentactions.desktop index dd278cd3f..ac2b9fafd 100644 --- a/src/plasma/data/servicetypes/plasma-containmentactions.desktop +++ b/src/plasma/data/servicetypes/plasma-containmentactions.desktop @@ -13,7 +13,7 @@ Comment[de]=Plasma-Container-Aktionen Comment[en_GB]=Plasma ContainmentActions Comment[es]=«ContainmentActions» de Plasma Comment[et]=Plasma konteineritoimingud -Comment[eu]=Plasma 'ContainmentActions' +Comment[eu]=Plasmaren konfinamendu-ekintzak Comment[fi]=Plasma ContainmentActions Comment[fr]=Actions de conteneur de Plasma Comment[gd]=Plasma ContainmentActions diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json index 0d676743a..f4efefc6b 100644 --- a/src/plasma/packagestructure/containmentactions-packagestructure.json +++ b/src/plasma/packagestructure/containmentactions-packagestructure.json @@ -21,7 +21,7 @@ "Name[el]": "Ενέργειες υποδοχέα", "Name[es]": "Acciones del contenedor", "Name[et]": "Konteineritoimingud", - "Name[eu]": "Edukiontzien ekintzak", + "Name[eu]": "Konfinamenduen ekintzak", "Name[fi]": "Sovelmasäiliön toiminnot", "Name[fr]": "Actions de conteneur", "Name[gl]": "Accións de contención", diff --git a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate index 89eb8f33a..deefc4258 100644 --- a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate +++ b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate @@ -10,7 +10,7 @@ Name[da]=Plasma QML/C++-applet Name[de]=Plasma-QML/C++-Miniprogramm Name[en_GB]=Plasma QML/C++ Applet Name[es]=Miniaplicación en QML/C++ para Plasma -Name[eu]=Plasma QML/C++ appleta +Name[eu]=Plasma QML/C++ aplikaziotxoa Name[fi]=Plasman QML/C++-sovelma Name[fr]=Applet Plasma QML/C++ Name[gl]=Miniaplicativo QML/C++ para Plasma @@ -41,7 +41,7 @@ Comment[ca@valencia]=Una plantilla de miniaplicació del Plasma escrita en una b Comment[da]=En skabelon til en Plasma-applet skrevet i et hybrid-miks af QML og C++: En skabelon til Plasma som viser et SVG-billede og en tekst 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[eu]=Plasma applet txantiloi bat QML eta C++ arteko nahasketa hibrido batean idatzia: Plasma applet txantiloi bat SVG irudi bat eta testu bat bistaratzen dituena +Comment[eu]=Plasma aplikaziotxo-txantiloi bat QML eta C++ arteko nahasketa hibrido batean idatzia: Plasma aplikaziotxo-txantiloi bat SVG irudi bat eta testu bat bistaratzen dituena Comment[fi]=QML:n ja C++:n hybridikoosteella kirjoitettu Plasma-sovelmamalli, joka näyttää SVG-kuvan ja tekstin Comment[fr]=Un modèle d'applet Plasma écrit dans un mélange hybride de QML et de C++ : un modèle d'applet Plasma qui affiche une image SVG et du texte Comment[gl]=Un modelo de miniaplicativo de Plasma escrito nun híbrido de QML e C++: un modelo de miniaplicativo de Plasma que mostra unha imaxe SVG e un texto. diff --git a/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate b/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate index 82a3a654c..5dd72addd 100644 --- a/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate +++ b/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate @@ -7,7 +7,7 @@ Name[da]=Plasma QML-applet med QML-udvidelse Name[de]=Plasma-QML-Miniprogramm mit QML-Erweiterung Name[en_GB]=Plasma QML Applet with QML extension Name[es]=Miniaplicación en QML para Plasma con extensión QML -Name[eu]=Plasma QML appleta QML hedapenak dituena +Name[eu]=Plasma QML aplikaziotxoa QML hedapenak dituena Name[fi]=Plasman QML-sovelma QML-laajennuksella Name[fr]=Applet Plasma QML avec extension QML Name[gl]=Miniaplicativo QML para Plasma con extensión de QML @@ -37,7 +37,7 @@ Comment[ca@valencia]=Una plantilla per a una miniaplicació Plasma que usa una A Comment[da]=En skabelon til en Plasma-applet som bruger tilpasset API leveret af ens eget QML-udvidelsesplugin Comment[en_GB]=A template for a Plasma applet which uses custom API provided by an own QML extension plugin Comment[es]=Una plantilla para una miniaplicación de Plasma que usa la API común proporcionada por un complemento de extensión QML propio -Comment[eu]=Plasma applet baterako txantiloi bat, QML hedapen plugin propio baten API pertsonalizatu bat erabiltzen duena +Comment[eu]=Plasma aplikaziotxo baterako txantiloi bat, QML hedapen plugin propio baten API pertsonalizatu bat erabiltzen duena Comment[fi]=Plasma-sovelman malli, joka käyttää oman QML-laajennusliitännäisen tarjoamaa mukautettua APIa Comment[fr]=Un modèle d'applet Plasma utilisant une API personnalisée fournie par son propre module externe d'extension QML Comment[gl]=Un modelo para un trebello de Plasma que usa unha API personalizada fornecida por un complemento de extensión de QML de seu. diff --git a/templates/qml-plasmoid/qml-plasmoid.kdevtemplate b/templates/qml-plasmoid/qml-plasmoid.kdevtemplate index 744a83da1..3d6ddb189 100644 --- a/templates/qml-plasmoid/qml-plasmoid.kdevtemplate +++ b/templates/qml-plasmoid/qml-plasmoid.kdevtemplate @@ -10,7 +10,7 @@ Name[da]=Plasma QML-applet Name[de]=Plasma-QML-Miniprogramm Name[en_GB]=Plasma QML Applet Name[es]=Miniaplicación en QML para Plasma -Name[eu]=Plasma QML appleta +Name[eu]=Plasma QML aplikaziotxoa Name[fi]=Plasman QML-sovelma Name[fr]=Applet Plasma QML Name[gl]=Miniaplicativo QML para Plasma @@ -43,7 +43,7 @@ Comment[ca@valencia]=Una plantilla de miniaplicació del Plasma en QML: una plan Comment[da]=En skabelon til en Plasma QML-applet: En skabelon til Plasma som viser et SVG-billede og en tekst 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[eu]=Plasma QML applet txantiloia: Plasma applet txantiloi bat SVG irudi bat eta testu bat bistaratzen dituena +Comment[eu]=Plasma QML aplikaziotxo-txantiloia: Plasma aplikaziotxo-txantiloi bat SVG irudi bat eta testu bat bistaratzen dituena Comment[fi]=Plasman QML-sovelmamalli, joka näyttää SVG-kuvan ja tekstin Comment[fr]=Modèle d'applet Plasma QML : un modèle d'applet Plasma qui affiche une image SVG et du texte Comment[gl]=Modelo de miniaplicativo para Plasma: un modelo de miniaplicativo para Plasma que mostra unha imaxe SVG e un texto