Update.

2003-12-04  Steven Munroe  <sjmunroe@us.ibm.com>

	* sysdeps/powerpc/fpu/fgetexcptflg.c (__fegetexceptflag): Add masking
	of fenv.
	* sysdeps/powerpc/nofpu/fgetexcptflg.c (__fegetexceptflag): Likewise.

62 files changed, 342 insertions, 379 deletions

diff --git a/ChangeLog b/ChangeLog
index 1bf1d01fd4..db3ab6d55e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-04  Steven Munroe  <sjmunroe@us.ibm.com>
+
+	* sysdeps/powerpc/fpu/fgetexcptflg.c (__fegetexceptflag): Add masking
+	of fenv.
+	* sysdeps/powerpc/nofpu/fgetexcptflg.c (__fegetexceptflag): Likewise.
+
 2003-12-05  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* sysdeps/s390/s390-32/elf/setjmp.S (setjmp, __setjmp): Add END
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 62c79ff139..08079a3f67 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,68 @@
+2003-12-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* SUPPORTED: Add az_ZA.UTF-8, bn_BD, bn_IN, br_FR@euro, tt_RU, zh_SG.
+
+	* locales/aa_DJ: Add int_select.  Use copy where possible.
+	* locales/am_ET: Likewise.
+	* locales/ar_BH: Likewise.
+	* locales/ar_DZ: Likewise.
+	* locales/ar_EG: Likewise.
+	* locales/ar_IN: Likewise.
+	* locales/az_AZ: Likewise.
+	* locales/be_BY: Likewise.
+	* locales/bn_BD: Likewise.
+	* locales/bn_IN: Likewise.
+	* locales/br_FR: Likewise.
+	* locales/bs_BA: Likewise.
+	* locales/da_DK: Likewise.
+	* locales/de_AT: Likewise.
+	* locales/de_BE: Likewise.
+	* locales/el_GR: Likewise.
+	* locales/en_AU: Likewise.
+	* locales/en_BW: Likewise.
+	* locales/en_CA: Likewise.
+	* locales/en_DK: Likewise.
+	* locales/en_IN: Likewise.
+	* locales/es_AR: Likewise.
+	* locales/es_BO: Likewise.
+	* locales/es_CL: Likewise.
+	* locales/es_CO: Likewise.
+	* locales/es_CR: Likewise.
+	* locales/es_DO: Likewise.
+	* locales/es_EC: Likewise.
+	* locales/es_GT: Likewise.
+	* locales/es_HN: Likewise.
+	* locales/es_SV: Likewise.
+	* locales/et_EE: Likewise.
+	* locales/fi_FI: Likewise.
+	* locales/fr_BE: Likewise.
+	* locales/fr_CA: Likewise.
+	* locales/fr_FR: Likewise.
+	* locales/gu_IN: Likewise.
+	* locales/hi_IN: Likewise.
+	* locales/hr_HR: Likewise.
+	* locales/hu_HU: Likewise.
+	* locales/is_IS: Likewise.
+	* locales/ka_GE: Likewise.
+	* locales/kn_IN: Likewise.
+	* locales/ml_IN: Likewise.
+	* locales/mr_IN: Likewise.
+	* locales/nl_BE: Likewise.
+	* locales/pa_IN: Likewise.
+	* locales/pt_BR: Likewise.
+	* locales/ru_RU: Likewise.
+	* locales/sq_AL: Likewise.
+	* locales/ta_IN: Likewise.
+	* locales/te_IN: Likewise.
+	* locales/ti_ER: Likewise.
+	* locales/ti_ET: Likewise.
+	* locales/zh_HK: Likewise.
+
+	* locales/hy_AM: Fix some syntax errors and formatting mistakes.
+
+	* locales/tt_RU: Use copy in a few places.  Add dummy LC_NAME,
+	LC_ADDRESS, and LC_TELEPHONE definitions.
+
 2003-11-30  Petter Reinholdtsen  <pere@hungry.com>
 
 	* tst-fmon.sh: Allow quotes around the result string, to make it
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 0b8c6d720f..3ec589d3bf 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -27,9 +27,13 @@ ar_SD/ISO-8859-6 \
 ar_SY/ISO-8859-6 \
 ar_TN/ISO-8859-6 \
 ar_YE/ISO-8859-6 \
+az_AZ.UTF-8/UTF-8 \
 be_BY/CP1251 \
 bg_BG/CP1251 \
+bn_BD/UTF-8 \
+bn_IN/UTF-8 \
 br_FR/ISO-8859-1 \
+br_FR@euro/ISO-8859-15 \
 bs_BA/ISO-8859-2 \
 byn_ER/UTF-8 \
 ca_ES/ISO-8859-1 \
@@ -180,6 +184,7 @@ ti_ET/UTF-8 \
 tig_ER/UTF-8 \
 tl_PH/ISO-8859-1 \
 tr_TR/ISO-8859-9 \
+tt_RU.UTF-8/UTF-8 \
 uk_UA/KOI8-U \
 ur_PK/UTF-8 \
 uz_UZ/ISO-8859-1 \
@@ -194,6 +199,8 @@ zh_CN/GB2312 \
 zh_CN.GB18030/GB18030 \
 zh_CN.GBK/GBK \
 zh_HK/BIG5-HKSCS \
