From 68f1a87c6750e4dba9cb8a777ec7fa1b264d5dd7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 28 Jan 2017 06:33:42 +0100 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/qmltasks/metadata.desktop | 2 +- examples/applets/widgetgallery/metadata.desktop | 4 ++-- .../qml/data/plasma-scriptengine-applet-declarative.desktop | 4 ++-- .../ruby/plasma-scriptengine-ruby-dataengine.desktop | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/applets/qmltasks/metadata.desktop b/examples/applets/qmltasks/metadata.desktop index 651fb79aa..6e98c943c 100644 --- a/examples/applets/qmltasks/metadata.desktop +++ b/examples/applets/qmltasks/metadata.desktop @@ -51,7 +51,7 @@ Comment[et]=Näidis, kuidas kirjutada ise ülesannete vidin Comment[fi]=Esimerkki oman tehtäväsovelman kirjoittamisesta Comment[fr]=Exemple montrant comment écrire votre propre composant graphique de tâches Comment[gd]=Buill-eisimpleir a sheallas dhut mar a sgrìobhas tu Widget shaothraichean agad fhèin -Comment[gl]=Un exemplo de como escribir un widget de tarefas pendentes +Comment[gl]=Un exemplo de como escribir un trebello de tarefas pendentes Comment[hu]=Példa saját feladatlista írásához Comment[ia]=Exemplo monstrante como scriber tu proprie Widget de cargas Comment[it]=Esempio che mostra come scrivere il proprio widget diff --git a/examples/applets/widgetgallery/metadata.desktop b/examples/applets/widgetgallery/metadata.desktop index 40d300ca7..30cf6fc36 100644 --- a/examples/applets/widgetgallery/metadata.desktop +++ b/examples/applets/widgetgallery/metadata.desktop @@ -14,7 +14,7 @@ Name[et]=Vidinagalerii Name[fi]=Kontrolligalleria Name[fr]=Galerie de composants graphiques Name[gd]=Gailearaidh nan widgets -Name[gl]=Galería de widgets +Name[gl]=Galería de trebellos Name[hu]=Elemgaléria Name[ia]=Galleria de widget Name[it]=Galleria dei widget @@ -51,7 +51,7 @@ Comment[et]=Plasma QtComponentsiga valmistatud vidinagalerii Comment[fi]=galleria kontrolleista, jotka on tehty Plasman QtComponents-tekniikalla Comment[fr]=Galerie de composants graphiques réalisés avec les QtComponents de Plasma Comment[gd]=Gailearaidh de widgets a chaidh a dhèanamh le QtComponents Plasma -Comment[gl]=galería de widgets feita con QtComponents de Plasma +Comment[gl]=galería de trebellos feita con QtComponents de Plasma Comment[hu]=A Plasma QtComponentből készült elemek galériája Comment[ia]=galleria de widget facite con Plasma QtComponents Comment[it]=galleria di widget realizzata con Plasma QtComponents diff --git a/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop b/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop index 0c7c47863..b3a5eec20 100644 --- a/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop +++ b/src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop @@ -13,7 +13,7 @@ Name[et]=Deklaratiivne vidin Name[fi]=Deklaratiivinen sovelma Name[fr]=Composant graphique déclaratif Name[gd]=Declarative widget -Name[gl]=Widget declarativo +Name[gl]=Trebello declarativo Name[hu]=Deklaratív felületi elem Name[ia]=Widget declarative Name[it]=Oggetto dichiarativo @@ -55,7 +55,7 @@ Comment[et]=QML-is ja JavaScriptis kirjutatud Plasma vidin Comment[fi]=Natiivi, QML-pohjainen Plasma-sovelma Comment[fr]=Composant graphique natif de Plasma écrit en QML et JavaScript Comment[gd]=Plasma widget tùsail a chaidh a sgrìobhadh le QML agus JavaScript -Comment[gl]=Widget nativo de Plasma escrito en QML e JavaScript +Comment[gl]=Trebello nativo de Plasma escrito en QML e JavaScript Comment[hu]=QML-ben és JavaScriptben írt natív Plazma felületi elem Comment[ia]=Widget native de Plasma scribite in QLM e JavaScript Comment[it]=Widget nativo di Plasma scritto in QML e JavaScript diff --git a/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop b/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop index da3519722..64ea5d58d 100644 --- a/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop +++ b/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop @@ -13,7 +13,7 @@ Name[et]=Ruby vidin Name[fi]=Ruby-sovelma Name[fr]=Composant graphique Ruby Name[gd]=Ruby Widget -Name[gl]=Widget en Ruby +Name[gl]=Trebello en Ruby Name[hu]=Ruby felületi elem Name[ia]=Widget de Ruby Name[it]=Widget Ruby @@ -53,7 +53,7 @@ Comment[et]=Rubys kirjutatud Plasma vidin Comment[fi]=Natiivi, Ruby-pohjainen Plasma-sovelma Comment[fr]=Composant graphique natif de Plasma écrit en Ruby Comment[gd]=Plasma widget tùsail a chaidh a sgrìobhadh le Ruby -Comment[gl]=Widget nativo de Plasma escrito en Ruby +Comment[gl]=Trebello nativo de Plasma escrito en Ruby Comment[hu]=Ruby nyelven írt natív Plazma felületi elem Comment[ia]=Widget native de Plasma scribite in Ruby Comment[it]=Widget nativo di Plasma scritto in Ruby