From 2d4548e4d08c9a0e4ddc406b56cfbfc83ddd2921 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Jun 2017 04:33:38 +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 +- src/plasma/data/servicetypes/plasma-applet.desktop | 2 +- src/plasma/data/servicetypes/plasma-containment.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/applets/conditionalloader/metadata.desktop b/examples/applets/conditionalloader/metadata.desktop index 959670152..128e02c83 100644 --- a/examples/applets/conditionalloader/metadata.desktop +++ b/examples/applets/conditionalloader/metadata.desktop @@ -16,7 +16,7 @@ Name[et]=Apleti test Name[fi]=Sovelmatesti Name[fr]=Applet test Name[gd]=Deuchainn air aplaid -Name[gl]=Proba de applet +Name[gl]=Proba de miniaplicativo Name[hu]=Kisalkalmazás teszt Name[ia]=Applet Test (Prova de applet) Name[it]=Prova applet diff --git a/examples/applets/dataenginemodel/metadata.desktop b/examples/applets/dataenginemodel/metadata.desktop index ed2e4a8af..1a5a24a54 100644 --- a/examples/applets/dataenginemodel/metadata.desktop +++ b/examples/applets/dataenginemodel/metadata.desktop @@ -10,7 +10,7 @@ Comment[et]=Näidisaplett selle kohta, kuidas kasutada andmemootoritesse põimit 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 -Comment[gl]=Unha applet de exemplo que mostra como usar os modelos incorporados nos DataEngines +Comment[gl]=Un miniaplicativo de exemplo que mostra como usar os modelos incorporados nos DataEngines Comment[hu]=Példa kisalkalmazás a DataEngine-be ágyazott modellek használatának bemutatására Comment[ia]=Applet de exemplo que monstra como usar Models (modellos) insertate in DataEngines (Motores de datos) Comment[it]=Applet di esempio che mostra come utilizzare i modelli integrati nei motori di dati diff --git a/src/plasma/data/servicetypes/plasma-applet.desktop b/src/plasma/data/servicetypes/plasma-applet.desktop index 0cf431b5b..dd7093850 100644 --- a/src/plasma/data/servicetypes/plasma-applet.desktop +++ b/src/plasma/data/servicetypes/plasma-applet.desktop @@ -17,7 +17,7 @@ Comment[et]=Plasma aplett Comment[fi]=Plasma-sovelma Comment[fr]=Applet Plasma Comment[gd]=Aplaid Plasma -Comment[gl]=Applet de Plasma +Comment[gl]=Miniaplicativo de Plasma Comment[hu]=Plasma kisalkalmazás Comment[ia]=Applet Plasma Comment[it]=Applet di Plasma diff --git a/src/plasma/data/servicetypes/plasma-containment.desktop b/src/plasma/data/servicetypes/plasma-containment.desktop index 90284b3be..dc9dbd80b 100644 --- a/src/plasma/data/servicetypes/plasma-containment.desktop +++ b/src/plasma/data/servicetypes/plasma-containment.desktop @@ -15,7 +15,7 @@ Comment[et]=Plasma apleti konteiner ja tausta joonistaja 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 -Comment[gl]=Un contedor de applet de Plasma e pintor do fondo +Comment[gl]=Un contedor de miniaplicativo de Plasma e pintor do fondo Comment[hu]=Tároló Plasma-kisalkalmazásokhoz és háttérrajzoló Comment[ia]=Receptaculo applet Plasma e pictor de fundo Comment[it]=Contenitore di applet di Plasma e creazione sfondo