+zh_SG/GB2312 \
+zh_SG.GBK/GBK \
 zh_TW/BIG5 \
 zh_TW.EUC-TW/EUC-TW \
 zu_ZA/ISO-8859-1 \
diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index 64d14fe411..5d61e4d27c 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -130,7 +130,7 @@ tel_dom_fmt    "<U0025><U0061><U002D><U0025><U006C>"
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0032><U0035><U0033>"
-% int_select   unknown
+int_select     "<U0030><U0030>"
 %
 END LC_TELEPHONE
 
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index 8ac04555a5..a313d3f928 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -1401,65 +1401,27 @@ END LC_CTYPE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-%
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT category.
-%
-measurement 1
-%
+copy "ti_ET"
 END LC_MEASUREMENT
 
 
 LC_MONETARY
-%
-int_curr_symbol       "<U0045><U0054><U0042><U0020>"
-currency_symbol       "<U0024>"
-mon_decimal_point     "<U002E>"
-mon_thousands_sep     "<U002C>"
-mon_grouping          3;3
-positive_sign         ""
-negative_sign         "<U002D>"
-int_frac_digits       2
-frac_digits           2
-p_cs_precedes         1
-p_sep_by_space        0
-n_cs_precedes         1
-n_sep_by_space        0
-p_sign_posn           1
-n_sign_posn           1
-%
+copy "ti_ET"
 END LC_MONETARY
 
 
 LC_NUMERIC
-%
-% This is the POSIX Locale definition for the LC_NUMERIC category.
-%
-decimal_point          "<U002E>"
-thousands_sep          "<U002C>"
-grouping               3;3
-%
+copy "ti_ET"
 END LC_NUMERIC
 
 
 LC_PAPER
-%
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category.
-%
-height      297
-width       210
-%
+copy "ti_ET"
 END LC_PAPER
 
 
 LC_TELEPHONE
-%
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE category.
-%
-tel_dom_fmt    "<U0025><U0061><U002D><U0025><U006C>"
-tel_int_fmt    "<U0025><U0063><U002D><U0025><U0061><U002D><U0025><U006C>"
-int_prefix     "<U0032><U0035><U0031>"
-% int_select   unknown
-%
+copy "ti_ET"
 END LC_TELEPHONE
 
 
diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH
index e4a85f05b8..4ef1d25464 100644
--- a/localedata/locales/ar_BH
+++ b/localedata/locales/ar_BH
@@ -202,6 +202,7 @@ LC_TELEPHONE
 tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
 <U003B><U0025><U006C>"
 int_prefix  "<U0039><U0037><U0033>"
+int_select  "<U0030>"
 
 END LC_TELEPHONE
 
diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ
index 56e2ccd80a..755ed1c3bf 100644
--- a/localedata/locales/ar_DZ
+++ b/localedata/locales/ar_DZ
@@ -201,6 +201,7 @@ LC_TELEPHONE
 tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
 <U003B><U0025><U006C>"
 int_prefix  "<U0032><U0031><U0033>"
+int_select  "<U0030><U0030>"
 
 END LC_TELEPHONE
 
diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG
index 64359397af..39d55e65fb 100644
--- a/localedata/locales/ar_EG
+++ b/localedata/locales/ar_EG
@@ -201,7 +201,7 @@ LC_TELEPHONE
 tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
 <U003B><U0025><U006C>"
 int_prefix  "<U0032><U0030>"
-
+int_select  "<U0030><U0030>"
 END LC_TELEPHONE
 
 
diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN
index c17f4d5362..f1cbb37904 100644
--- a/localedata/locales/ar_IN
+++ b/localedata/locales/ar_IN
@@ -48,7 +48,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
@@ -71,19 +71,14 @@ END LC_MONETARY
 
 
 LC_NUMERIC
-% This is the POSIX Locale definition for the LC_NUMERIC  category.
-%
-decimal_point          "<U002E>"
-thousands_sep          "<U002C>"
-grouping               3;2
-%
+copy "hi_IN"
 END LC_NUMERIC
 
 
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale definition file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -114,22 +109,22 @@ mon         "<U064A><U0646><U0627><U064A><U0631>";"<U0641><U0628><U0631><U0627><
             "<U0633><U0628><U062A><U0645><U0628><U0631>";"<U0623><U0643><U062A><U0648><U0628><U0631>";/
             "<U0646><U0648><U0641><U0645><U0628><U0631>";"<U062F><U064A><U0633><U0645><U0628><U0631>"
 %
-% Equivalent of AM PM 
+% Equivalent of AM PM
 am_pm       "<U0635>";"<U0645>"
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %A %d %B %Y %I:%M:%S  %Z
 d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %A %d %B %Y
 d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %I:%M:%S  %Z
 t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
 END LC_TIME
@@ -144,14 +139,14 @@ LC_MESSAGES
 % ^[\u0646]
 yesexpr     "<U005E><U005B><U0646><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % yesexpr     "<U005E><U005B><U005C><U0075><U0030><U0036><U0034><U0036><U005D>"
 
 %
 % ^[\u0644]
 noexpr      "<U005E><U005B><U0644><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % noexpr      "<U005E><U005B><U005C><U0075><U0030><U0036><U0034><U0034><U005D>"
 %
 
@@ -165,19 +160,15 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
 name_gen    ""
 name_mr     "<U004D><U0072><U002E>"
