- fixed lang_name for it_CH,it_IT and country_name for it_IT

[packages/glibc.git] / glibc-locale_fixes.patch

diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch
index 1dc09f2b8c125ce875e4982b20156689ead62164..665fc3b4be95c5f62b739c3b348c66d0f428d739 100644 (file)
--- a/glibc-locale_fixes.patch
+++ b/glibc-locale_fixes.patch
@@ -29,7 +29,7 @@ diff -uNr libc.orig/localedata/locales/am_ET libc/localedata/locales/am_ET
 diff -uNr libc.orig/localedata/locales/an_ES libc/localedata/locales/an_ES
 --- libc.orig/localedata/locales/an_ES 2003-08-25 10:27:32.000000000 +0200
 +++ libc/localedata/locales/an_ES      2004-11-10 02:36:38.000000000 +0100
-@@ -122,5 +122,17 @@
+@@ -122,5 +122,19 @@
  END LC_NAME
  
  LC_ADDRESS
@@ -42,8 +42,10 @@ diff -uNr libc.orig/localedata/locales/an_ES libc/localedata/locales/an_ES
 +country_ab2   "<U0045><U0053>"
 +country_ab3   "<U0045><U0053><U0050>"
 +country_num   724
++country_name  "<U0045><U0063><U0070><U0061><U006E><U0077><U0061>"
 +country_car   "<U0045>"
 +country_isbn  "<U0038><U0034>"
++lang_name     "<U0041><U0072><U0061><U0067><U006F><U006E><U00E9><U0073>"
 +lang_ab       "<U0061><U006E>"
 +lang_term     "<U0061><U0072><U0067>"
 +lang_lib      "<U0061><U0072><U0067>"
@@ -51,15 +53,16 @@ diff -uNr libc.orig/localedata/locales/an_ES libc/localedata/locales/an_ES
 diff -uNr libc.orig/localedata/locales/ar_AE libc/localedata/locales/ar_AE
 --- libc.orig/localedata/locales/ar_AE 2003-12-05 01:25:56.000000000 +0100
 +++ libc/localedata/locales/ar_AE      2004-11-10 02:36:38.000000000 +0100
-@@ -181,6 +181,14 @@
+@@ -181,6 +181,15 @@
  country_ab2 "<U0041><U0045>"
  country_ab3 "<U0041><U0052><U0045>"
  country_num 784
 +country_name "<U0627><U0644><U0625><U0645><U0627><U0631><U0627><U062A>/
 +<U0020><U0627><U0644><U0639><U0631><U0628><U064A><U0651><U0629><U0020>/
 +<U0627><U0644><U0645><U062A><U062D><U062F><U0651><U0629>"
++country_car "<U0055><U0041><U0045>"
 +country_isbn "<U0039><U0039><U0034><U0038>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -77,7 +80,7 @@ diff -uNr libc.orig/localedata/locales/ar_BH libc/localedata/locales/ar_BH
 +country_name "<U0627><U0644><U0628><U062D><U0631><U064A><U0646>"
 +country_car "<U0042><U0052><U004E>"
 +country_isbn "<U0039><U0039><U0039><U0030><U0031>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -95,7 +98,7 @@ diff -uNr libc.orig/localedata/locales/ar_DZ libc/localedata/locales/ar_DZ
 +country_name "<U0627><U0644><U062C><U0632><U0627><U0626><U0631>"
 +country_car "<U0044><U005A>"
 +country_isbn "9947,9961"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -122,9 +125,9 @@ diff -uNr libc.orig/localedata/locales/ar_EG libc/localedata/locales/ar_EG
  country_num 818
 -
 +country_name "<U0645><U0635><U0631>"
-+country_car "<U0045><U0055>"
++country_car "<U0045><U0054>"
 +country_isbn "<U0039><U0037><U0037>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -142,7 +145,7 @@ diff -uNr libc.orig/localedata/locales/ar_IN libc/localedata/locales/ar_IN
 +country_name "<U0627><U0644><U0647><U0646><U062F>"
 +country_car "<U0049><U004E><U0044>"
 +country_isbn "81,93"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -159,7 +162,7 @@ diff -uNr libc.orig/localedata/locales/ar_IQ libc/localedata/locales/ar_IQ
 -
 +country_name "<U0627><U0644><U0639><U0631><U0627><U0642>"
 +country_car "<U0049><U0052><U0051>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -177,7 +180,7 @@ diff -uNr libc.orig/localedata/locales/ar_JO libc/localedata/locales/ar_JO
 +country_name "<U0627><U0644><U0623><U0631><U062F><U0646>"
 +country_car "<U0048><U004B><U004A>"
 +country_isbn "<U0039><U0039><U0035><U0037>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -195,7 +198,7 @@ diff -uNr libc.orig/localedata/locales/ar_KW libc/localedata/locales/ar_KW
 +country_name "<U0627><U0644><U0643><U0648><U064A><U062A>"
 +country_car "<U004B><U0057><U0054>"
 +country_isbn "<U0039><U0039><U0039><U0030><U0036>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -213,7 +216,7 @@ diff -uNr libc.orig/localedata/locales/ar_LB libc/localedata/locales/ar_LB
 +country_name "<U0644><U0628><U0646><U0627><U0646>"
 +country_car "<U0052><U004C>"
 +country_isbn "<U0039><U0039><U0035><U0033>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -223,20 +226,15 @@ diff -uNr libc.orig/localedata/locales/ar_LB libc/localedata/locales/ar_LB
 diff -uNr libc.orig/localedata/locales/ar_LY libc/localedata/locales/ar_LY
 --- libc.orig/localedata/locales/ar_LY 2003-12-05 01:25:56.000000000 +0100
 +++ libc/localedata/locales/ar_LY      2004-11-10 02:36:38.000000000 +0100
-@@ -184,7 +184,18 @@
+@@ -184,7 +184,13 @@
  country_ab2 "<U004C><U0059>"
  country_ab3 "<U004C><U0042><U0059>"
  country_num 434
 -
-+country_name "<U0627><U0644><U062C><U0645><U0627><U0647><U064A><U0631>/
-+<U064A><U0651><U0629><U0020><U0627><U0644><U0639><U0631><U0628><U064A>/
-+<U0651><U0629><U0020><U0627><U0644><U0644><U0651><U064A><U0628><U064A>/
-+<U0651><U0629><U0020><U0627><U0644><U0634><U0651><U0639><U0628><U064A>/
-+<U0651><U0629><U0020><U0627><U0644><U0627><U0634><U062A><U0631><U0627>/
-+<U0643><U064A><U0651><U0629>"
-+country_car "<U004C><U0042><U0059>"
++country_name "<U0644><U064A><U0628><U064A><U0627>"
++country_car "<U004C><U0041><U0052>"
 +country_isbn "<U0039><U0039><U0035><U0039>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -254,7 +252,7 @@ diff -uNr libc.orig/localedata/locales/ar_MA libc/localedata/locales/ar_MA
 +country_name "<U0627><U0644><U0645><U063A><U0631><U0628>"
 +country_car "<U004D><U0041>"
 +country_isbn "9954,9981"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -264,13 +262,15 @@ diff -uNr libc.orig/localedata/locales/ar_MA libc/localedata/locales/ar_MA
 diff -uNr libc.orig/localedata/locales/ar_OM libc/localedata/locales/ar_OM
 --- libc.orig/localedata/locales/ar_OM 2003-12-05 01:25:56.000000000 +0100
 +++ libc/localedata/locales/ar_OM      2004-11-10 02:36:38.000000000 +0100
-@@ -184,7 +184,11 @@
+@@ -184,7 +184,13 @@
  country_ab2 "<U004F><U004D>"
  country_ab3 "<U004F><U004D><U004E>"
  country_num 512
 -
 +country_name "<U0639><U0645><U0627><U0646>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++country_car "<U004F><U004D>"
