Merge pull request #21813 from christianwach/lab-core-2909

Repair "Norwegian Bokmål" string
civicrm · Oct 22, 2021 · c897be9 · c897be9
2 parents 36168ce + 1a6c29f
commit c897be9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/install/langs.php b/install/langs.php
@@ -29,7 +29,7 @@
   'ja_JP' => 'Japanese',
   'km_KH' => 'Khmer',
   'lt_LT' => 'Lithuanian',
-  'nb_NO' => 'Norwegian BokmÃ¥l',
+  'nb_NO' => 'Norwegian Bokmål',
   'fa_IR' => 'Persian (Iran)',
   'pl_PL' => 'Polish',
   'pt_BR' => 'Portuguese (Brazil)',
@@ -48,4 +48,4 @@
   'tr_TR' => 'Turkish',
   'uk_UA' => 'Ukrainian',
   'vi_VN' => 'Vietnamese',
-);
+);
diff --git a/xml/templates/languages.tpl b/xml/templates/languages.tpl
@@ -133,7 +133,7 @@ VALUES
   (@option_group_id_languages, 0, 0, 'mn_MN', 'mn', {localize}'{ts escape="sql"}Mongolian{/ts}'{/localize}, @counter := @counter + 1),
   (@option_group_id_languages, 0, 0, 'na_NR', 'na', {localize}'{ts escape="sql"}Nauru{/ts}'{/localize}, @counter := @counter + 1),
   (@option_group_id_languages, 0, 0, 'nv_US', 'nv', {localize}'{ts escape="sql"}Navajo, Navaho{/ts}'{/localize}, @counter := @counter + 1),
-  (@option_group_id_languages, 0, 1, 'nb_NO', 'nb', {localize}'{ts escape="sql"}Norwegian BokmÃ¥l{/ts}'{/localize}, @counter := @counter + 1),
+  (@option_group_id_languages, 0, 1, 'nb_NO', 'nb', {localize}'{ts escape="sql"}Norwegian Bokmål{/ts}'{/localize}, @counter := @counter + 1),
   (@option_group_id_languages, 0, 0, 'nd_ZW', 'nd', {localize}'{ts escape="sql"}North Ndebele{/ts}'{/localize}, @counter := @counter + 1),
   (@option_group_id_languages, 0, 0, 'ne_NP', 'ne', {localize}'{ts escape="sql"}Nepali{/ts}'{/localize}, @counter := @counter + 1),
   (@option_group_id_languages, 0, 0, 'ng_NA', 'ng', {localize}'{ts escape="sql"}Ndonga{/ts}'{/localize}, @counter := @counter + 1),