Imported Upstream version 0.19.7

[platform/upstream/gettext.git] / gettext-runtime / intl / locale.alias

diff --git a/gettext-runtime/intl/locale.alias b/gettext-runtime/intl/locale.alias
index 1e87f01..f5da182 100644 (file)
--- a/gettext-runtime/intl/locale.alias
+++ b/gettext-runtime/intl/locale.alias
@@ -1,5 +1,6 @@
 # Locale name alias data base.
-# Copyright (C) 1996-2001,2003,2007 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2003, 2007, 2015 Free Software Foundation,
+# Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -24,10 +25,20 @@
 # backward compatibility.  Nobody should rely on the names defined here.
 # Locales should always be specified by their full name.
 
+# Note: This file used to contain the following lines:
+#      bokmaal         nb_NO.ISO-8859-1
+#      franc,ais       fr_FR.ISO-8859-1
+# except that the "aa" was actually the byte '\0xE5' (the Latin-1
+# encoding for U+00E5 LATIN SMALL LETTER A WITH RING ABOVE) and the
+# "c," was actually the byte '\xE7' (the Latin-1 encoding for U+00E7
+# LATIN SMALL LETTER C WITH CEDILLA).  These lines were removed
+# because they caused 'locale -a' to output text encoded in Latin-1,
+# which broke applications in UTF-8 locales.  See:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=18412
+
 # Packages using this file: 
 
 bokmal         nb_NO.ISO-8859-1
-bokm�l               nb_NO.ISO-8859-1
 catalan                ca_ES.ISO-8859-1
 croatian       hr_HR.ISO-8859-2
 czech          cs_CZ.ISO-8859-2
@@ -38,7 +49,6 @@ dutch         nl_NL.ISO-8859-1
 eesti          et_EE.ISO-8859-1
 estonian       et_EE.ISO-8859-1
 finnish         fi_FI.ISO-8859-1
-fran�ais     fr_FR.ISO-8859-1
 french         fr_FR.ISO-8859-1
 galego         gl_ES.ISO-8859-1
 galician       gl_ES.ISO-8859-1