++country_isbn "<U0039><U0039><U0039><U0036><U0039>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -286,9 +286,9 @@ diff -uNr libc.orig/localedata/locales/ar_QA libc/localedata/locales/ar_QA
  country_num 634
 -
 +country_name "<U0642><U0637><U0631>"
-+country_car "<U0051><U0041>"
++country_car "<U0051>"
 +country_isbn "<U0039><U0039><U0039><U0032><U0031>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -302,10 +302,10 @@ diff -uNr libc.orig/localedata/locales/ar_SA libc/localedata/locales/ar_SA
  country_ab2 "<U0053><U0041>"
  country_ab3 "<U0053><U0041><U0055>"
  country_num 682
-+country_car "<U0053><U0041>"
++country_name "<U0627><U0644><U0633><U0651><U0639><U0648><U062F><U064A><U0651><U0629>"
++country_car "<U004B><U0053><U0041>"
 +country_isbn "<U0039><U0039><U0036><U0030>"
-+country_name "<U0627><U0644><U0633><U0651><U0639><U0648><U062F>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -321,7 +321,7 @@ diff -uNr libc.orig/localedata/locales/ar_SD libc/localedata/locales/ar_SD
 +country_car "<U0053><U0055><U0044>"
 +country_isbn "<U0039><U0039><U0039><U0034><U0032>"
 +country_name "<U0627><U0644><U0633><U0651><U0648><U062F><U0627><U0646>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -331,14 +331,15 @@ diff -uNr libc.orig/localedata/locales/ar_SD libc/localedata/locales/ar_SD
 diff -uNr libc.orig/localedata/locales/ar_SY libc/localedata/locales/ar_SY
 --- libc.orig/localedata/locales/ar_SY 2003-12-05 01:25:56.000000000 +0100
 +++ libc/localedata/locales/ar_SY      2004-11-10 02:36:38.000000000 +0100
-@@ -201,7 +201,12 @@
+@@ -201,7 +201,13 @@
  country_ab2 "<U0053><U0059>"
  country_ab3 "<U0053><U0059><U0052>"
  country_num 760
 -
++country_name "<U0633><U0648><U0631><U064A><U0627>"
 +country_car "<U0053><U0059><U0052>"
-+country_isbn "<U0039><U0039><U0037><U0032>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++country_isbn "<U0039><U0039><U0033><U0033>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -356,7 +357,7 @@ diff -uNr libc.orig/localedata/locales/ar_TN libc/localedata/locales/ar_TN
 +country_car "<U0054><U004E>"
 +country_isbn "<U0039><U0039><U0037><U0033>"
 +country_name "<U062A><U0648><U0646><U0633>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -372,7 +373,7 @@ diff -uNr libc.orig/localedata/locales/ar_YE libc/localedata/locales/ar_YE
  country_num 887
 -
 +country_name "<U0627><U0644><U064A><U0645><U0646>"
-+lang_name   "<U0639><U0631><U0628><U064A><U0629>"
++lang_name   "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 +lang_ab     "<U0061><U0072>"
 +lang_term   "<U0061><U0072><U0061>"
 +lang_lib    "<U0061><U0072><U0061>"
@@ -382,17 +383,14 @@ diff -uNr libc.orig/localedata/locales/ar_YE libc/localedata/locales/ar_YE
 diff -uNr libc.orig/localedata/locales/az_AZ libc/localedata/locales/az_AZ
 --- libc.orig/localedata/locales/az_AZ 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/az_AZ      2004-11-10 02:36:38.000000000 +0100
-@@ -281,9 +281,18 @@
- LC_ADDRESS
- % FIXME
- postal_fmt "???"
-+country_name "<U0041><U007A><U0259><U0072><U0062><U0061><U0079><U0063>/
-+<U0061><U006E>"
+@@ -284,6 +284,15 @@
  country_ab2 "<U0041><U005A>"
  country_ab3 "<U0041><U005A><U0045>"
  country_num 031
++country_name "<U0041><U007A><U0259><U0072><U0062><U0061><U0079><U0063>/
++<U0061><U006E>"
 +country_car "<U0041><U005A>"
-+country_isbn "<U0035>"
++country_isbn "<U0039><U0039><U0035><U0032>"
 +lang_name    "<U0041><U007A><U0259><U0072><U0062><U0061><U0079><U0063><U0061>/
 +<U006E><U0063><U0061>"
 +lang_ab     "<U0061><U007A>"
@@ -404,17 +402,6 @@ diff -uNr libc.orig/localedata/locales/az_AZ libc/localedata/locales/az_AZ
 diff -uNr libc.orig/localedata/locales/be_BY libc/localedata/locales/be_BY
 --- libc.orig/localedata/locales/be_BY 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/be_BY      2004-11-10 02:36:38.000000000 +0100
-@@ -65,8 +65,8 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0414><U0434><U0059><U0079><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U041D><U043D><U004E><U006E><U005D><U002E><U002A>"
-+yesexpr "<U005E><U005B><U0414><U0434><U0059><U0079><U005D>"
-+noexpr  "<U005E><U005B><U041D><U043D><U004E><U006E><U005D>"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -108,6 +108,8 @@
          "<U0427><U0446><U0432>";/
          "<U041F><U044F><U0442>";/
@@ -424,18 +411,15 @@ diff -uNr libc.orig/localedata/locales/be_BY libc/localedata/locales/be_BY
  mon     "<U0421><U0442><U0443><U0434><U0437><U0435><U043D><U044C>";/
          "<U041B><U044E><U0442><U044B>";/
          "<U0421><U0430><U043A><U0430><U0432><U0456><U043A>";/
-@@ -173,7 +175,15 @@
- <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
- <U004E><U0025><U0063><U0025><U004E>"
-+country_name "<U0411><U0435><U043B><U0430><U0440><U0443><U0441><U044C>"
+@@ -176,4 +178,12 @@
  country_ab2 "<U0042><U0059>"
  country_ab3 "<U0042><U004C><U0052>"
  country_num 112
++country_name "<U0411><U0435><U043B><U0430><U0440><U0443><U0441><U044C>"
 +country_car "<U0042><U0059>"
 +country_isbn "<U0039><U0038><U0035>"
 +lang_name   "<U0411><U0435><U043B><U0430><U0440><U0443><U0441><U043A>/
-+<U0430><U044F><U0020><U043C><U043E><U0432><U0430>"
++<U0430><U044F>"
 +lang_ab     "<U0062><U0065>"
 +lang_term   "<U0062><U0065><U006C>"
 +lang_lib    "<U0062><U0065><U006C>"
@@ -516,7 +500,7 @@ diff -uNr libc.orig/localedata/locales/bn_IN libc/localedata/locales/bn_IN
 diff -uNr libc.orig/localedata/locales/br_FR libc/localedata/locales/br_FR
 --- libc.orig/localedata/locales/br_FR 2004-04-29 00:55:01.000000000 +0200
 +++ libc/localedata/locales/br_FR      2004-11-10 02:36:38.000000000 +0100
-@@ -157,8 +157,19 @@
+@@ -157,8 +157,20 @@
  END LC_NAME
  
  LC_ADDRESS
@@ -532,6 +516,7 @@ diff -uNr libc.orig/localedata/locales/br_FR libc/localedata/locales/br_FR
 +country_num 250
 +country_car "<U0046>"
 +country_isbn "<U0032>"
++lang_name   "<U0042><U0072><U0065><U007A><U0068><U006F><U006E><U0065><U0067>"
 +lang_ab     "<U0062><U0072>"
 +lang_term   "<U0062><U0072><U0065>"
 +lang_lib    "<U0062><U0072><U0065>"
@@ -718,7 +703,7 @@ diff -uNr libc.orig/localedata/locales/de_BE libc/localedata/locales/de_BE
  country_ab2 "<U0042><U0045>"
  country_ab3 "<U0042><U0045><U004C>"
  country_num 056