@@ -200,18 +191,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
-% generated by IBM Basic CountryPack Transformer.
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
-% category generated by IBM Basic CountryPack Transformer.
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
-
-
diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
index 66667aaf84..231ab49166 100644
--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@@ -279,7 +279,21 @@ measurement 1
 END LC_MEASUREMENT
 
 LC_ADDRESS
+% FIXME
+postal_fmt "???"
 country_ab2 "<U0041><U005A>"
 country_ab3 "<U0041><U005A><U0045>"
 country_num 031
 END LC_ADDRESS
+
+LC_TELEPHONE
+% FIXME
+tel_int_fmt "???"
+int_prefix "<U0039><U0039><U0034>"
+int_select "<U0038><U007E><U0031><U0030>"
+END LC_TELEPHONE
+
+LC_NAME
+% FIXME
+name_fmt "???"
+END LC_NAME
diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY
index 316d20b4fb..890c997425 100644
--- a/localedata/locales/be_BY
+++ b/localedata/locales/be_BY
@@ -154,6 +154,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0037><U0035>"
+int_select     "<U0038><U007E><U0031><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index fac7f7d1c4..dda9c43313 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -44,6 +44,7 @@ LC_MONETARY
 %this is the rupee sign
 currency_symbol      "<U09F3>"
 %currency_symbol      "<U099F><U09BE><U0995><U09BE>"
+int_curr_symbol      "<U0042><U0044><U0054><U0020>"
 mon_decimal_point    "<U002E>"
 mon_thousands_sep    "<U002C>"
 mon_grouping         3;3
diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
index b1d0e8892f..c09fd5025a 100644
--- a/localedata/locales/bn_IN
+++ b/localedata/locales/bn_IN
@@ -34,7 +34,7 @@ END LC_IDENTIFICATION
 LC_CTYPE
 % This is the POSIX Locale difinition for LC_CTYPE category
 % generated by IBM Basic CountryPack Transformer.
-% 
+%
 copy "i18n"
 END LC_CTYPE
 
@@ -50,7 +50,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
@@ -85,7 +85,7 @@ END LC_NUMERIC
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -126,24 +126,24 @@ mon         "<U099C><U09BE><U09A8><U09C1><U09DF><U09BE><U09B0><U09C0>";/
             "<U09A1><U09BF><U09B8><U09C7><U09AE><U09CD><U09AC><U09B0>"
 
 %
-% Equivalent of AM PM 
+% Equivalent of AM PM
 am_pm       "<U09AA><U09C2><U09B0><U09CD><U09AC><U09BE><U09B9><U09CD><U09A3>";/
             "<U0985><U09AA><U09B0><U09BE><U09B9><U09CD><U09A3>"
 
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %A %d %b %Y %I:%M:%S  %Z
 d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %A %d %b %Y
 d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %I:%M:%S  %Z
 t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
 END LC_TIME
@@ -158,14 +158,14 @@ LC_MESSAGES
 % ^[\u0939\u093e\u0901]
 yesexpr     "<U005E><U005B><U09B9><U09CD><U09AF><U09BE><U0981><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % yesexpr     "<U005E><U005B><U005C><U0075><U0030><U0039><U0033><U0039><U005C><U0075><U0030><U0039><U0033><U0065><U005C><U0075><U0030><U0039><U0030><U0031><U005D>"
 
 %
 % ^[\u0928\u0939\u0940\u0902]
 noexpr      "<U005E><U005B><U09A8><U09BE><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % noexpr      "<U005E><U005B><U005C><U0075><U0030><U0039><U0032><U0038><U005C><U0075><U0030><U0039><U0033><U0039><U005C><U0075><U0030><U0039><U0034><U0030><U005C><U0075><U0030><U0039><U0030><U0032><U005D>"
 %
 
@@ -179,19 +179,15 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
 name_gen    ""
 name_mr     "<U09B6><U09CD><U09B0><U09C0>"
@@ -214,18 +210,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
-% generated by IBM Basic CountryPack Transformer.
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
-% category generated by IBM Basic CountryPack Transformer.
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
-
-
diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
index a9afbc0af8..0db7b73c93 100644
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@@ -98,27 +98,11 @@ noexpr  "<U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<U0045><U0055><U0052><U0020>"
-currency_symbol           "<U20AC>"
-mon_decimal_point         "<U002C>"
-mon_thousands_sep         "<U0020>"
-mon_grouping              3;3
-positive_sign             ""
-negative_sign             "<U002D>"
-int_frac_digits           2
-frac_digits               2
-p_cs_precedes             0
-p_sep_by_space            1
-n_cs_precedes             0
-n_sep_by_space            1
-p_sign_posn               1
-n_sign_posn               1
+copy "fr_FR"
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point             "<U002C>"
-thousands_sep             ""
-grouping                  0;0
+copy "fr_FR"
 END LC_NUMERIC
 
 LC_TIME
@@ -160,8 +144,7 @@ t_fmt_ampm "<U0025><U0049><U0065><U0025><U004D><U003A><U0025><U0053><U0020><U002
 END LC_TIME
 
 LC_PAPER
-height      297
-width       210
+copy "fr_FR"
 END LC_PAPER
 
 LC_MEASUREMENT
@@ -179,6 +162,5 @@ copy "fr_FR"
 END LC_ADDRESS
 
 LC_TELEPHONE
