From 79196d7096fd7e70e57657c8b84ae7f18463bbca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 16 Jan 2019 05:52: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" --- kcms/translations/kcm_translations.desktop | 1 + kcms/translations/package/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/kcms/translations/kcm_translations.desktop b/kcms/translations/kcm_translations.desktop index b76033e0b..e5621f5b1 100644 --- a/kcms/translations/kcm_translations.desktop +++ b/kcms/translations/kcm_translations.desktop @@ -17,6 +17,7 @@ Name[ca@valencia]=Idioma Name[de]=Sprache Name[es]=Idioma Name[fr]=Langue +Name[gl]=Idioma Name[id]=Language Name[it]=Lingua Name[nl]=Taal diff --git a/kcms/translations/package/metadata.desktop b/kcms/translations/package/metadata.desktop index fcdd442f4..6436d9860 100644 --- a/kcms/translations/package/metadata.desktop +++ b/kcms/translations/package/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Idioma Name[de]=Sprache Name[es]=Idioma Name[fr]=Langue +Name[gl]=Idioma Name[id]=Language Name[it]=Lingua Name[nl]=Taal