-+country_car "<U0044>"
++country_car "<U0042>"
 +country_isbn "<U0039><U0030>"
 +lang_name   "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
 +lang_ab     "<U0064><U0065>"
@@ -793,7 +778,7 @@ diff -uNr libc.orig/localedata/locales/de_LU libc/localedata/locales/de_LU
  country_ab3 "<U004C><U0055><U0058>"
  country_num 442
 +country_car "<U004C>"
-+country_isbn "<U0032>"
++country_isbn "<U0039><U0039><U0039><U0035><U0039>"
 +lang_name   "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
 +lang_ab     "<U0064><U0065>"
 +lang_term   "<U0064><U0065><U0075>"
@@ -838,7 +823,7 @@ diff -uNr libc.orig/localedata/locales/en_AU libc/localedata/locales/en_AU
 diff -uNr libc.orig/localedata/locales/en_BW libc/localedata/locales/en_BW
 --- libc.orig/localedata/locales/en_BW 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/en_BW      2004-11-10 02:36:38.000000000 +0100
-@@ -111,7 +111,13 @@
+@@ -111,7 +111,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
@@ -846,16 +831,16 @@ diff -uNr libc.orig/localedata/locales/en_BW libc/localedata/locales/en_BW
  country_ab2 "<U0042><U0057>"
  country_ab3 "<U0042><U0057><U0041>"
  country_num 072
-+country_isbn "<U0039><U0039><U0039><U0031><U0032>"
++country_car "<U0052><U0042>"
++country_isbn "99912,99968"
 +lang_name   "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
 +lang_ab     "<U0065><U006E>"
 +lang_term   "<U0065><U006E><U0067>"
 +lang_lib    "<U0065><U006E><U0067>"
  END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/en_CA libc/localedata/locales/en_CA
---- libc.orig/localedata/locales/en_CA 2003-12-07 14:00:21.000000000 +0100
-+++ libc/localedata/locales/en_CA      2004-11-10 02:36:38.000000000 +0100
-@@ -2214,7 +2214,14 @@
+--- glibc-2.8/localedata/locales/en_CA.orig    2008-04-16 20:55:50.000000000 +0200
++++ glibc-2.8/localedata/locales/en_CA 2008-05-07 19:19:15.668432508 +0200
+@@ -167,9 +167,12 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
@@ -865,11 +850,9 @@ diff -uNr libc.orig/localedata/locales/en_CA libc/localedata/locales/en_CA
  country_num 124
 +country_car "<U0043><U0044><U004E>"
 +country_isbn "<U0030>"
-+lang_name   "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
-+lang_ab     "<U0065><U006E>"
-+lang_term   "<U0065><U006E><U0067>"
-+lang_lib    "<U0065><U006E><U0067>"
- END LC_ADDRESS
+ lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
+ lang_ab       "<U0065><U006E>"
+ lang_term     "<U0065><U006E><U0067>"
 diff -uNr libc.orig/localedata/locales/en_DK libc/localedata/locales/en_DK
 --- libc.orig/localedata/locales/en_DK 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/en_DK      2004-11-10 02:36:38.000000000 +0100
@@ -986,7 +969,7 @@ diff -uNr libc.orig/localedata/locales/en_NZ libc/localedata/locales/en_NZ
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
-+country_name  "<U004E><U0065><U0077><U0020><U005A><U0065><U006C><U0061><U006E><U0064>"
++country_name  "<U004E><U0065><U0077><U0020><U005A><U0065><U0061><U006C><U0061><U006E><U0064>"
  country_ab2   "<U004E><U005A>"
  country_ab3   "<U004E><U005A><U004C>"
  country_num   554
@@ -1010,7 +993,7 @@ diff -uNr libc.orig/localedata/locales/en_PH libc/localedata/locales/en_PH
 -country_ab2   "<U0049><U0044>"
 -country_ab3   "<U0049><U0044><U004E>"
 -country_num   360
-+country_name  "<U0050><U0068><U0069><U006C><U0069><U0070><U0069><U006E><U0065><U0073>"
++country_name  "<U0050><U0068><U0069><U006C><U0069><U0070><U0070><U0069><U006E><U0065><U0073>"
 +country_ab2   "<U0050><U0048>"
 +country_ab3   "<U0050><U0048><U004C>"
 +country_num   608
@@ -1087,21 +1070,11 @@ diff -uNr libc.orig/localedata/locales/en_ZW libc/localedata/locales/en_ZW
 diff -uNr libc.orig/localedata/locales/es_AR libc/localedata/locales/es_AR
 --- libc.orig/localedata/locales/es_AR 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_AR      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -154,7 +153,14 @@
+@@ -153,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+ <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
-+country_name  "<U0041><U0062><U0067><U0065><U006E><U0074><U0069><U006E><U0061>"
++country_name  "<U0041><U0072><U0067><U0065><U006E><U0074><U0069><U006E><U0061>"
  country_ab2   "<U0041><U0052>"
  country_ab3   "<U0041><U0052><U0047>"
  country_num   032
@@ -1115,16 +1088,6 @@ diff -uNr libc.orig/localedata/locales/es_AR libc/localedata/locales/es_AR
 diff -uNr libc.orig/localedata/locales/es_BO libc/localedata/locales/es_BO
 --- libc.orig/localedata/locales/es_BO 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_BO      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1134,7 +1097,7 @@ diff -uNr libc.orig/localedata/locales/es_BO libc/localedata/locales/es_BO
  country_ab3   "<U0042><U004F><U004C>"
  country_num   068
 +country_car   "<U0042><U004F><U004C>"
-+country_isbn  "<U0039><U0039><U0039><U0030><U0035>"
++country_isbn  "99905,99954"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1143,16 +1106,6 @@ diff -uNr libc.orig/localedata/locales/es_BO libc/localedata/locales/es_BO
 diff -uNr libc.orig/localedata/locales/es_CL libc/localedata/locales/es_CL
 --- libc.orig/localedata/locales/es_CL 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_CL      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1161,7 +1114,7 @@ diff -uNr libc.orig/localedata/locales/es_CL libc/localedata/locales/es_CL
  country_ab2   "<U0043><U004C>"
  country_ab3   "<U0043><U0048><U004C>"
  country_num   152
-+country_car   "<U0052><U0048><U004C>"
++country_car   "<U0052><U0043><U0048>"
 +country_isbn  "<U0039><U0035><U0036>"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
@@ -1171,16 +1124,6 @@ diff -uNr libc.orig/localedata/locales/es_CL libc/localedata/locales/es_CL
 diff -uNr libc.orig/localedata/locales/es_CO libc/localedata/locales/es_CO
 --- libc.orig/localedata/locales/es_CO 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_CO      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1194,65 +1137,17 @@ diff -uNr libc.orig/localedata/locales/es_CO libc/localedata/locales/es_CO
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
-+lang_lib      "<U0073><U0070><U0061>"
- END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/es_CR libc/localedata/locales/es_CR
---- libc.orig/localedata/locales/es_CR 2003-12-07 14:00:21.000000000 +0100
-+++ libc/localedata/locales/es_CR      2004-11-10 02:36:38.000000000 +0100
-@@ -47,8 +47,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -145,7 +144,15 @@
- <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
- <U004E><U0025><U0063><U0025><U004E>"
-+country_name  "<U0043><U006F><U0073><U0074><U0061><U0020>/
-+<U0052><U0069><U0063><U0061>"
- country_ab2   "<U0043><U0052>"
- country_ab3   "<U0043><U0052><U0049>"
- country_num   188
-+country_car   "<U0043><U0052>"
-+country_isbn  "9968,9977"
-+lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
-+lang_ab       "<U0065><U0073>"
-+lang_term     "<U0073><U0070><U0061>"
 +lang_lib      "<U0073><U0070><U0061>"
  END LC_ADDRESS
 diff -uNr libc.orig/localedata/locales/es_DO libc/localedata/locales/es_DO
 --- libc.orig/localedata/locales/es_DO 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_DO      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -134,7 +133,7 @@
