From 4f67d93719c4bbd16bd287ae42bdc28f1490149c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Jul 2022 01:49:00 +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.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kcms/region_language/kcm_regionandlang.json b/kcms/region_language/kcm_regionandlang.json index 4ef5f6443..f36238ba2 100644 --- a/kcms/region_language/kcm_regionandlang.json +++ b/kcms/region_language/kcm_regionandlang.json @@ -5,6 +5,7 @@ "Description[bg]": "Формат на езикови настройки, метрични единици, валута, дата и час", "Description[ca@valencia]": "Configuració de l'idioma i el format numèric, monetari i horari", "Description[ca]": "Configuració de l'idioma i el format numèric, monetari i horari", + "Description[en_GB]": "Language Setting, Numeric, Currency and Time Formats", "Description[es]": "Preferencia de idiomas, formatos numérico, de moneda y de hora", "Description[fi]": "Kieliasetus sekä lukujen, valuutan ja ajan muotoilu", "Description[fr]": "Définir la langue, le format numérique, de monnaie et d'heure", @@ -33,6 +34,7 @@ "Name[bg]": "Език и регионални настройки", "Name[ca@valencia]": "Regió i idioma", "Name[ca]": "Regió i idioma", + "Name[en_GB]": "Region & Language", "Name[es]": "Región e idioma", "Name[fi]": "Alue ja kieli", "Name[fr]": "Pays et langue",