Merge remote branch 'origin/master' into fedora/master

6 files changed, 126 insertions, 80 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index cc47bbaf70..16e2898ce9 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,29 @@
+2010-04-05  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #11007]
+	* locales/pt_BR: Define thousands_sep and grouping.
+
+2010-01-28  Marcelo E. Magallon  <marcelo.magallon@gmail.com>
+
+	[BZ #11258]
+	* locales/es_CR: Update for LC_MONETARY, LC_NUMERIC, LC_PAPER,
+	LC_TELEPHONE and LC_NAME and LC_ADDRESS.
+
+2010-04-04  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #11272]
+	* locales/fr_BE: Define week, first_weekday, and first_workday.
+
+2010-03-24  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #10554]
+	* locales/et_EE: Change first_weekday and first_workday.
+	Patch by Priit Laes <plaes@plaes.org>.
+
+2010-02-16  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* Makefile: Add missing gconv-modules dependency.
+
 2010-02-03  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #10414]
diff --git a/localedata/Makefile b/localedata/Makefile
index 1acc415748..921121ff3e 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -107,6 +107,8 @@ install-others := $(addprefix $(inst_i18ndir)/, \
 			      $(addsuffix .gz, $(charmaps)) \
 			      $(locales))
 
+tests: $(objdir)/iconvdata/gconv-modules
+
 include ../Rules
 
 # Install the charmap files in gzipped format.
@@ -299,3 +301,6 @@ tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \
 		LOCPATH=$(common-objpfx)localedata
 $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
+
+$(objdir)/iconvdata/gconv-modules:
+	$(MAKE) -C ../iconvdata subdir=iconvdata $@
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index 038517973a..35a4b84ded 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -21,8 +21,8 @@ tel        ""
 fax        ""
 language   "Spanish"
 territory  "Costa Rica"
-revision   "1.0"
-date       "2000-08-21"
+revision   "1.1"
+date       "2009-12-23"
 %
 category  "es_CR:2000";LC_IDENTIFICATION
 category  "es_CR:2000";LC_CTYPE
@@ -53,9 +53,10 @@ END LC_MESSAGES
 
 LC_MONETARY
 int_curr_symbol      "<U0043><U0052><U0043><U0020>"
-currency_symbol      "<U0043>"
-mon_decimal_point    "<U002E>"
-mon_thousands_sep    "<U002C>"
+currency_symbol      "<U20A1>"
+% Decreto Ejecutivo 29660
+mon_decimal_point    "<U002C>"
+mon_thousands_sep    "<U0020>"
 mon_grouping         3;3
 positive_sign        ""
 negative_sign        "<U002D>"
@@ -70,9 +71,10 @@ n_sign_posn          1
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point        "<U002E>"
-thousands_sep        ""
-grouping             0;0
+% Decreto Ejecutivo 29660
+decimal_point        "<U002C>"
+thousands_sep        "<U0020>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME
@@ -106,39 +108,42 @@ mon     "<U0065><U006E><U0065><U0072><U006F>";/
         "<U006E><U006F><U0076><U0069><U0065><U006D><U0062><U0072><U0065>";/
         "<U0064><U0069><U0063><U0069><U0065><U006D><U0062><U0072><U0065>"
 d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
-d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
 t_fmt   "<U0025><U0054>"
 am_pm   "<U0061><U002E><U006D><U002E>";"<U0070><U002E><U006D><U002E>"
 t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
-date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+date_fmt	"<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
-first_weekday 1
+first_weekday 2
 first_workday 2
 END LC_TIME
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+height   279
+width    216
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020>/
+<U0025><U006C>"
+tel_dom_fmt "<U0025><U006C>"
 int_prefix     "<U0035><U0030><U0036>"
 int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
 measurement    1
 END LC_MEASUREMENT
 
 LC_NAME
 name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
 <U0025><U006D><U0025><U0074><U0025><U0066>"
+name_gen    "<U0053><U0072><U002E><U002F><U0053><U0072><U0061><U002E>"
+name_miss   "<U0053><U0072><U0074><U0061><U002E>"
+name_mr     "<U0053><U0072><U002E>"
+name_mrs    "<U0053><U0072><U0061><U002E>"
+name_ms     "<U0053><U0072><U0061><U002E>"
 END LC_NAME
 
 LC_ADDRESS
@@ -147,6 +152,13 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_name  "<U0043><U006F><U0073><U0074><U0061><U0020><U0052><U0069><U0063><U0061>"
+country_post  "<U0043><U0052>"
+country_car   "<U0043><U0052>"
+country_isbn  "9930,9977,9968"
+lang_name     "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
+lang_ab       "<0065><0073>"
+lang_term     "<U0073><U0070><U0061>"
 country_ab2   "<U0043><U0052>"
 country_ab3   "<U0043><U0052><U0049>"
 country_num   188
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index efec335e05..33d31102f4 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -209,7 +209,7 @@ collating-symbol <SPECIAL>
 % letter;accent;case;specials
 
 order_start forward;backward/
-            ;forward;position
+	    ;forward;position
 
 % <CAPITAL> or <SMALL> letters first:
 
@@ -2197,8 +2197,8 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
 week    7;19971130;4
-first_weekday 1
-first_workday 1
+first_weekday 2
+first_workday 2
 END LC_TIME
 
 LC_MESSAGES
@@ -2232,12 +2232,12 @@ END LC_NAME
 
 LC_ADDRESS
 postal_fmt      "<U0025><U0061><U0025><U004E>/
-                 <U0025><U0066><U0025><U004E>/
-                 <U0025><U0064><U0025><U004E>/
-                 <U0025><U0062><U0025><U004E>/
-                 <U0025><U0073><U0025><U0074><U0025><U0068><U0025><U0074><U0025><U0065><U0025><U0074><U0025><U0072><U0025><U004E>/
-                 <U0025><U0043><U002D><U0025><U007A><U0020><U0025><U0054><U0025><U004E>/
-                 <U0025><U0063><U0025><U004E>"
+		 <U0025><U0066><U0025><U004E>/
+		 <U0025><U0064><U0025><U004E>/
+		 <U0025><U0062><U0025><U004E>/
+		 <U0025><U0073><U0025><U0074><U0025><U0068><U0025><U0074><U0025><U0065><U0025><U0074><U0025><U0072><U0025><U004E>/
+		 <U0025><U0043><U002D><U0025><U007A><U0020><U0025><U0054><U0025><U004E>/
+		 <U0025><U0063><U0025><U004E>"
 country_name    "<U0045><U0065><U0073><U0074><U0069>"
 country_post    "<U0045><U0045>"
 country_ab2     "<U0045><U0045>"
diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index 8a96d3c7ba..f9c911aba5 100644
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -84,34 +84,34 @@ END LC_NUMERIC
 
 LC_TIME
 abday   "<U0064><U0069><U006D>";"<U006C><U0075><U006E>";/
-        "<U006D><U0061><U0072>";"<U006D><U0065><U0072>";/
-        "<U006A><U0065><U0075>";"<U0076><U0065><U006E>";/
-        "<U0073><U0061><U006D>"
+	"<U006D><U0061><U0072>";"<U006D><U0065><U0072>";/
+	"<U006A><U0065><U0075>";"<U0076><U0065><U006E>";/
+	"<U0073><U0061><U006D>"
 day     "<U0064><U0069><U006D><U0061><U006E><U0063><U0068><U0065>";/
-        "<U006C><U0075><U006E><U0064><U0069>";/
-        "<U006D><U0061><U0072><U0064><U0069>";/
-        "<U006D><U0065><U0072><U0063><U0072><U0065><U0064><U0069>";/
-        "<U006A><U0065><U0075><U0064><U0069>";/
-        "<U0076><U0065><U006E><U0064><U0072><U0065><U0064><U0069>";/
-        "<U0073><U0061><U006D><U0065><U0064><U0069>"
+	"<U006C><U0075><U006E><U0064><U0069>";/
+	"<U006D><U0061><U0072><U0064><U0069>";/
+	"<U006D><U0065><U0072><U0063><U0072><U0065><U0064><U0069>";/
+	"<U006A><U0065><U0075><U0064><U0069>";/
+	"<U0076><U0065><U006E><U0064><U0072><U0065><U0064><U0069>";/
+	"<U0073><U0061><U006D><U0065><U0064><U0069>"
 abmon   "<U006A><U0061><U006E>";"<U0066><U00E9><U0076>";/
-        "<U006D><U0061><U0072>";"<U0061><U0076><U0072>";/
-        "<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/
-        "<U006A><U0075><U0069>";"<U0061><U006F><U00FB>";/
-        "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
-        "<U006E><U006F><U0076>";"<U0064><U00E9><U0063>"
+	"<U006D><U0061><U0072>";"<U0061><U0076><U0072>";/
+	"<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/
+	"<U006A><U0075><U0069>";"<U0061><U006F><U00FB>";/
+	"<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
+	"<U006E><U006F><U0076>";"<U0064><U00E9><U0063>"
 mon     "<U006A><U0061><U006E><U0076><U0069><U0065><U0072>";/
-        "<U0066><U00E9><U0076><U0072><U0069><U0065><U0072>";/
-        "<U006D><U0061><U0072><U0073>";/
-        "<U0061><U0076><U0072><U0069><U006C>";/
-        "<U006D><U0061><U0069>";/
-        "<U006A><U0075><U0069><U006E>";/
-        "<U006A><U0075><U0069><U006C><U006C><U0065><U0074>";/
-        "<U0061><U006F><U00FB><U0074>";/
-        "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0065>";/
-        "<U006F><U0063><U0074><U006F><U0062><U0072><U0065>";/
-        "<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U0065>";/
-        "<U0064><U00E9><U0063><U0065><U006D><U0062><U0072><U0065>"
+	"<U0066><U00E9><U0076><U0072><U0069><U0065><U0072>";/
+	"<U006D><U0061><U0072><U0073>";/
+	"<U0061><U0076><U0072><U0069><U006C>";/
+	"<U006D><U0061><U0069>";/
+	"<U006A><U0075><U0069><U006E>";/
+	"<U006A><U0075><U0069><U006C><U006C><U0065><U0074>";/
+	"<U0061><U006F><U00FB><U0074>";/
+	"<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0065>";/
+	"<U006F><U0063><U0074><U006F><U0062><U0072><U0065>";/
+	"<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U0065>";/
+	"<U0064><U00E9><U0063><U0065><U006D><U0062><U0072><U0065>"
 d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
 t_fmt   "<U0025><U0054>"
@@ -120,6 +120,10 @@ t_fmt_ampm ""
 date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
+
+week    7;19971130;4
+first_weekday 2
+first_workday 2
 END LC_TIME
 
 LC_PAPER
diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index 8dbc14ea64..22f61317d7 100644
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -14,7 +14,6 @@ escape_char  /
 % Revision: 4.4
 % Date: 1997-03-19
 % Users: general
-% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.
@@ -79,40 +78,40 @@ END LC_CTYPE
 
 LC_NUMERIC
 decimal_point             "<U002C>"
-thousands_sep             ""
-grouping                  0;0
+thousands_sep             "<U002E>"
+grouping                  3;3
 END LC_NUMERIC
 
 LC_TIME
 abday   "<U0044><U006F><U006D>";"<U0053><U0065><U0067>";/
-        "<U0054><U0065><U0072>";"<U0051><U0075><U0061>";/
-        "<U0051><U0075><U0069>";"<U0053><U0065><U0078>";/
-        "<U0053><U00E1><U0062>"
+	"<U0054><U0065><U0072>";"<U0051><U0075><U0061>";/
+	"<U0051><U0075><U0069>";"<U0053><U0065><U0078>";/
+	"<U0053><U00E1><U0062>"
 day     "<U0064><U006F><U006D><U0069><U006E><U0067><U006F>";/
-        "<U0073><U0065><U0067><U0075><U006E><U0064><U0061>";/
-        "<U0074><U0065><U0072><U00E7><U0061>";/
-        "<U0071><U0075><U0061><U0072><U0074><U0061>";/
-        "<U0071><U0075><U0069><U006E><U0074><U0061>";/
-        "<U0073><U0065><U0078><U0074><U0061>";/
-        "<U0073><U00E1><U0062><U0061><U0064><U006F>"
+	"<U0073><U0065><U0067><U0075><U006E><U0064><U0061>";/
+	"<U0074><U0065><U0072><U00E7><U0061>";/
+	"<U0071><U0075><U0061><U0072><U0074><U0061>";/
+	"<U0071><U0075><U0069><U006E><U0074><U0061>";/
+	"<U0073><U0065><U0078><U0074><U0061>";/
+	"<U0073><U00E1><U0062><U0061><U0064><U006F>"
 abmon   "<U004A><U0061><U006E>";"<U0046><U0065><U0076>";/
-        "<U004D><U0061><U0072>";"<U0041><U0062><U0072>";/
-        "<U004D><U0061><U0069>";"<U004A><U0075><U006E>";/
-        "<U004A><U0075><U006C>";"<U0041><U0067><U006F>";/
-        "<U0053><U0065><U0074>";"<U004F><U0075><U0074>";/
-        "<U004E><U006F><U0076>";"<U0044><U0065><U007A>"
+	"<U004D><U0061><U0072>";"<U0041><U0062><U0072>";/
+	"<U004D><U0061><U0069>";"<U004A><U0075><U006E>";/
+	"<U004A><U0075><U006C>";"<U0041><U0067><U006F>";/
+	"<U0053><U0065><U0074>";"<U004F><U0075><U0074>";/
+	"<U004E><U006F><U0076>";"<U0044><U0065><U007A>"
 mon     "<U006A><U0061><U006E><U0065><U0069><U0072><U006F>";/
-        "<U0066><U0065><U0076><U0065><U0072><U0065><U0069><U0072><U006F>";/
-        "<U006D><U0061><U0072><U00E7><U006F>";/
-        "<U0061><U0062><U0072><U0069><U006C>";/
-        "<U006D><U0061><U0069><U006F>";/
-        "<U006A><U0075><U006E><U0068><U006F>";/
-        "<U006A><U0075><U006C><U0068><U006F>";/
-        "<U0061><U0067><U006F><U0073><U0074><U006F>";/
-        "<U0073><U0065><U0074><U0065><U006D><U0062><U0072><U006F>";/
-        "<U006F><U0075><U0074><U0075><U0062><U0072><U006F>";/
-        "<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U006F>";/
-        "<U0064><U0065><U007A><U0065><U006D><U0062><U0072><U006F>"
+	"<U0066><U0065><U0076><U0065><U0072><U0065><U0069><U0072><U006F>";/
+	"<U006D><U0061><U0072><U00E7><U006F>";/
+	"<U0061><U0062><U0072><U0069><U006C>";/
+	"<U006D><U0061><U0069><U006F>";/
+	"<U006A><U0075><U006E><U0068><U006F>";/
+	"<U006A><U0075><U006C><U0068><U006F>";/
+	"<U0061><U0067><U006F><U0073><U0074><U006F>";/
+	"<U0073><U0065><U0074><U0065><U006D><U0062><U0072><U006F>";/
+	"<U006F><U0075><U0074><U0075><U0062><U0072><U006F>";/
+	"<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U006F>";/
+	"<U0064><U0065><U007A><U0065><U006D><U0062><U0072><U006F>"
 d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt   "<U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0059>"
 t_fmt   "<U0025><U0054>"