-% FIXME
 copy "fr_FR"
 END LC_TELEPHONE
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index 237cfc4797..92cb2f9ab8 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -235,5 +235,7 @@ END LC_ADDRESS
 
 LC_TELEPHONE
 % FIXME
-copy "en_DK"
+tel_int_fmt "???"
+int_prefix "<U0033><U0038><U0037>"
+int_select "<U0030><U0030>"
 END LC_TELEPHONE
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index 3632fdb296..0c0f2cbc12 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -2230,6 +2230,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0034><U0035>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index 91bb62799c..cd36633471 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -133,6 +133,7 @@ tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 tel_dom_fmt    "<U0025><U0061><U0020><U0025><U006C>"
 int_prefix     "<U0034><U0033>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 8b9822b291..3b07145064 100644
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -122,21 +122,15 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+copy "fr_BE"
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
-int_prefix     "<U0033><U0032>"
+copy "fr_BE"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+copy "fr_BE"
 END LC_MEASUREMENT
 
 LC_NAME
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index 68bfeace11..c9de0f82cf 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -133,6 +133,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0030>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index b7398afc5f..361213e3b1 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0036><U0031>"
+int_select     "<U0030><U0030><U0031><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
index 5d573ed302..0833fcf0a9 100644
--- a/localedata/locales/en_BW
+++ b/localedata/locales/en_BW
@@ -92,6 +92,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0032><U0036><U0037>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index b77e5460ac..115cd4c4aa 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -2195,6 +2195,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0031>"
+int_select     "<U0030><U0031><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index 16590f716c..59f28dec56 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -130,21 +130,15 @@ noexpr   "<U005E><U005B><U0030><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+copy "da_DK"
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
-int_prefix     "<U0034><U0035>"
+copy "da_DK"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+copy "da_DK"
 END LC_MEASUREMENT
 
 LC_NAME
diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN
index c13cadece5..b600421d05 100644
--- a/localedata/locales/en_IN
+++ b/localedata/locales/en_IN
@@ -48,7 +48,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
@@ -83,7 +83,7 @@ END LC_NUMERIC
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -114,22 +114,22 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";"<U0046><U0065><
             "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";"<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
             "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";"<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
 %
-% Equivalent of AM PM 
+% Equivalent of AM PM
 am_pm       "<U0041><U004D>";"<U0050><U004D>"
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %A %d %B %Y %I:%M:%S  %Z
 d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %A %d %B %Y
 d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %I:%M:%S  %Z
 t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
 END LC_TIME
@@ -144,14 +144,14 @@ LC_MESSAGES
 % ^[yY]
 yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 
 %
 % ^[nN]
 noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 %
 
@@ -165,19 +165,15 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0067><U0025><U0074><U0025><U006D><U0025><U0074><U0025><U0066>"
 name_gen    ""
 name_mr     "<U004D><U0072><U002E>"
@@ -199,16 +195,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
-% generated by IBM Basic CountryPack Transformer.
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
-% category generated by IBM Basic CountryPack Transformer.
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index 0657ac9ff6..0b2fef3c47 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0034>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index db76874270..491c22c6be 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0039><U0031>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index 8f44d53347..d4074f3dfd 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0036>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index 48f338bd64..65ceed299e 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0037>"
+int_select     "<U0030><U0030><U0039>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index c6fc7d9a58..20ad5eb93f 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -126,6 +126,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0030><U0036>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index a4dca8554c..8bea9d6e94 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0031><U0038><U0030><U0039>"
+int_select     "<U0030><U0031><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index 62b80870d1..a50496b3cb 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0039><U0033>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index 7a1c23adf5..fc1b2f2e8d 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0030><U0032>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index d8ac4fa3a7..1ff4c209a8 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0030><U0034>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index 37cec9c4c9..0882d87907 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -135,6 +135,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0030><U0033>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index a4e8d28d0e..bad562e818 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -2210,6 +2210,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0037><U0032>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index 754407aaad..52eac2f9ff 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -2209,6 +2209,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0035><U0038>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index 44d76720f4..549a640d53 100644
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -133,6 +133,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0032>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 77c6810860..4ef23f4089 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -124,19 +124,15 @@ date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-height   279
-width    216
+copy "en_CA"
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
-int_prefix     "<U0031>"
+copy "en_CA"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+copy "en_CA"
 END LC_MEASUREMENT
 
 LC_NAME
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index b592a1bf7a..70e008fdbf 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -141,6 +141,7 @@ tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 tel_dom_fmt    "<U0025><U0061><U0020><U0025><U006C>"
 int_prefix     "<U0033><U0033>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
index 8e61121abd..0e0dc65e57 100644
--- a/localedata/locales/gu_IN
+++ b/localedata/locales/gu_IN
@@ -49,7 +49,7 @@ LC_MONETARY
 % for IBM Class for Unicode/Java
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
-currency_symbol       "<U0AB0><U0AC1>"   
+currency_symbol       "<U0AB0><U0AC1>"
 mon_decimal_point     "<U002E>"
 mon_thousands_sep     "<U002C>"
 mon_grouping          3
@@ -68,12 +68,7 @@ END LC_MONETARY
 
 
 LC_NUMERIC
-% This is the POSIX Locale definition for the LC_NUMERIC  category.
-%
-decimal_point          "<U002E>"
-thousands_sep          "<U002C>"
-grouping               3
-%
+copy "hi_IN"
 END LC_NUMERIC
 
 LC_TIME