- LC_TELEPHONE
- tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
- <U006C>"
--int_prefix     "<U0031><U0038><U0030><U0039>"
-+int_prefix     "<U0038><U0030><U0039>"
- int_select     "<U0030><U0031><U0031>"
- END LC_TELEPHONE
- 
 @@ -154,7 +153,15 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
-+country_name  "<U0044><U006F><U006D><U0069><U006E><U0069><U0063><U0061>/
-+<U006E><U0061>"
++country_name  "<U0052><U0065><U0070><U00FA><U0062><U006C><U0069><U0063>/
++<U0061><U0020><U0044><U006F><U006D><U0069><U006E><U0069><U0063><U0061><U006E><U0061>"
  country_ab2   "<U0044><U004F>"
  country_ab3   "<U0044><U004F><U004D>"
  country_num   214
@@ -1266,16 +1161,6 @@ diff -uNr libc.orig/localedata/locales/es_DO libc/localedata/locales/es_DO
 diff -uNr libc.orig/localedata/locales/es_EC libc/localedata/locales/es_EC
 --- libc.orig/localedata/locales/es_EC 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_EC      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1285,7 +1170,7 @@ diff -uNr libc.orig/localedata/locales/es_EC libc/localedata/locales/es_EC
  country_ab3   "<U0045><U0043><U0055>"
  country_num   218
 +country_car   "<U0045><U0043>"
-+country_isbn  "<U0039><U0039><U0037><U0038>"
++country_isbn  "9942,9978"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1294,16 +1179,18 @@ diff -uNr libc.orig/localedata/locales/es_EC libc/localedata/locales/es_EC
 diff -uNr libc.orig/localedata/locales/es_ES libc/localedata/locales/es_ES
 --- libc.orig/localedata/locales/es_ES 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_ES      2004-11-10 02:36:38.000000000 +0100
-@@ -2117,8 +2117,10 @@
- END LC_CTYPE
- 
- LC_MESSAGES
+@@ -65,10 +65,10 @@
+ yesstr  "<U0053><U0069>"
+ % No - Spanish and English "No" have the same spelling.
+ nostr   "<U004E><U006F>"
+-% ^[sSyY].* - Spanish or English answer is appropriate.
 -yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
+-% ^[nN].* - Spanish or English answer have the same spelling.
 -noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+yesexpr "<U005E><U005B><U0053><U0073><U0059><U0079><U005D>"
-+noexpr  "<U005E><U005B><U004E><U006E><U005D>"
-+yesstr  "<U0073><U00ED>"
-+nostr   "<U006E><U006F>"
++% ^[sSyY] - Spanish or English answer is appropriate.
++yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D>"
++% ^[nN] - Spanish or English answer have the same spelling.
++noexpr  "<U005E><U005B><U006E><U004E><U005D>"
  END LC_MESSAGES
  
  LC_MONETARY
@@ -1325,16 +1212,6 @@ diff -uNr libc.orig/localedata/locales/es_ES libc/localedata/locales/es_ES
 diff -uNr libc.orig/localedata/locales/es_GT libc/localedata/locales/es_GT
 --- libc.orig/localedata/locales/es_GT 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_GT      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1344,7 +1221,7 @@ diff -uNr libc.orig/localedata/locales/es_GT libc/localedata/locales/es_GT
  country_ab3   "<U0047><U0054><U004D>"
  country_num   320
 +country_car   "<U0047><U0043><U0041>"
-+country_isbn  "99922,99939"
++country_isbn  "9929,99922,99939"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1353,17 +1230,7 @@ diff -uNr libc.orig/localedata/locales/es_GT libc/localedata/locales/es_GT
 diff -uNr libc.orig/localedata/locales/es_HN libc/localedata/locales/es_HN
 --- libc.orig/localedata/locales/es_HN 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_HN      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -154,7 +153,13 @@
+@@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
@@ -1371,6 +1238,7 @@ diff -uNr libc.orig/localedata/locales/es_HN libc/localedata/locales/es_HN
  country_ab2   "<U0048><U004E>"
  country_ab3   "<U0048><U004E><U0044>"
  country_num   340
++country_car   "<U0048><U004E>"
 +country_isbn  "<U0039><U0039><U0039><U0032><U0036>"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
@@ -1380,16 +1248,6 @@ diff -uNr libc.orig/localedata/locales/es_HN libc/localedata/locales/es_HN
 diff -uNr libc.orig/localedata/locales/es_MX libc/localedata/locales/es_MX
 --- libc.orig/localedata/locales/es_MX 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_MX      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1399,7 +1257,7 @@ diff -uNr libc.orig/localedata/locales/es_MX libc/localedata/locales/es_MX
  country_ab3   "<U004D><U0045><U0058>"
  country_num   484
 +country_car   "<U004D><U0045><U0058>"
-+country_isbn  "968,970"
++country_isbn  "607,968,970"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1408,16 +1266,6 @@ diff -uNr libc.orig/localedata/locales/es_MX libc/localedata/locales/es_MX
 diff -uNr libc.orig/localedata/locales/es_NI libc/localedata/locales/es_NI
 --- libc.orig/localedata/locales/es_NI 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_NI      2004-11-10 02:36:38.000000000 +0100
-@@ -47,8 +47,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -144,7 +143,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1427,7 +1275,7 @@ diff -uNr libc.orig/localedata/locales/es_NI libc/localedata/locales/es_NI
  country_ab3   "<U004E><U0049><U0043>"
  country_num   558
 +country_car   "<U004E><U0049><U0043>"
-+country_isbn  "<U0039><U0039><U0039><U0032><U0034>"
++country_isbn  "99924,99964"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1436,16 +1284,6 @@ diff -uNr libc.orig/localedata/locales/es_NI libc/localedata/locales/es_NI
 diff -uNr libc.orig/localedata/locales/es_PA libc/localedata/locales/es_PA
 --- libc.orig/localedata/locales/es_PA 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PA      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -134,7 +133,7 @@
  LC_TELEPHONE
  tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
@@ -1473,16 +1311,6 @@ diff -uNr libc.orig/localedata/locales/es_PA libc/localedata/locales/es_PA
 diff -uNr libc.orig/localedata/locales/es_PE libc/localedata/locales/es_PE
 --- libc.orig/localedata/locales/es_PE 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PE      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1492,7 +1320,7 @@ diff -uNr libc.orig/localedata/locales/es_PE libc/localedata/locales/es_PE
  country_ab3   "<U0050><U0045><U0052>"
  country_num   604
 +country_car   "<U0050><U0045>"
-+country_isbn  "<U0039><U0039><U0037><U0032>"
++country_isbn  "612,9972"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1501,16 +1329,6 @@ diff -uNr libc.orig/localedata/locales/es_PE libc/localedata/locales/es_PE
 diff -uNr libc.orig/localedata/locales/es_PR libc/localedata/locales/es_PR
 --- libc.orig/localedata/locales/es_PR 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PR      2004-11-10 02:36:38.000000000 +0100
-@@ -47,8 +47,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -141,7 +140,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1529,16 +1347,6 @@ diff -uNr libc.orig/localedata/locales/es_PR libc/localedata/locales/es_PR
 diff -uNr libc.orig/localedata/locales/es_PY libc/localedata/locales/es_PY
 --- libc.orig/localedata/locales/es_PY 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PY      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1548,7 +1356,7 @@ diff -uNr libc.orig/localedata/locales/es_PY libc/localedata/locales/es_PY
  country_ab3   "<U0050><U0052><U0059>"
  country_num   600
 +country_car   "<U0050><U0059>"
