From ed7b13ed535b8de8e8e4e2431744c1ef6c343fdb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 Jul 2022 01:52:43 +0000 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/region_language/kcm_regionandlang.desktop | 2 ++ kcms/region_language/kcm_regionandlang.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kcms/region_language/kcm_regionandlang.desktop b/kcms/region_language/kcm_regionandlang.desktop index 3190fc8b3..432686d15 100644 --- a/kcms/region_language/kcm_regionandlang.desktop +++ b/kcms/region_language/kcm_regionandlang.desktop @@ -6,6 +6,7 @@ Name[ca]=Regió i idioma Name[ca@valencia]=Regió i idioma Name[es]=Región e idioma Name[fr]=Pays et langue +Name[ko]=지역과 언어 Name[nl]=Regio & taal Name[pt]=Região & Língua Name[sl]=Regija in Jezik @@ -22,6 +23,7 @@ Comment[ca]=Defineix l'idioma i el format numèric, monetari i horari Comment[ca@valencia]=Establix l'idioma i el format numèric, monetari i horari Comment[es]=Definir el idioma y los formatos numérico, de moneda y de hora Comment[fr]=Définir la langue, le format numérique, de monnaie et d'heure +Comment[ko]=언어, 숫자, 통화, 시간 형식 설정 Comment[nl]=Formaten bij taal, numerieke getallen, munteenheid en tijd instellen Comment[pt]=Configurar a Língua e os Formatos Numéricos, Monetários e de Datas Comment[sl]=Nastavi jezik, števila, valuta in oblike časa diff --git a/kcms/region_language/kcm_regionandlang.json b/kcms/region_language/kcm_regionandlang.json index 405074a4b..9c06b5fd2 100644 --- a/kcms/region_language/kcm_regionandlang.json +++ b/kcms/region_language/kcm_regionandlang.json @@ -7,6 +7,7 @@ "Description[ca]": "Configuració de l'idioma i el format numèric, monetari i horari", "Description[es]": "Preferencia de idiomas, formatos numérico, de moneda y de hora", "Description[fr]": "Définir la langue, le format numérique, de monnaie et d'heure", + "Description[ko]": "언어, 숫자, 통화, 시간 형식 설정", "Description[nl]": "Formaten voor taal, numerieke getallen, munteenheid en tijd", "Description[pt]": "Configuração da Língua, Formatos Numéricos, Monetários e de Datas", "Description[sl]": "Nastavitve jezika, oblike števil, valute in časa", @@ -30,6 +31,7 @@ "Name[ca]": "Regió i idioma", "Name[es]": "Región e idioma", "Name[fr]": "Pays et langue", + "Name[ko]": "지역과 언어", "Name[nl]": "Regio & taal", "Name[pt]": "Região & Língua", "Name[sl]": "Regija in Jezik",