@@ -171,11 +166,7 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the
-% LC_PAPER category
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
@@ -208,18 +199,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the
-%
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
-<U003B><U0025><U006C>"
-int_prefix     "<U0039><U0031>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN
index e3fdd3ead1..e7b762c69b 100644
--- a/localedata/locales/hi_IN
+++ b/localedata/locales/hi_IN
@@ -162,8 +162,8 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the
-% LC_PAPER category
+% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
+% generated by IBM Basic CountryPack Transformer.
 height      297
 width       210
 
@@ -198,18 +198,16 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the
-%
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
-<U003B><U0025><U006C>"
-int_prefix     "<U0039><U0031>"
-
+% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
+% generated by IBM Basic CountryPack Transformer.
+tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>"
+int_prefix "<U0039><U0031>"
+int_select "<U0030><U0030>"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
+% category generated by IBM Basic CountryPack Transformer.
 measurement 1
-
 END LC_MEASUREMENT
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index 8d1f073b6c..a09fe38db1 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -2221,6 +2221,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0038><U0035>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index ae8aacd40a..29b5ff7322 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -504,6 +504,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0036>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM
index 04edbdba95..42c24f9cb7 100644
--- a/localedata/locales/hy_AM
+++ b/localedata/locales/hy_AM
@@ -70,10 +70,50 @@ LC_COLLATE
 
 % Armenian sorting is not yet on iso14651_t1
 
-copy "iso14651_t1"
-
 script <ARMENIAN>
 
+collating-symbol <ARM-AYB>
+collating-symbol <ARM-BEN>
+collating-symbol <ARM-GIM>
+collating-symbol <ARM-DA>
+collating-symbol <ARM-YECH>
+collating-symbol <ARM-ZA>
+collating-symbol <ARM-E>
+collating-symbol <ARM-AT>
+collating-symbol <ARM-TO>
+collating-symbol <ARM-ZHE>
+collating-symbol <ARM-INI>
+collating-symbol <ARM-LYUN>
+collating-symbol <ARM-KHE>
+collating-symbol <ARM-TSA>
+collating-symbol <ARM-KEN>
+collating-symbol <ARM-HO>
+collating-symbol <ARM-DZA>
+collating-symbol <ARM-GHAT>
+collating-symbol <ARM-TCHE>
+collating-symbol <ARM-MEN>
+collating-symbol <ARM-HI>
+collating-symbol <ARM-NU>
+collating-symbol <ARM-SHA>
+collating-symbol <ARM-VO>
+collating-symbol <ARM-CHA>
+collating-symbol <ARM-PE>
+collating-symbol <ARM-JE>
+collating-symbol <ARM-RA>
+collating-symbol <ARM-SE>
+collating-symbol <ARM-VEV>
+collating-symbol <ARM-TYUN>
+collating-symbol <ARM-RE>
+collating-symbol <ARM-TSO>
+collating-symbol <ARM-VYUN>
+collating-symbol <ARM-PYUR>
+collating-symbol <ARM-KE>
+collating-symbol <ARM-O>
+collating-symbol <ARM-FE>
+
+
+copy "iso14651_t1"
+
 order_start <ARMENIAN>;forward;forward;forward;forward,position
 <U0561> <ARM-AYB>;<BAS>;<MIN>;IGNORE
 <U0562> <ARM-BEN>;<BAS>;<MIN>;IGNORE
@@ -151,7 +191,7 @@ order_start <ARMENIAN>;forward;forward;forward;forward,position
 <U0554> <ARM-KE>;<BAS>;<CAP>;IGNORE
 <U0555> <ARM-O>;<BAS>;<CAP>;IGNORE
 <U0556> <ARM-FE>;<BAS>;<CAP>;IGNORE
-order-end
+order_end
 
 reorder-sections-after <CYRIL>
 <ARMENIAN>
@@ -255,8 +295,8 @@ END LC_PAPER
 LC_TELEPHONE
 tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025><U006C>"
 % FIXME Find tel_dom_fmt
-int_select "00"
-int_prefix "374"
+int_select "<U0030><U0030>"
+int_prefix "<U0033><U0037><U0034>"
 END LC_TELEPHONE
 
 LC_ADDRESS
@@ -265,13 +305,18 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 % FIXME country_name "Armenia" in Armenian
 % FIXME country_post for Armenia?
-country_ab2 "AM"
-country_ab3 "ARM"
+country_ab2 "<U0041><U004D>"
+country_ab3 "<U0041><U0052><U004D>"
 country_num 51
 % FIXME country_car  for Armenia ?
-country_isbn "99930"
+country_isbn "<U0039><U0039><U0039><U0033><U0030>"
 % FIXME lang_name Armenian in Armenian
-lang_ab "hy"
-lang_term "hye"
-lang_lib "arm"
+lang_ab "<U0068><U0079>"
+lang_term "<U0068><U0079><U0065>"
+lang_lib "<U0061><U0072><U006D>"
 END LC_ADDRESS