-+country_isbn  "<U0039><U0039><U0039><U0032><U0035>"
++country_isbn  "99925,99953,99967"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1557,16 +1365,6 @@ diff -uNr libc.orig/localedata/locales/es_PY libc/localedata/locales/es_PY
 diff -uNr libc.orig/localedata/locales/es_SV libc/localedata/locales/es_SV
 --- libc.orig/localedata/locales/es_SV 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_SV      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,15 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1577,7 +1375,7 @@ diff -uNr libc.orig/localedata/locales/es_SV libc/localedata/locales/es_SV
  country_ab3   "<U0053><U004C><U0056>"
  country_num   222
 +country_car   "<U0045><U0053>"
-+country_isbn  "<U0039><U0039><U0039><U0032><U0033>"
++country_isbn  "99923,99961"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
@@ -1608,16 +1406,6 @@ diff -uNr libc.orig/localedata/locales/es_US libc/localedata/locales/es_US
 diff -uNr libc.orig/localedata/locales/es_UY libc/localedata/locales/es_UY
 --- libc.orig/localedata/locales/es_UY 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_UY      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1626,7 +1414,7 @@ diff -uNr libc.orig/localedata/locales/es_UY libc/localedata/locales/es_UY
  country_ab2   "<U0055><U0059>"
  country_ab3   "<U0055><U0052><U0059>"
  country_num   858
-+country_car   "<U0052><U004F><U0055>"
++country_car   "<U0055><U0059>"
 +country_isbn  "<U0039><U0039><U0037><U0034>"
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
@@ -1636,16 +1424,6 @@ diff -uNr libc.orig/localedata/locales/es_UY libc/localedata/locales/es_UY
 diff -uNr libc.orig/localedata/locales/es_VE libc/localedata/locales/es_VE
 --- libc.orig/localedata/locales/es_VE 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_VE      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1690,24 +1468,6 @@ diff -uNr libc.orig/localedata/locales/eu_ES libc/localedata/locales/eu_ES
 +lang_term   "<U0065><U0075><U0073>"
 +lang_lib    "<U0062><U0061><U0071>"
  END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/fi_FI libc/localedata/locales/fi_FI
---- libc.orig/localedata/locales/fi_FI 2003-12-07 14:00:21.000000000 +0100
-+++ libc/localedata/locales/fi_FI      2004-11-10 02:36:38.000000000 +0100
-@@ -2227,7 +2227,14 @@
- <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
- <U004E><U0025><U0063><U0025><U004E>"
-+country_name "<U0053><U0075><U006F><U006D><U0069>"
- country_ab2 "<U0046><U0049>"
- country_ab3 "<U0046><U0049><U004E>"
- country_num 246
-+country_car "<U0046><U0049><U004E>"
-+country_isbn "951,952"
-+lang_name   "<U0053><U0075><U006F><U006D><U0069>"
-+lang_ab     "<U0066><U0069>"
-+lang_term   "<U0066><U0069><U006E>"
-+lang_lib    "<U0066><U0069><U006E>"
- END LC_ADDRESS
 diff -uNr libc.orig/localedata/locales/fo_FO libc/localedata/locales/fo_FO
 --- libc.orig/localedata/locales/fo_FO 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/fo_FO      2004-11-10 02:36:38.000000000 +0100
@@ -1716,7 +1476,7 @@ diff -uNr libc.orig/localedata/locales/fo_FO libc/localedata/locales/fo_FO
  country_ab3 "<U0046><U0052><U004F>"
  country_num 234
 +country_car "<U0046><U004F>"
-+country_isbn "<U0039><U0039><U0039><U0031><U0038>"
++country_isbn "99918,99972"
 +country_name "<U0046><U00F8><U0072><U006F><U0079><U0061><U0072>"
 +lang_name   "<U0066><U00F8><U0072><U006F><U0079><U0073><U006B><U0074>"
 +lang_ab     "<U0066><U006F>"
@@ -1748,27 +1508,16 @@ diff -uNr libc.orig/localedata/locales/fr_BE libc/localedata/locales/fr_BE
  country_ab2 "<U0042><U0045>"
  country_ab3 "<U0042><U0045><U004C>"
  country_num 056
-+country_car "<U0044>"
++country_car "<U0042>"
 +country_isbn "<U0032>"
-+lang_name   "<U0065><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_name   "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
 +lang_ab     "<U0066><U0072>"
 +lang_term   "<U0066><U0072><U0061>"
 +lang_lib    "<U0066><U0072><U0065>"
  END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/fr_CA libc/localedata/locales/fr_CA
---- libc.orig/localedata/locales/fr_CA 2003-12-07 14:00:22.000000000 +0100
-+++ libc/localedata/locales/fr_CA      2004-11-10 02:36:38.000000000 +0100
-@@ -55,8 +55,7 @@
- END LC_COLLATE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U006F><U004F><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "fr_FR"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -146,7 +145,14 @@
+--- glibc-2.8/localedata/locales/fr_CA.orig    2008-04-16 20:55:50.000000000 +0200
++++ glibc-2.8/localedata/locales/fr_CA 2008-05-07 19:19:51.730487567 +0200
+@@ -146,9 +145,12 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
@@ -1778,11 +1527,9 @@ diff -uNr libc.orig/localedata/locales/fr_CA libc/localedata/locales/fr_CA
  country_num 124
 +country_car "<U0043><U0044><U004E>"
 +country_isbn "<U0032>"
-+lang_name   "<U0065><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
-+lang_ab     "<U0066><U0072>"
-+lang_term   "<U0066><U0072><U0061>"
-+lang_lib    "<U0066><U0072><U0065>"
- END LC_ADDRESS
+ lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+ lang_ab   "<U0066><U0072>"
+ lang_term "<U0066><U0072><U0061>"
 diff -uNr libc.orig/localedata/locales/fr_CH libc/localedata/locales/fr_CH
 --- libc.orig/localedata/locales/fr_CH 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/fr_CH      2004-11-10 02:36:38.000000000 +0100
@@ -1809,7 +1556,7 @@ diff -uNr libc.orig/localedata/locales/fr_CH libc/localedata/locales/fr_CH
  country_num 756
 +country_car "<U0043><U0048>"
 +country_isbn "<U0032>"
-+lang_name   "<U0065><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_name   "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
 +lang_ab     "<U0066><U0072>"
 +lang_term   "<U0066><U0072><U0061>"
 +lang_lib    "<U0066><U0072><U0065>"
@@ -1840,7 +1587,7 @@ diff -uNr libc.orig/localedata/locales/fr_FR libc/localedata/locales/fr_FR
  country_num 250
 +country_car "<U0046>"
 +country_isbn "<U0032>"
-+lang_name   "<U0065><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_name   "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
 +lang_ab     "<U0066><U0072>"
 +lang_term   "<U0066><U0072><U0061>"
 +lang_lib    "<U0066><U0072><U0065>"
@@ -1868,8 +1615,8 @@ diff -uNr libc.orig/localedata/locales/fr_LU libc/localedata/locales/fr_LU
  country_ab3 "<U004C><U0055><U0058>"
  country_num 442
 +country_car "<U004C>"
-+country_isbn "<U0032>"
-+lang_name   "<U0065><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++country_isbn "<U0039><U0039><U0039><U0035><U0039>"
++lang_name   "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
 +lang_ab     "<U0066><U0072>"
 +lang_term   "<U0066><U0072><U0061>"
 +lang_lib    "<U0066><U0072><U0065>"
@@ -1894,9 +1641,14 @@ diff -uNr libc.orig/localedata/locales/ga_IE libc/localedata/locales/ga_IE
  END LC_ADDRESS
 --- glibc-2.5/localedata/locales/gez_ER.orig   2006-07-31 00:19:44.000000000 +0200
 +++ glibc-2.5/localedata/locales/gez_ER        2006-10-05 13:40:18.995971000 +0200
