From 4aa3fb6bcd537a12449fdfb0211ddd09cd5d26fe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Jan 2019 08:36:43 +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 67d72db9f..b8aad0749 100644 --- a/kcms/translations/kcm_translations.desktop +++ b/kcms/translations/kcm_translations.desktop @@ -21,6 +21,7 @@ Name[gl]=Idioma Name[id]=Language Name[it]=Lingua Name[nl]=Taal +Name[nn]=Språk Name[pl]=Język Name[pt]=Língua Name[ru]=Язык diff --git a/kcms/translations/package/metadata.desktop b/kcms/translations/package/metadata.desktop index e2195a694..2b5472c65 100644 --- a/kcms/translations/package/metadata.desktop +++ b/kcms/translations/package/metadata.desktop @@ -9,6 +9,7 @@ Name[gl]=Idioma Name[id]=Language Name[it]=Lingua Name[nl]=Taal +Name[nn]=Språk Name[pl]=Język Name[pt]=Língua Name[ru]=Язык