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"
This commit is contained in:
l10n daemon script 2016-11-23 04:19:18 +01:00
parent 760fb53e7d
commit 0bcaf4f529
4 changed files with 4 additions and 0 deletions

View File

@ -22,6 +22,7 @@
"Name[es]": "Motor de datos", "Name[es]": "Motor de datos",
"Name[et]": "Andmemootor", "Name[et]": "Andmemootor",
"Name[fi]": "Tietomoottori", "Name[fi]": "Tietomoottori",
"Name[fr]": "Moteur de données",
"Name[it]": "Motore dati", "Name[it]": "Motore dati",
"Name[ko]": "데이터 엔진", "Name[ko]": "데이터 엔진",
"Name[nl]": "Gegevensengine", "Name[nl]": "Gegevensengine",

View File

@ -21,6 +21,7 @@
"Name[es]": "General", "Name[es]": "General",
"Name[et]": "Üldine", "Name[et]": "Üldine",
"Name[fi]": "Yleinen", "Name[fi]": "Yleinen",
"Name[fr]": "Générique",
"Name[it]": "Generico", "Name[it]": "Generico",
"Name[ko]": "일반", "Name[ko]": "일반",
"Name[nl]": "Algemeen", "Name[nl]": "Algemeen",

View File

@ -22,6 +22,7 @@
"Name[es]": "Tema de Plasma", "Name[es]": "Tema de Plasma",
"Name[et]": "Plasma teema", "Name[et]": "Plasma teema",
"Name[fi]": "Plasma-teema", "Name[fi]": "Plasma-teema",
"Name[fr]": "Thème Plasma pour les thèmes foncés",
"Name[it]": "Tema di Plasma", "Name[it]": "Tema di Plasma",
"Name[ko]": "Plasma 테마", "Name[ko]": "Plasma 테마",
"Name[nl]": "Plasma-thema", "Name[nl]": "Plasma-thema",

View File

@ -18,6 +18,7 @@
"Name[el]": "Πλασμοειδές", "Name[el]": "Πλασμοειδές",
"Name[es]": "Plasmoide", "Name[es]": "Plasmoide",
"Name[fi]": "Plasmoidi", "Name[fi]": "Plasmoidi",
"Name[fr]": "Plasmoïde",
"Name[it]": "Plasmoide", "Name[it]": "Plasmoide",
"Name[nn]": "Plasmoide", "Name[nn]": "Plasmoide",
"Name[pl]": "Plazmoid", "Name[pl]": "Plazmoid",