-@@ -110,13 +110,9 @@
- % country_car   unknown
- % country_isbn  unknown, Need ISO 2108
+@@ -107,16 +107,12 @@
+ country_ab2   "<U0045><U0052>"
+ country_ab3   "<U0045><U0052><U0049>"
+ country_num   232
+-% country_car   unknown
+-% country_isbn  unknown, Need ISO 2108
++country_car   "<U0045><U0052>"
++country_isbn  "<U0039><U0039><U0039><U0034><U0038>"
  lang_name     "<U130D><U12D5><U12DD>"
 -%lang_ab       "<U0067><U0065><U007A>"
 +lang_ab       ""
@@ -1912,11 +1664,13 @@ diff -uNr libc.orig/localedata/locales/ga_IE libc/localedata/locales/ga_IE
  
 --- glibc-2.5/localedata/locales/gez_ET.orig   2006-07-31 00:19:44.000000000 +0200
 +++ glibc-2.5/localedata/locales/gez_ET        2006-10-05 13:41:03.145971000 +0200
-@@ -108,15 +108,11 @@
+@@ -107,16 +107,12 @@
+ country_ab2   "<U0045><U0054>"
  country_ab3   "<U0045><U0054><U0048>"
  country_num   231   % 210 found in at least one ISO 3166 doc
- % country_car   unknown
+-% country_car   unknown
 -% country_isbn  unknown, Need ISO 2108
++country_car   "<U0045><U0054><U0048>"
 +country_isbn  "<U0039><U0039><U0039><U0034><U0034>"
  lang_name     "<U130D><U12D5><U12DD>"
 -%lang_ab       "<U0067><U0065><U007A>"
@@ -1949,7 +1703,7 @@ diff -uNr libc.orig/localedata/locales/gl_ES libc/localedata/locales/gl_ES
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
-+country_name "<U0045><U0073><U0070><U0061><U00D1><U0061>"
++country_name "<U0045><U0073><U0070><U0061><U00F1><U0061>"
  country_ab2 "<U0045><U0053>"
  country_ab3 "<U0045><U0053><U0050>"
  country_num 724
@@ -1986,8 +1740,8 @@ diff -uNr libc.orig/localedata/locales/gv_GB libc/localedata/locales/gv_GB
  country_num 826
 +country_car "<U0047><U0042>"
 +country_isbn "<U0030>"
-+country_name "Rywvaneth Unys"
-+lang_name   "Gaelg"
++country_name "<U0052><U0065><U0065><U0072><U0069><U0061><U0067><U0068><U0074><U0020><U0055><U006E><U006E><U0061><U006E><U0065><U0079><U0073><U0069><U0074>"
++lang_name   "<U0047><U0061><U0065><U006C><U0067>"
 +lang_ab     "<U0067><U0076>"
 +lang_term   "<U0067><U006C><U0076>"
 +lang_lib    "<U0067><U006C><U0076>"
@@ -2004,7 +1758,7 @@ diff -uNr libc.orig/localedata/locales/he_IL libc/localedata/locales/he_IL
  country_ab3 "<U0049><U0053><U0052>"
  country_num 376
 +country_car "<U0049><U004C>"
-+country_isbn "<U0039><U0036><U0034>"
++country_isbn "<U0039><U0036><U0035>"
 +lang_name   "<U05E2><U05D1><U05E8><U05D9><U05EA>"
 +lang_ab     "<U0068><U0065>"
 +lang_term   "<U0068><U0065><U0062>"
@@ -2024,7 +1778,7 @@ diff -uNr libc.orig/localedata/locales/he_IL libc/localedata/locales/he_IL
  country_ab2 "<U0049><U004E>"
  country_ab3 "<U0049><U004E><U0044>"
  country_num 356
-+country_name "<U0954><U0965><U0930><U0924>"
++country_name "<U092D><U093E><U0930><U0924>"
 +country_car "<U0049><U004E><U0044>"
 +country_isbn "81,93"
 +lang_name   "<U0939><U093F><U0928><U094D><U0926><U0940>"
@@ -2050,7 +1804,7 @@ diff -uNr libc.orig/localedata/locales/hr_HR libc/localedata/locales/hr_HR
 +lang_name   "<U0048><U0072><U0076><U0061><U0074><U0073><U006B><U0069>"
 +lang_ab     "<U0068><U0072>"
 +lang_term   "<U0068><U0072><U0076>"
-+lang_lib    "<U0073><U0063><U0072>"
++lang_lib    "<U0068><U0072><U0076>"
  END LC_ADDRESS
 diff -uNr libc.orig/localedata/locales/hu_HU libc/localedata/locales/hu_HU
 --- libc.orig/localedata/locales/hu_HU 2003-12-07 14:00:22.000000000 +0100
@@ -2070,13 +1824,13 @@ diff -uNr libc.orig/localedata/locales/hu_HU libc/localedata/locales/hu_HU
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
-+country_name "<U004E><U0061><U0067><U0079><U0061><U0072><U007F><U0072>/
++country_name "<U004D><U0061><U0067><U0079><U0061><U0072><U006F><U0072>/
 +<U0073><U007A><U00E1><U0067>"
  country_ab2 "<U0048><U0055>"
  country_ab3 "<U0048><U0055><U004E>"
  country_num 348
 +country_car "<U0048>"
-+country_isbn "<U0039><U0036><U0033>"
++country_isbn "615,963"
 +lang_name   "<U006D><U0061><U0067><U0079><U0061><U0072>"
 +lang_ab     "<U0068><U0075>"
 +lang_term   "<U0068><U0075><U006E>"
@@ -2085,7 +1839,7 @@ diff -uNr libc.orig/localedata/locales/hu_HU libc/localedata/locales/hu_HU
 diff -uNr libc.orig/localedata/locales/id_ID libc/localedata/locales/id_ID
 --- libc.orig/localedata/locales/id_ID 2004-04-29 00:55:01.000000000 +0200
 +++ libc/localedata/locales/id_ID      2004-11-10 02:36:38.000000000 +0100
-@@ -152,7 +152,13 @@
+@@ -152,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
@@ -2094,7 +1848,8 @@ diff -uNr libc.orig/localedata/locales/id_ID libc/localedata/locales/id_ID
  country_ab3 "<U0049><U0044><U004E>"
  country_num 360
 +country_car "<U0052><U0049>"
-+country_isbn "<U0039><U0037><U0039>"
++country_isbn "602,979"
++lang_name   "<U0049><U006E><U0064><U006F><U006E><U0065><U0073><U0069><U0061>"
 +lang_ab     "<U0069><U0064>"
 +lang_term   "<U0069><U006E><U0064>"
 +lang_lib    "<U0069><U006E><U0064>"
@@ -2111,13 +1866,12 @@ diff -uNr libc.orig/localedata/locales/is_IS libc/localedata/locales/is_IS
  country_ab3 "<U0049><U0053><U004C>"
  country_num 352
 +country_car "<U0049><U0053>"
-+country_isbn "<U0039><U0039><U0037><U0039>"
++country_isbn "9935,9979"
 +lang_name   "<U00CD><U0073><U006C><U0065><U006E><U0073><U006B><U0061>"
 +lang_ab     "<U0069><U0073>"
 +lang_term   "<U0069><U0073><U006C>"
 +lang_lib    "<U0069><U0063><U0065>"
  END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/it_CH libc/localedata/locales/it_CH
 --- libc.orig/localedata/locales/it_CH 2003-12-05 01:25:58.000000000 +0100
 +++ libc/localedata/locales/it_CH      2004-11-10 02:36:38.000000000 +0100
 @@ -48,8 +48,10 @@
@@ -2143,7 +1897,7 @@ diff -uNr libc.orig/localedata/locales/it_CH libc/localedata/locales/it_CH
  country_num 756
 +country_car "<U0043><U0048>"
 +country_isbn "<U0038><U0038>"