+
+LC_NAME
+% FIXME
+name_fmt "???"
+END LC_NAME
diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index f712a9bd89..687ff6b49d 100644
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -2240,6 +2240,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0033><U0035><U0034>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/ka_GE b/localedata/locales/ka_GE
index 7f49e02310..e01019f0e6 100644
--- a/localedata/locales/ka_GE
+++ b/localedata/locales/ka_GE
@@ -155,8 +155,8 @@ END LC_PAPER
 LC_TELEPHONE
 tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025><U006C>"
 % FIXME Find tel_dom_fmt
-int_select "8~10"
-int_prefix "995"
+int_select "<U0038><U007E><U0031><U0030>"
+int_prefix "<U0039><U0039><U0035>"
 END LC_TELEPHONE
 
 LC_NAME
diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN
index 09b5d9f06f..40845556fe 100644
--- a/localedata/locales/kn_IN
+++ b/localedata/locales/kn_IN
@@ -51,7 +51,7 @@ LC_MONETARY
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
 % *** Change this to reflect Kannada , in Dev it is RA with VS U attached
-currency_symbol       "<U0CB0><U0CC2>"     
+currency_symbol       "<U0CB0><U0CC2>"
 mon_decimal_point     "<U002E>"
 mon_thousands_sep     "<U002C>"
 mon_grouping          3
@@ -70,12 +70,7 @@ END LC_MONETARY
 
 
 LC_NUMERIC
-% This is the POSIX Locale definition for the LC_NUMERIC  category.
-%
-decimal_point          "<U002E>"
-thousands_sep          "<U002C>"
-grouping               3
-%
+copy "hi_IN"
 END LC_NUMERIC
 
 
@@ -103,8 +98,8 @@ day      "<U0CB0><U0CB5><U0CBF><U0CB5><U0CBE><U0CB0>";/
             "<U0CAC><U0CC1><U0CA7><U0CB5><U0CBE><U0CB0>";/
             "<U0C97><U0CC1><U0CB0><U0CC1><U0CB5><U0CBE><U0CB0>";/
             "<U0CB6><U0CC1><U0C95><U0CCD><U0CB0><U0CB5><U0CBE><U0CB0>";/
-            "<U0CB6><U0CA8><U0CBF><U0CB5><U0CBE><U0CB0>"   
-            
+            "<U0CB6><U0CA8><U0CBF><U0CB5><U0CBE><U0CB0>"
+
 %
 % Abbreviated month names (%b)
 abmon       	"<U0C9C>";/
@@ -176,11 +171,7 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the
-% LC_PAPER category
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
@@ -212,18 +203,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the
-%
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
-<U003B><U0025><U006C>"
-int_prefix     "<U0039><U0031>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN
index e433989e0d..91f83ef7f8 100644
--- a/localedata/locales/ml_IN
+++ b/localedata/locales/ml_IN
@@ -47,7 +47,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol     "<U0049><U004E><U0052><U0020>"
@@ -80,7 +80,7 @@ END LC_NUMERIC
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -127,22 +127,22 @@ mon     "<U0D1C><U0D28><U0D41><U0D35><U0D30><U0D3F>";/
 "<U0D21><U0D3F><U0D38><U0D02><U0D2C><U0D31><U0D41><U0D4D>"
 %
 %
-% Equivalent of AM PM 
+% Equivalent of AM PM
 am_pm     "<U0D30><U0D3E><U0D35><U0D3F><U0D32><U0D46>";"<U0D35><U0D48><U0D15><U0D41>"
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %A %d %B %Y %I:%M:%S  %Z
 d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %A %d %B %Y
 d_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %I:%M:%S  %Z
 t_fmt     "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm     "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
 END LC_TIME
@@ -169,17 +169,14 @@ nostr     "<U0D05><U0D32><U0D4D><U0D32>"
 END LC_MESSAGES
 %
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
+copy "hi_IN"
 END LC_PAPER
 %
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt     "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
 name_gen     "<U0D36><U0D4D><U0D30><U0D40>"
 name_mr      "<U0D36><U0D4D><U0D30><U0D40><U0D2E><U0D3E><U0D28><U0D41><U0D4D>"
@@ -197,14 +194,10 @@ country_num 356
 END LC_ADDRESS
 %
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
-% generated by IBM Basic CountryPack Transformer.
-tel_int_fmt     "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>"
+copy "hi_IN"
 END LC_TELEPHONE
 %
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
-% category generated by IBM Basic CountryPack Transformer.
-measurement 1
+copy "hi_IN"
 END LC_MEASUREMENT
-%
\ No newline at end of file
+%
diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
index 76556e809e..24238caa58 100644
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@@ -68,15 +68,7 @@ END LC_MONETARY
 
 
 LC_NUMERIC
-% This is the POSIX Locale definition for the LC_NUMERIC category
-% generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file
-% for IBM Class for Unicode.
-%
-decimal_point          "<U002E>"
-thousands_sep          "<U002C>"
-grouping               3
-%
+copy "hi_IN"
 END LC_NUMERIC
 
 
@@ -178,11 +170,7 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
@@ -215,18 +203,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
-% generated by IBM Basic CountryPack Transformer.
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
-<U003B><U0025><U006C>"
-int_prefix  "<U0039><U0031>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
-% category generated by IBM Basic CountryPack Transformer.
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index 6df18d4583..aad9a20844 100644
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -107,21 +107,15 @@ date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
+copy "fr_BE"
 END LC_PAPER
 
 LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
-int_prefix     "<U0033><U0032>"
+copy "fr_BE"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+copy "fr_BE"
 END LC_MEASUREMENT
 
 LC_NAME
diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
index afa237a5e2..3e7bd2b9bb 100644
--- a/localedata/locales/pa_IN
+++ b/localedata/locales/pa_IN
@@ -45,7 +45,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category.
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
-currency_symbol       "<U0A30><U0A42><U0A2A><U0A72><U0A48>"     
+currency_symbol       "<U0A30><U0A42><U0A2A><U0A72><U0A48>"
 mon_decimal_point     "<U002E>"
 mon_thousands_sep     "<U002C>"
 mon_grouping          3
@@ -64,12 +64,7 @@ END LC_MONETARY
 
 
 LC_NUMERIC
-% This is the POSIX Locale definition for the LC_NUMERIC  category.
-%
-decimal_point          "<U002E>"
-thousands_sep          "<U002C>"
-grouping               3
-%
+copy "hi_IN"
 END LC_NUMERIC
 
 
@@ -164,11 +159,7 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the
-% LC_PAPER category
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
@@ -200,18 +191,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the
-%
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
-<U003B><U0025><U006C>"
-int_prefix     "<U0039><U0031>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index bdf066f547..50c69cb82c 100644
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -134,6 +134,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0035><U0035>"
+int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 60aa018893..fdb3427070 100644
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -158,6 +158,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0037>"
+int_select     "<U0030><U007E><U0031><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
diff --git a/localedata/locales/sq_AL b/localedata/locales/sq_AL
index 8d1857ae17..e0c7485e7e 100644
--- a/localedata/locales/sq_AL
+++ b/localedata/locales/sq_AL
@@ -196,6 +196,7 @@ LC_TELEPHONE
 tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
 <U003B><U0025><U006C>"
 int_prefix     "<U0033><U0035><U0035>"
+int_select     "<U0030><U0030>"
 
 END LC_TELEPHONE
 
diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
index 6676d74314..c7ca06dc54 100644
--- a/localedata/locales/ta_IN
+++ b/localedata/locales/ta_IN
@@ -46,7 +46,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
@@ -81,7 +81,7 @@ END LC_NUMERIC
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -112,22 +112,22 @@ mon         "<U0B9C><U0BA9><U0BB5><U0BB0><U0BBF>";"<U0BAA><U0BC6><U0BAA><U0BCD><
             "<U0B9A><U0BC6><U0BAA><U0BCD><U0B9F><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B85><U0B95><U0BCD><U0B9F><U0BCB><U0BAA><U0BB0><U0BCD>";/
             "<U0BA8><U0BB5><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B9F><U0BBF><U0B9A><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD><U0072>"
 %
-% Equivalent of AM PM 
+% Equivalent of AM PM
 am_pm       "<U0B95><U0BBE><U0BB2><U0BC8>";"<U0BAE><U0BBE><U0BB2><U0BC8>"
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %A %d %B %Y %I:%M:%S  %Z
 d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %A %d %B %Y
 d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %I:%M:%S  %Z
 t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
 END LC_TIME
@@ -142,14 +142,14 @@ LC_MESSAGES
 % ^[\u0b86\u0bae\u0bcd]
 yesexpr     "<U005E><U005B><U0B86><U0BAE><U0BCD><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % yesexpr     "<U005E><U005B><U005C><U0075><U0030><U0062><U0038><U0036><U005C><U0075><U0030><U0062><U0061><U0065><U005C><U0075><U0030><U0062><U0063><U0064><U005D>"
 
 %
 % ^[\u0b87\u0bb2\u0bcd\u0bb2\u0bc8]
 noexpr      "<U005E><U005B><U0B87><U0BB2><U0BCD><U0BB2><U0BC8><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % noexpr      "<U005E><U005B><U005C><U0075><U0030><U0062><U0038><U0037><U005C><U0075><U0030><U0062><U0062><U0032><U005C><U0075><U0030><U0062><U0063><U0064><U005C><U0075><U0030><U0062><U0062><U0032><U005C><U0075><U0030><U0062><U0063><U0038><U005D>"
 %
 
@@ -163,19 +163,15 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
 name_gen    ""
 name_mr     "<U004D><U0072><U002E>"
@@ -198,16 +194,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
-% generated by IBM Basic CountryPack Transformer.
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
-% category generated by IBM Basic CountryPack Transformer.
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN
index 1bc952830d..a8667a02d2 100644
--- a/localedata/locales/te_IN
+++ b/localedata/locales/te_IN
@@ -46,7 +46,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
@@ -81,7 +81,7 @@ END LC_NUMERIC
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -115,21 +115,21 @@ mon         "<U0C1C><U0C28><U0C35><U0C30><U0C3F>";"<U0C2B><U0C3F><U0C2C><U0C4D><
             "<U0C28><U0C35><U0C02><U0C2C><U0C30><U0C4D>";"<U0C21><U0C3F><U0C38><U0C46><U0C02><U0C2C><U0C30><U0C4D>"
 %
 % Equivalent of AM PM
-am_pm       "<U0C2A><U0C42><U0C30><U0C4D><U0C35><U0C3E><U0C39><U0C4D><U0C28>";"<U0C05><U0C2A><U0C30><U0C3E><U0C39><U0C4D><U0C28>" 
+am_pm       "<U0C2A><U0C42><U0C30><U0C4D><U0C35><U0C3E><U0C39><U0C4D><U0C28>";"<U0C05><U0C2A><U0C30><U0C3E><U0C39><U0C4D><U0C28>"
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %A %d %b %Y %I:%M:%S  %Z
 d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %A %d %b %Y
 d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %I:%M:%S  %Z
 t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
 %
 END LC_TIME
