diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml
index 052ccefdf75b..3d74b8d721bf 100644
--- a/tools/tools/locale/etc/charmaps.xml
+++ b/tools/tools/locale/etc/charmaps.xml
@@ -42,28 +42,28 @@
 		countries="BG" />
 	<language name="ca"
 		fallback="ca_ES"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="AD ES FR IT" />	<!-- only ca_ES defined -->
 	<language name="cs"
 		encoding="ISO8859-2"
 		countries="CZ" />
 	<language name="da"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="DK" />
 	<language name="de"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="AT CH DE" />
 	<language name="el"
 		encoding="ISO8859-7"
 		countries="GR" />
 	<language name="en"
-		encoding="ISO8859-15 US-ASCII"
+		encoding="ISO8859-1 ISO8859-15 US-ASCII"
 		countries="GB" />
 	<language name="en"
 		encoding="ISO8859-1 US-ASCII"
 		countries="AU CA NZ US ZA" />
 	<language name="en"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="IE" />
 	<language name="en"
 		encoding="ISO8859-1"
@@ -73,22 +73,22 @@
 	<language name="es"
 		countries="CR" />               <!-- UTF-8 only -->
 	<language name="es"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="ES" />
 	<language name="es"
 		encoding="ISO8859-1"
 		countries="AR MX" />
 	<language name="et"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="EE" />
 	<language name="eu"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="ES" />
 	<language name="fi"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="FI" />
 	<language name="fr"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="BE CH FR" />
 	<language name="fr"
 		encoding="ISO8859-1"
@@ -108,10 +108,10 @@
 		encoding="ARMSCII-8"
 		countries="AM" />
 	<language name="is"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="IS" />
 	<language name="it"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="CH IT" />
 	<language name="ja"
 		encoding="SJIS eucJP"
@@ -133,19 +133,19 @@
 		family="Cyrl"
 		countries="MN" />
 	<language name="nb"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="NO" />
 	<language name="nl"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="BE NL" />
 	<language name="nn"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="NO" />
 	<language name="pl"
 		encoding="ISO8859-2"
 		countries="PL" />
 	<language name="pt"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="PT" />
 	<language name="pt"
 		encoding="ISO8859-1"
@@ -173,7 +173,7 @@
 		encoding="ISO8859-5"
 		countries="RS" />
 	<language name="sv"
-		encoding="ISO8859-15"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="SE FI" />
 	<language name="tr"
 		encoding="ISO8859-9"