-+lang_name   "<U0049><U0074><U0061><U006B><U0069><U0061><U006E><U006F>"
++lang_name   "<U0049><U0074><U0061><U006C><U0069><U0061><U006E><U006F>"
 +lang_ab     "<U0069><U0074>"
 +lang_term   "<U0069><U0074><U0061>"
 +lang_lib    "<U0069><U0074><U0061>"
@@ -2168,13 +1922,13 @@ diff -uNr libc.orig/localedata/locales/it_IT libc/localedata/locales/it_IT
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
-+country_name "<U0049><U0074><U0061><U006B><U0069><U0061>"
++country_name "<U0049><U0074><U0061><U006C><U0069><U0061>"
  country_ab2 "<U0049><U0054>"
  country_ab3 "<U0049><U0054><U0041>"
  country_num 380
 +country_car "<U0049>"
 +country_isbn "<U0038><U0038>"
-+lang_name   "<U0049><U0074><U0061><U006B><U0069><U0061><U006E><U006F>"
++lang_name   "<U0049><U0074><U0061><U006C><U0069><U0061><U006E><U006F>"
 +lang_ab     "<U0069><U0074>"
 +lang_term   "<U0069><U0074><U0061>"
 +lang_lib    "<U0069><U0074><U0061>"
@@ -2302,12 +2056,14 @@ diff -uNr libc.orig/localedata/locales/kw_GB libc/localedata/locales/kw_GB
  END LC_MESSAGES
  
  LC_PAPER
-@@ -158,4 +158,9 @@
+@@ -158,4 +158,11 @@
  country_ab2 "<U0047><U0042>"
  country_ab3 "<U0047><U0042><U0052>"
  country_num 826
 +country_car "<U0047><U0042>"
 +country_isbn "<U0030>"
++country_name "<U0052><U0077><U0076><U0061><U006E><U0065><U0074><U0068><U0020><U0055><U006E><U0079><U0073>"
++lang_name   "<U004B><U0065><U0072><U006E><U006F><U0077><U0065><U006B>"
 +lang_ab     "<U006B><U0077>"
 +lang_term   "<U0063><U006F><U0072>"
 +lang_lib    "<U0063><U006F><U0072>"
@@ -2711,14 +2467,14 @@ diff -uNr libc.orig/localedata/locales/nso_ZA libc/localedata/locales/nso_ZA
  END LC_MESSAGES
  
  LC_PAPER
-@@ -218,8 +220,7 @@
+@@ -228,8 +228,7 @@
  % "ZA"
  country_car   "<U005A><U0041>"
  
 -% FIXME define the following correctly
 -% country_isbn ""
 +country_isbn  0
-  
+ 
  % Language name in Northern Sotho - "Sesotho sa Leboa"
  lang_name "<U0053><U0065><U0073><U006F><U0074><U0068><U006F><U0020>/
 diff -uNr libc.orig/localedata/locales/oc_FR libc/localedata/locales/oc_FR
@@ -3125,17 +2881,6 @@ diff -uNr libc.orig/localedata/locales/sq_AL libc/localedata/locales/sq_AL
  END LC_ADDRESS
  
  
-diff -uNr libc.orig/localedata/locales/sr_CS libc/localedata/locales/sr_CS
---- libc.orig/localedata/locales/sr_CS 2004-11-10 01:45:57.000000000 +0100
-+++ libc/localedata/locales/sr_CS      2004-11-10 02:36:38.000000000 +0100
-@@ -328,7 +328,6 @@
- <U0020><U0426><U0440><U043D><U0430><U0020><U0413><U043E><U0440><U0430>"
- country_num   891
- country_car   "<U0053><U0043><U0047>"
--% FIXME: ISBN code is what? "86" that preceedes all the numbers?
- country_isbn  "<U0038><U0036>"
- lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
- lang_term     "<U0073><U0072><U0070>"
 --- glibc-2.5/localedata/locales/ss_ZA.orig    2006-07-31 00:19:43.000000000 +0200
 +++ glibc-2.5/localedata/locales/ss_ZA 2006-10-05 14:29:58.935971000 +0200
 @@ -174,10 +174,12 @@
@@ -3180,24 +2925,6 @@ diff -uNr libc.orig/localedata/locales/sr_CS libc/localedata/locales/sr_CS
  
  % Language name in Sotho - "Sesotho"
  lang_name "<U0053><U0065><U0073><U006F><U0074><U0068><U006F>"
-diff -uNr libc.orig/localedata/locales/sv_FI libc/localedata/locales/sv_FI
---- libc.orig/localedata/locales/sv_FI 2003-12-05 01:26:00.000000000 +0100
-+++ libc/localedata/locales/sv_FI      2004-11-10 02:36:38.000000000 +0100
-@@ -133,7 +133,14 @@
- <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
- <U004E><U0025><U0063><U0025><U004E>"
-+country_name "<U0046><U0069><U006E><U006C><U0061><U006E><U0064>"
- country_ab2 "<U0046><U0049>"
- country_ab3 "<U0046><U0049><U004E>"
- country_num 246
-+country_car "<U0046><U0049><U004E>"
-+country_isbn "951,952"
-+lang_name   "<U0053><U0076><U0065><U006E><U0073><U006B><U0061>"
-+lang_ab     "<U0073><U0076>"
-+lang_term   "<U0073><U0077><U0065>"
-+lang_lib    "<U0073><U0077><U0065>"
- END LC_ADDRESS
 diff -uNr libc.orig/localedata/locales/sv_SE libc/localedata/locales/sv_SE
 --- libc.orig/localedata/locales/sv_SE 2003-12-05 01:26:00.000000000 +0100
 +++ libc/localedata/locales/sv_SE      2004-11-10 02:36:38.000000000 +0100
@@ -3596,25 +3323,17 @@ diff -uNr libc.orig/localedata/locales/wa_BE libc/localedata/locales/wa_BE
  country_isbn "2"
  country_car "B"
  lang_name "<U0057><U0061><U006C><U006F><U006E>"
-diff -uNr libc.orig/localedata/locales/wal_ET libc/localedata/locales/wal_ET
---- libc.orig/localedata/locales/wal_ET        2004-05-03 22:49:23.000000000 +0200
-+++ libc/localedata/locales/wal_ET     2004-11-10 02:36:38.000000000 +0100
-@@ -108,13 +108,11 @@
+--- glibc-2.15/localedata/locales/wal_ET.orig  2011-12-23 20:03:55.000000000 +0100
++++ glibc-2.15/localedata/locales/wal_ET       2012-01-04 18:36:24.002145964 +0100
+@@ -108,7 +108,7 @@
  country_ab3   "<U0045><U0054><U0048>"
  country_num   231   % 210 found in at least one ISO 3166 doc
  % country_car   unknown
 -% country_isbn  unknown, Need ISO 2108
 +country_isbn  "<U0039><U0039><U0039><U0034><U0034>"
  lang_name     "<U12C8><U120B><U12ED><U1273><U1271>"
--lang_ab       "<U0077><U0061><U006C>"
-+lang_ab       ""
  lang_term     "<U0077><U0061><U006C>"
  lang_lib      "<U0077><U0061><U006C>"
--
--
- %
- END LC_ADDRESS
- 
 diff -uNr libc.orig/localedata/locales/xh_ZA libc/localedata/locales/xh_ZA
 --- libc.orig/localedata/locales/xh_ZA 2004-11-10 01:45:57.000000000 +0100
 +++ libc/localedata/locales/xh_ZA      2004-11-10 02:36:38.000000000 +0100
@@ -3851,8 +3570,8 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
  END LC_MESSAGES
  
  LC_MONETARY