@@ -144,14 +144,14 @@ LC_MESSAGES
 % ^[\u0939\u093e\u0901]
 yesexpr     "<U005E><U005B><U0C05><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % yesexpr     "<U005E><U005B><U005C><U0075><U0030><U0039><U0033><U0039><U005C><U0075><U0030><U0039><U0033><U0065><U005C><U0075><U0030><U0039><U0030><U0031><U005D>"
 
 %
 % ^[\u0928\u0939\u0940\u0902]
 noexpr      "<U005E><U005B><U0C15><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % noexpr      "<U005E><U005B><U005C><U0075><U0030><U0039><U0032><U0038><U005C><U0075><U0030><U0039><U0033><U0039><U005C><U0075><U0030><U0039><U0034><U0030><U005C><U0075><U0030><U0039><U0030><U0032><U005D>"
 %
 
@@ -165,19 +165,15 @@ END LC_MESSAGES
 
 
 LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height      297
-width       210
-
+copy "hi_IN"
 END LC_PAPER
 
 
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
 name_gen    ""
 name_mr     "<U004D><U0072><U002E>"
@@ -200,16 +196,10 @@ END LC_ADDRESS
 
 
 LC_TELEPHONE
-% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE
-% generated by IBM Basic CountryPack Transformer.
-tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>"
-
+copy "hi_IN"
 END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
-% category generated by IBM Basic CountryPack Transformer.
-measurement 1
-
+copy "hi_IN"
 END LC_MEASUREMENT
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index 7ff7195d2a..cc2c4ebb9e 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -128,7 +128,7 @@ tel_dom_fmt    "<U0025><U0061><U002D><U0025><U006C>"
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 int_prefix     "<U0032><U0039><U0031>"
-% int_select   unknown
+int_select     "<U0030><U0030>"
 %
 END LC_TELEPHONE
 
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index 055bcf9679..d6158b037a 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -928,7 +928,7 @@ LC_TELEPHONE
 tel_dom_fmt    "<U0025><U0061><U002D><U0025><U006C>"
 tel_int_fmt    "<U0025><U0063><U002D><U0025><U0061><U002D><U0025><U006C>"
 int_prefix     "<U0032><U0035><U0031>"
-% int_select   unknown
+int_select     "<U0030><U0030>"
 %
 END LC_TELEPHONE
 
diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU
index 6dd5aba52c..31a3de1c2b 100644
--- a/localedata/locales/tt_RU
+++ b/localedata/locales/tt_RU
@@ -245,9 +245,7 @@ n_sign_posn               1
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point             "<U002C>"
-thousands_sep             "<U002E>"
-grouping                  3;3
+copy "ru_RU"
 END LC_NUMERIC
 
 LC_TIME
@@ -298,10 +296,23 @@ t_fmt_ampm ""
 END LC_TIME
 
 LC_PAPER
-height      297
-width       210
+copy "ru_RU"
 END LC_PAPER
 
 LC_MEASUREMENT
-measurement 1
+copy "ru_RU"
 END LC_MEASUREMENT
+
+LC_NAME
+% FIXME
+name_fmt "???"
+END LC_NAME
+
+LC_ADDRESS
+% FIXME
+postal_fmt "???"
+END LC_ADDRESS
+
+LC_TELEPHONE
+copy "ru_RU"
+END LC_TELEPHONE
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index 3e97467ec8..3b45ac3d14 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -193,7 +193,7 @@ LC_TELEPHONE
 tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
 <U003B><U0025><U006C>"
 int_prefix  "<U0038><U0035><U0032>"
-
+int_select  "<U0030><U0030><U0031>"
 END LC_TELEPHONE
 
 
diff --git a/sysdeps/powerpc/fpu/fgetexcptflg.c b/sysdeps/powerpc/fpu/fgetexcptflg.c
index ddd71f9d93..a652eb8e50 100644
--- a/sysdeps/powerpc/fpu/fgetexcptflg.c
+++ b/sysdeps/powerpc/fpu/fgetexcptflg.c
@@ -29,7 +29,7 @@ __fegetexceptflag (fexcept_t *flagp, int excepts)
   u.fenv = fegetenv_register ();
 
   /* Return (all of) it.  */
-  *flagp = u.l[1];
+  *flagp = u.l[1] & excepts & FE_ALL_EXCEPT;
 
   /* Success.  */
   return 0;
diff --git a/sysdeps/powerpc/nofpu/fgetexcptflg.c b/sysdeps/powerpc/nofpu/fgetexcptflg.c
index 9d4f078d23..713bd92881 100644
--- a/sysdeps/powerpc/nofpu/fgetexcptflg.c
+++ b/sysdeps/powerpc/nofpu/fgetexcptflg.c
@@ -24,7 +24,7 @@
 
 __fegetexceptflag (fexcept_t *flagp, int excepts)
 {
-  *flagp = (fexcept_t) __sim_exceptions;
+  *flagp = (fexcept_t) __sim_exceptions  & excepts & FE_ALL_EXCEPT;
 
   return 0;
 }