From 0bcaf4f529bac8cc75890347b116a86276013f32 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Nov 2016 04:19:18 +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" --- src/plasma/packagestructure/dataengine-packagestructure.json | 1 + src/plasma/packagestructure/plasmageneric-packagestructure.json | 1 + src/plasma/packagestructure/plasmatheme-packagestructure.json | 1 + src/plasma/packagestructure/plasmoid-packagestructure.json | 1 + 4 files changed, 4 insertions(+) diff --git a/src/plasma/packagestructure/dataengine-packagestructure.json b/src/plasma/packagestructure/dataengine-packagestructure.json index 0729343b6..7fb19cbfd 100644 --- a/src/plasma/packagestructure/dataengine-packagestructure.json +++ b/src/plasma/packagestructure/dataengine-packagestructure.json @@ -22,6 +22,7 @@ "Name[es]": "Motor de datos", "Name[et]": "Andmemootor", "Name[fi]": "Tietomoottori", + "Name[fr]": "Moteur de données", "Name[it]": "Motore dati", "Name[ko]": "데이터 엔진", "Name[nl]": "Gegevensengine", diff --git a/src/plasma/packagestructure/plasmageneric-packagestructure.json b/src/plasma/packagestructure/plasmageneric-packagestructure.json index 76d2e7d3c..c3b93dd05 100644 --- a/src/plasma/packagestructure/plasmageneric-packagestructure.json +++ b/src/plasma/packagestructure/plasmageneric-packagestructure.json @@ -21,6 +21,7 @@ "Name[es]": "General", "Name[et]": "Üldine", "Name[fi]": "Yleinen", + "Name[fr]": "Générique", "Name[it]": "Generico", "Name[ko]": "일반", "Name[nl]": "Algemeen", diff --git a/src/plasma/packagestructure/plasmatheme-packagestructure.json b/src/plasma/packagestructure/plasmatheme-packagestructure.json index c9a273f57..a934c995e 100644 --- a/src/plasma/packagestructure/plasmatheme-packagestructure.json +++ b/src/plasma/packagestructure/plasmatheme-packagestructure.json @@ -22,6 +22,7 @@ "Name[es]": "Tema de Plasma", "Name[et]": "Plasma teema", "Name[fi]": "Plasma-teema", + "Name[fr]": "Thème Plasma pour les thèmes foncés", "Name[it]": "Tema di Plasma", "Name[ko]": "Plasma 테마", "Name[nl]": "Plasma-thema", diff --git a/src/plasma/packagestructure/plasmoid-packagestructure.json b/src/plasma/packagestructure/plasmoid-packagestructure.json index 743022b62..d62798ab3 100644 --- a/src/plasma/packagestructure/plasmoid-packagestructure.json +++ b/src/plasma/packagestructure/plasmoid-packagestructure.json @@ -18,6 +18,7 @@ "Name[el]": "Πλασμοειδές", "Name[es]": "Plasmoide", "Name[fi]": "Plasmoidi", + "Name[fr]": "Plasmoïde", "Name[it]": "Plasmoide", "Name[nn]": "Plasmoide", "Name[pl]": "Plazmoid",