---- glibc-2.7/localedata/locales/ik_CA.orig    2007-10-22 22:32:15.000000000 +0200
-+++ glibc-2.7/localedata/locales/ik_CA 2007-10-22 22:32:15.000000000 +0200
+--- glibc-2.8/localedata/locales/ik_CA.orig    2008-03-04 18:45:50.000000000 +0100
++++ glibc-2.8/localedata/locales/ik_CA 2008-05-07 19:21:10.266964782 +0200
 @@ -203,8 +203,8 @@
  LC_MESSAGES
  yesstr      "<U0061><U0061>"
@@ -3864,22 +3583,15 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
  END LC_MESSAGES
  
  % Default paper: A4
-@@ -224,7 +224,21 @@
- END LC_NAME
- 
- LC_ADDRESS
--% FIXME
--copy "en_CA"
-+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
-+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
-+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
-+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
-+<U004E><U0025><U0063><U0025><U004E>"
+@@ -230,8 +230,17 @@
+ <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+ <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+ <U004E><U0025><U0063><U0025><U004E>"
 +% FIXME Canada in Inupiaq
 +country_name "<U0043><U0061><U006E><U0061><U0064><U0061>"
-+country_ab2  "<U0043><U0041>"
-+country_ab3  "<U0043><U0041><U004E>"
-+country_num  124
+ country_ab2 "<U0043><U0041>"
+ country_ab3 "<U0043><U0041><U004E>"
+ country_num 124
 +country_car  "<U0043><U0044><U004E>"
 +country_isbn "<U0030>"
 +% FIXME: Inupiaq in Inupiaq
@@ -3888,25 +3600,18 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 +lang_term    "<U0069><U0070><U006B>"
 +lang_lib     "<U0069><U0070><U006B>"
  END LC_ADDRESS
--
---- glibc-2.7/localedata/locales/iu_CA.orig    2007-10-22 22:41:48.000000000 +0200
-+++ glibc-2.7/localedata/locales/iu_CA 2007-10-22 22:41:48.000000000 +0200
-@@ -41,12 +41,12 @@
+ 
+--- glibc-2.8/localedata/locales/iu_CA.orig    2008-03-04 18:45:50.000000000 +0100
++++ glibc-2.8/localedata/locales/iu_CA 2008-05-07 19:22:36.283864930 +0200
+@@ -41,7 +41,7 @@
  country_ab2 "<U0043><U0041>"
  country_ab3 "<U0043><U0041><U004E>"
  country_num 124
 -country_car "<U0043><U0041><U004E>" % FIXME
-+country_car "<U0043><U0044><U004E>" % FIXME
++country_car "<U0043><U0044><U004E>"
  % FIXME country_isbn for Canada/inuktitut ?
  lang_name "<U1403><U14C4><U1483><U144E><U1450><U1466>"
- lang_ab "iu"
--% FIXME lang_term 
--% FIXME lang_lib 
-+lang_term "iku"
-+lang_lib "iku"
- END LC_ADDRESS
- 
- %%%%%%%%%%%%%
+ lang_ab "<U0069><U0075>"
 --- glibc-2.7/localedata/locales/li_NL.orig    2007-10-22 22:55:04.000000000 +0200
 +++ glibc-2.7/localedata/locales/li_NL 2007-10-22 22:55:04.000000000 +0200
 @@ -10,8 +10,8 @@
@@ -3942,19 +3647,6 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
  lang_term "<U006E><U0064><U0073>"
  lang_lib "<U006E><U0064><U0073>"
  END LC_ADDRESS
---- glibc-2.7/localedata/locales/li_NL.orig    2007-10-22 22:55:04.000000000 +0200
-+++ glibc-2.7/localedata/locales/li_NL 2007-10-22 22:55:04.000000000 +0200
-@@ -10,8 +10,8 @@
- email "kenneth@gnu.org, pablo@mandriva.com"
- tel ""
- % Fax
--language "li"
--territory "NL"
-+language "Limburgish"
-+territory "Netherlands"
- revision "0.1"
- date "2003-11-30"
- 
 --- glibc-2.7/localedata/locales/pap_AN.orig   2007-10-22 23:07:20.000000000 +0200
 +++ glibc-2.7/localedata/locales/pap_AN        2007-10-22 23:07:20.000000000 +0200
 @@ -10,8 +10,8 @@
@@ -3987,15 +3679,15 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 -country_ab2 "<U0049><U004E>"
 -country_ab3 "<U0049><U004E><U0044>"
 -country_num 356
-++country_name "<U092D><U093E><U0930><U0924><U092E><U094D>"
-++country_ab2  "<U0049><U004E>"
-++country_ab3  "<U0049><U004E><U0044>"
-++country_num  356
-++country_car  "<U0049><U004E><U0044>"
-++lang_name    "<U0938><U0902><U0938><U094D><U0915><U0943><U0924>"
-++lang_ab      "<U0073><U0061>"
-++lang_term    "<U0073><U0061><U006E>"
-++lang_lib     "<U0073><U0061><U006E>"
++country_name "<U092D><U093E><U0930><U0924><U092E><U094D>"
++country_ab2  "<U0049><U004E>"
++country_ab3  "<U0049><U004E><U0044>"
++country_num  356
++country_car  "<U0049><U004E><U0044>"
++lang_name    "<U0938><U0902><U0938><U094D><U0915><U0943><U0924>"
++lang_ab      "<U0073><U0061>"
++lang_term    "<U0073><U0061><U006E>"
++lang_lib     "<U0073><U0061><U006E>"
  END LC_ADDRESS
  
  
@@ -4033,7 +3725,7 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 +country_ab2 "<U0053><U004E>"
 +country_ab3 "<U0053><U0045><U004E>"
 +country_num 686
-++country_car "<U0053><U004E>"
++country_car "<U0053><U004E>"
 +% FIXME: Wolof in Wolof
 +%lang_name  ""
 +lang_ab     "<U0077><U006F>"
@@ -4041,3 +3733,49 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 +lang_lib    "<U0077><U006F><U006C>"
  END LC_ADDRESS
 -
+--- glibc-2.17/localedata/locales/sr_ME.orig   2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/localedata/locales/sr_ME        2013-01-04 15:59:24.058148312 +0100
+@@ -149,7 +149,7 @@
+ country_name  "<U0426><U0440><U043D><U0430><U0020><U0413><U043E><U0440><U0430>"
+ country_num   499
+ country_car   "<U004D><U004E><U0045>"
+-country_isbn  "<U0038><U0036>"
++country_isbn  "<U0039><U0039><U0034><U0030>"
+ lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
+ lang_term     "<U0073><U0072><U0070>"
+ lang_lib      "<U0073><U0063><U0063>"
+@@ -157,7 +157,11 @@
+ END LC_ADDRESS
+ 
+ LC_TELEPHONE
+-copy "sr_RS"
++tel_int_fmt   "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
++<U006C>"
++tel_dom_fmt   "<U0025><U0041><U0020><U0025><U006C>"
++int_prefix    "<U0033><U0038><U0032>"
++int_select    "<U0030><U0030>"
+ END LC_TELEPHONE
+ 
+ LC_MEASUREMENT
+--- glibc-2.17/localedata/locales/bo_CN.orig   2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/localedata/locales/bo_CN        2013-01-05 07:58:03.573616094 +0100
+@@ -145,7 +145,7 @@
+ LC_NAME
+ % FIXME
+ 
+-name_fmt  ""
++name_fmt  "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
+ % name_gen    "FIXME"
+ % name_miss   "FIXME"
+ % name_mr     "FIXME"
+--- glibc-2.17/localedata/locales/bo_IN.orig   2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/localedata/locales/bo_IN        2013-01-05 07:59:33.026947563 +0100
+@@ -70,7 +70,7 @@
+ 
+ LC_NAME
+ % FIXME
+-name_fmt      ""
++name_fmt      "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
+ % name_gen    "FIXME"
+ % name_miss   "FIXME"
+ % name_mr     "FIXME"