[BZ #804]

	* malloc/tst-mtrace.sh: Work around for bootstraping.

5 files changed, 176 insertions, 92 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c0c427408..19a63525c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-14  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #804]
+	* malloc/tst-mtrace.sh: Work around for bootstraping.
+
 	* locale/programs/ld-collate.c (collate_output): Fix counting of
 	elements.  Don't limit table size.  Use correct secondary hash
 	function.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 117cab64bb..05ab73fd59 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,9 @@
 2005-10-14  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #448]
+	* locales/vi_VN: Several fixes.
+	Patch by Nguyen Thai Ngoc Duy <pclouds@gmail.com>.
+
 	[BZ #428]
 	* locales/te_IN: Several fixes.
 	Patch by Sunil Mohan Adapa <sunil@atc.tcs.co.in>.
diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN
index f6c2bfd573..ffd039b7fe 100644
--- a/localedata/locales/te_IN
+++ b/localedata/locales/te_IN
@@ -3,6 +3,8 @@ escape_char     /
 % Telugu language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
+%
+% Updated by Sunil Mohan Adapa <sunil AT atc tcs co in>
 
 LC_IDENTIFICATION
 title      "Telugu language locale for India"
@@ -14,20 +16,20 @@ tel         ""
 fax         ""
 language    "Telugu"
 territory   "India"
-revision    "0.92b"
-date        "2000,October 12"
-%
-category  "te_IN:2000";LC_IDENTIFICATION
-category  "te_IN:2000";LC_CTYPE
-category  "te_IN:2000";LC_COLLATE
-category  "te_IN:2000";LC_TIME
-category  "te_IN:2000";LC_NUMERIC
-category  "te_IN:2000";LC_MONETARY
-category  "te_IN:2000";LC_MESSAGES
-category  "te_IN:2000";LC_PAPER
-category  "te_IN:2000";LC_NAME
-category  "te_IN:2000";LC_ADDRESS
-category  "te_IN:2000";LC_TELEPHONE
+revision    "0.95"
+date        "2004-10-05"
+%
+category  "i18n:2003";LC_IDENTIFICATION
+category  "i18n:2003";LC_CTYPE
+category  "i18n:2003";LC_COLLATE
+category  "i18n:2003";LC_TIME
+category  "posix:1993";LC_NUMERIC
+category  "i18n:2003";LC_MONETARY
+category  "i18n:2003";LC_MESSAGES
+category  "i18n:2003";LC_PAPER
+category  "i18n:2003";LC_NAME
+category  "i18n:2003";LC_ADDRESS
+category  "i18n:2003";LC_TELEPHONE
 
 END LC_IDENTIFICATION
 
@@ -50,18 +52,18 @@ LC_MONETARY
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0049><U004E><U0052><U0020>"
-currency_symbol       "<U0930><U0942>"
+currency_symbol       "<U0C30><U0C42><U002E>"
 mon_decimal_point     "<U002E>"
 mon_thousands_sep     "<U002C>"
-mon_grouping          2;3
+mon_grouping          3;2
 positive_sign         ""
 negative_sign         "<U002D>"
 int_frac_digits       2
 frac_digits           2
 p_cs_precedes         1
-p_sep_by_space        1
+p_sep_by_space        0
 n_cs_precedes         1
-n_sep_by_space        1
+n_sep_by_space        0
 p_sign_posn           1
 n_sign_posn           1
 %
@@ -73,7 +75,7 @@ LC_NUMERIC
 %
 decimal_point          "<U002E>"
 thousands_sep          "<U002C>"
-grouping               2;3
+grouping               3;2
 %
 END LC_NUMERIC
 
@@ -103,34 +105,35 @@ abmon       "<U0C1C><U0C28><U0C35><U0C30><U0C3F>";"<U0C2B><U0C3F><U0C2C><U0C4D><
             "<U0C2E><U0C3E><U0C30><U0C4D><U0C1A><U0C3F>";"<U0C0F><U0C2a><U0C4D><U0C30><U0C3F><U0C32><U0C4D>";/
             "<U0C2E><U0C47>";"<U0C1C><U0C42><U0C28><U0C4D>";/
             "<U0C1C><U0C42><U0C32><U0C48>";"<U0C06><U0C17><U0C38><U0C4D><U0C1F><U0C41>";/
-            "<U0C38><U0C46><U0C2A><U0C4D><U0C1F><U0C46><U0C02><U0C2C><U0C30><U0C4D>";"<U0C05><U0C15><U0C4D><U0C1F><U0C4B><U0C2C><U0C30><U0C4D>";/
-            "<U0C28><U0C35><U0C02><U0C2C><U0C30><U0C4D>";"<U0C21><U0C3F><U0C38><U0C46><U0C02><U0C2C><U0C30><U0C4D>"
+            "<U0C38><U0C46><U0C2A><U0C4D><U0C1F><U0C46><U0C02><U0C2C><U0C30><U0C41>";"<U0C05><U0C15><U0C4D><U0C1F><U0C4B><U0C2C><U0C30><U0C41>";/
+            "<U0C28><U0C35><U0C02><U0C2C><U0C30><U0C41>";"<U0C21><U0C3F><U0C38><U0C46><U0C02><U0C2C><U0C30><U0C41>"
 
 % Full month names (%B)
 mon         "<U0C1C><U0C28><U0C35><U0C30><U0C3F>";"<U0C2B><U0C3F><U0C2C><U0C4D><U0C30><U0C35><U0C30><U0C3F>";/
             "<U0C2E><U0C3E><U0C30><U0C4D><U0C1A><U0C3F>";"<U0C0F><U0C2A><U0C4D><U0C30><U0C3F><U0C32><U0C4D>";/
             "<U0C2E><U0C47>";"<U0C1C><U0C42><U0C28><U0C4D>";/
             "<U0C1C><U0C42><U0C32><U0C48>";"<U0C06><U0C17><U0C38><U0C4D><U0C1F><U0C41>";/
-            "<U0C38><U0C46><U0C2A><U0C4D><U0C1F><U0C46><U0C02><U0C2C><U0C30><U0C4D>";"<U0C05><U0C15><U0C4D><U0C1F><U0C4B><U0C2C><U0C30><U0C4D>";/
-            "<U0C28><U0C35><U0C02><U0C2C><U0C30><U0C4D>";"<U0C21><U0C3F><U0C38><U0C46><U0C02><U0C2C><U0C30><U0C4D>"
+            "<U0C38><U0C46><U0C2A><U0C4D><U0C1F><U0C46><U0C02><U0C2C><U0C30><U0C41>";"<U0C05><U0C15><U0C4D><U0C1F><U0C4B><U0C2C><U0C30><U0C41>";/
+            "<U0C28><U0C35><U0C02><U0C2C><U0C30><U0C41>";"<U0C21><U0C3F><U0C38><U0C46><U0C02><U0C2C><U0C30><U0C41>"
 %
 % Equivalent of AM PM
-am_pm       "<U0C2A><U0C42><U0C30><U0C4D><U0C35><U0C3E><U0C39><U0C4D><U0C28>";"<U0C05><U0C2A><U0C30><U0C3E><U0C39><U0C4D><U0C28>"
+am_pm       "<U0C09><U002E>";"<U0C38><U0C3E><U002E>"
 %
 % 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>"
+% %B %d %A %Y %p%I.%M.%S %Z
+d_t_fmt     "<U0025><U0042><U0020><U0025><U0064><U0020><U0025><U0041><U0020><U0025><U0059><U0020><U0025><U0070><U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U005A>"
 %
 % Appropriate date representation
-% %A %d %b %Y
-d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059>"
+% %B %d %A %Y
+d_fmt       "<U0025><U0042><U0020><U0025><U0064><U0020><U0025><U0041><U0020><U0025><U0059>"
 %
 % Appropriate time representation
-% %I:%M:%S  %Z
-t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>"
+% %p%I.%M.%S %Z
+t_fmt       "<U0025><U0070><U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U005A>"
 %
 % Appropriate 12 h time representation (%r)
-t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
+% %p%I.%M.%S %Z
+t_fmt_ampm  "<U0025><U0070><U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U005A>"
 %
 END LC_TIME
 
@@ -141,19 +144,14 @@ LC_MESSAGES
 % These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
-% ^[\u0939\u093e\u0901]
-yesexpr     "<U005E><U005B><U0C05><U005D>"
-
 % 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>"
+% ^[yY\u0C05].*
+yesexpr     "<U005E><U005B><U0079><U0059><U0C05><U005D><U002E><U002A>"
 
 %
-% ^[\u0928\u0939\u0940\u0902]
-noexpr      "<U005E><U005B><U0C15><U005D>"
-
 % 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>"
-%
+% ^[yY\u0C15].*
+noexpr      "<U005E><U005B><U0079><U0059><U0C15><U005D><U002E><U002A>"
 
 %
 yesstr      "<U0C05><U0C35><U0C28><U0C41>"
@@ -174,12 +172,12 @@ LC_NAME
 % generated by IBM Basic CountryPack Transformer.
 %
 %
-name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
+name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067><U0025><U0074><U0025><U006D>"
 name_gen    ""
-name_mr     "<U004D><U0072><U002E>"
-name_mrs    "<U004D><U0072><U0073><U002E>"
-name_miss   "<U004D><U0069><U0073><U0073><U002E>"
-name_ms     "<U004D><U0073><U002E>"
+name_mr     "<U0C36><U0C4D><U0C30><U0C40><U0020>"
+name_mrs    "<U0C36><U0C4D><U0C30><U0C40><U0C2E><U0C24><U0C3F><U0020>"
+name_miss   "<U0C15><U0C41><U0C2E><U0C3E><U0C30><U0C3F><U0020>"
+name_ms     ""
 
 END LC_NAME
 
@@ -187,11 +185,25 @@ END LC_NAME
 LC_ADDRESS
 % This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category
 % generated by IBM Basic CountryPack Transformer.
-postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 
-country_ab2 "<U0049><U004E>"
-country_ab3 "<U0049><U004E><U0044>"
-country_num 356
+% postal_fmt    "%n%N%a%N%d%N%f%N%r%t%e%N%h%t%b%N%s%t%l%N%T%t%z%N%S%N%c"
+postal_fmt      "<U0025><U006E><U0025><U004E>/
+<U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E>/
+<U0025><U0066><U0025><U004E>/
+<U0025><U0072><U0025><U0074><U0025><U0065><U0025><U004E>/
+<U0025><U0068><U0025><U0074><U0025><U0062><U0025><U004E>/
+<U0025><U0073><U0025><U0074><U0025><U006C><U0025><U004E>/
+<U0025><U0054><U0025><U0074><U0025><U007A><U0025><U004E>/
+<U0025><U0053><U0025><U004E>/
+<U0025><U0063>"
+country_name    "<U0C2D><U0C3E><U0C30><U0C24><U0020><U0C26><U0C47><U0C36><U0C02>"
+country_ab2     "<U0049><U004E>"
+country_ab3     "<U0049><U004E><U0044>"
+country_num     356
+lang_name       "<U0C24><U0C46><U0C32><U0C41><U0C17><U0C41>"
+lang_ab         "te"
+lang_term       "tel"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN
index 7fc8018552..969d4ef766 100644
--- a/localedata/locales/vi_VN
+++ b/localedata/locales/vi_VN
@@ -2,16 +2,16 @@ escape_char /
 comment_char %
 %
 % Vietnamese language locale for Vietnam
-% Source: TCVN table and info from vietnamese native speakers
+% Source: glibc locale and info from vietnamese native speakers
 % Address:
 % Contact: Pablo Saratxaga
-% Email: srtxg@chanae.alphanet.ch
+% Email: pablo@mandrakesoft.com
 % Tel:
 % Fax:
 % Language: vi
 % Territory: VN
-% Revision: 0.7
-% Date: 2003-02-06
+% Revision: 1.1
+% Date: 2004-01-09
 % Users: general
 % Repertoiremap:
 % Charset: UTF-8
@@ -20,16 +20,16 @@ comment_char %
 
 LC_IDENTIFICATION
 title      "Vietnamese language locale for Vietnam"
-source     "TCVN table and info from vietnamese native speakers"
+source     "glibc locale and info from vietnamese native speakers"
 address    ""
 contact    "Pablo Saratxaga"
-email      "srtxg@chanae.alphanet.ch"
+email      "pablo@mandrakesoft.com"
 tel        ""
 fax        ""
 language   "Vietnamese"
 territory  "Vietnam"
-revision   "0.6"
-date       "2001-01-29"
+revision   "1.1"
+date       "2004-01-09"
 %
 category  "vi_VN:2000";LC_IDENTIFICATION
 category  "vi_VN:2000";LC_CTYPE
@@ -96,6 +96,7 @@ reorder-after <u>
 
 reorder-after <U0061>
 <U1EA3> <a>;<HOK>;<MIN>;IGNORE
+<U1EA1> <a>;<PCT>;<MIN>;IGNORE
 <U0103> <a(>;<BAS>;<MIN>;IGNORE
 <U1EB1> <a(>;<GRA>;<MIN>;IGNORE
 <U1EB3> <a(>;<HOK>;<MIN>;IGNORE
@@ -110,9 +111,10 @@ reorder-after <U0061>
 <U1EAD> <a/>>;<PCT>;<MIN>;IGNORE
 reorder-after <U0041>
 <U1EA2> <a>;<HOK>;<CAP>;IGNORE
+<U1EA0> <a>;<PCT>;<CAP>;IGNORE
 <U0102> <a(>;<BAS>;<CAP>;IGNORE
 <U1EB0> <a(>;<GRA>;<CAP>;IGNORE
-<U1EB3> <a(>;<HOK>;<CAP>;IGNORE
+<U1EB2> <a(>;<HOK>;<CAP>;IGNORE
 <U1EB4> <a(>;<TIL>;<CAP>;IGNORE
 <U1EAE> <a(>;<ACA>;<CAP>;IGNORE
 <U1EB6> <a(>;<PCT>;<CAP>;IGNORE
@@ -132,6 +134,8 @@ reorder-after <U0044>
 
 reorder-after <U0065>
 <U1EBB> <e>;<HOK>;<MIN>;IGNORE
+<U1EBD> <e>;<TIL>;<MIN>;IGNORE
+<U1EB9> <e>;<PCT>;<MIN>;IGNORE
 <U00EA> <e/>>;<BAS>;<MIN>;IGNORE
 <U1EC1> <e/>>;<GRA>;<MIN>;IGNORE
 <U1EC3> <e/>>;<HOK>;<MIN>;IGNORE
@@ -140,6 +144,8 @@ reorder-after <U0065>
 <U1EC7> <e/>>;<PCT>;<MIN>;IGNORE
 reorder-after <U0045>
 <U1EBA> <e>;<HOK>;<CAP>;IGNORE
+<U1EBC> <e>;<TIL>;<CAP>;IGNORE
+<U1EB8> <e>;<PCT>;<CAP>;IGNORE
 <U00CA> <e/>>;<BAS>;<CAP>;IGNORE
 <U1EC0> <e/>>;<GRA>;<CAP>;IGNORE
 <U1EC2> <e/>>;<HOK>;<CAP>;IGNORE
@@ -149,11 +155,14 @@ reorder-after <U0045>
 
 reorder-after <U0069>
 <U1EC9> <i>;<HOK>;<MIN>;IGNORE
+<U1ECB> <i>;<PCT>;<MIN>;IGNORE
 reorder-after <U0049>
 <U1EC8> <i>;<HOK>;<CAP>;IGNORE
+<U1ECA> <i>;<PCT>;<CAP>;IGNORE
 
 reorder-after <U006F>
 <U1ECF> <o>;<HOK>;<MIN>;IGNORE
+<U1ECD> <o>;<PCT>;<MIN>;IGNORE
 <U00F4> <o/>>;<BAS>;<MIN>;IGNORE
 <U1ED3> <o/>>;<GRA>;<MIN>;IGNORE
 <U1ED5> <o/>>;<HOK>;<MIN>;IGNORE
@@ -168,6 +177,7 @@ reorder-after <U006F>
 <U1EE3> <o9>;<PCT>;<MIN>;IGNORE
 reorder-after <U004F>
 <U1ECE> <o>;<HOK>;<CAP>;IGNORE
+<U1ECC> <o>;<PCT>;<CAP>;IGNORE
 <U00D4> <o/>>;<BAS>;<CAP>;IGNORE
 <U1ED2> <o/>>;<GRA>;<CAP>;IGNORE
 <U1ED4> <o/>>;<HOK>;<CAP>;IGNORE
@@ -183,6 +193,7 @@ reorder-after <U004F>
 
 reorder-after <U0075>
 <U1EE7> <u>;<HOK>;<MIN>;IGNORE
+<U1EE5> <u>;<PCT>;<MIN>;IGNORE
 <U01B0> <u9>;<BAS>;<MIN>;IGNORE
 <U1EEB> <u9>;<GRA>;<MIN>;IGNORE
 <U1EED> <u9>;<HOK>;<MIN>;IGNORE
@@ -191,6 +202,7 @@ reorder-after <U0075>
 <U1EF1> <u9>;<PCT>;<MIN>;IGNORE
 reorder-after <U0055>
 <U1EE6> <u>;<HOK>;<CAP>;IGNORE
+<U1EE4> <u>;<PCT>;<CAP>;IGNORE
 <U01AF> <u9>;<BAS>;<CAP>;IGNORE
 <U1EEA> <u9>;<GRA>;<CAP>;IGNORE
 <U1EEC> <u9>;<HOK>;<CAP>;IGNORE
@@ -199,9 +211,15 @@ reorder-after <U0055>
 <U1EF0> <u9>;<PCT>;<CAP>;IGNORE
 
 reorder-after <U0079>
+<U1EF3> <y>;<GRA>;<MIN>;IGNORE
 <U1EF7> <y>;<HOK>;<MIN>;IGNORE
+<U1EF9> <y>;<TIL>;<MIN>;IGNORE
+<U1EF5> <y>;<PCT>;<MIN>;IGNORE
 reorder-after <U0059>
+<U1EF2> <y>;<GRA>;<CAP>;IGNORE
 <U1EF6> <y>;<HOK>;<CAP>;IGNORE
+<U1EF8> <y>;<TIL>;<CAP>;IGNORE
+<U1EF4> <y>;<PCT>;<CAP>;IGNORE
 
 reorder-end
 
@@ -232,35 +250,44 @@ grouping             3;3
 END LC_NUMERIC
 
 LC_TIME
-abday    "<U0043><U004E>";"<U0054><U0068><U0032>";/
-         "<U0054><U0068><U0033>";"<U0054><U0068><U0034>";/
-         "<U0054><U0068><U0035>";"<U0054><U0068><U0036>";/
-         "<U0054><U0068><U0037>"
-day      "<U0063><U0068><U1EE7><U0020><U006E><U0068><U1EAD><U0074>";/
-         "<U0074><U0068><U1EE9><U0020><U0068><U0061><U0069>";/
-         "<U0074><U0068><U1EE9><U0020><U0062><U0061>";/
-         "<U0074><U0068><U1EE9><U0020><U0074><U01B0>";/
-         "<U0074><U0068><U1EE9><U0020><U006E><U0103><U006D>";/
-         "<U0074><U0068><U1EE9><U0020><U0073><U00E1><U0075>";/
-         "<U0074><U0068><U1EE9><U0020><U0062><U1EA3><U0079>"
-abmon    "<U0054><U0068><U0067><U0031>";"<U0054><U0068><U0067><U0032>";/
-         "<U0054><U0068><U0067><U0033>";"<U0054><U0068><U0067><U0034>";/
-         "<U0054><U0068><U0067><U0035>";"<U0054><U0068><U0067><U0036>";/
-         "<U0054><U0068><U0067><U0037>";"<U0054><U0068><U0067><U0038>";/
-         "<U0054><U0068><U0067><U0039>";"<U0054><U0068><U0067><U0031><U0030>";/
-         "<U0054><U0068><U0067><U0031><U0031>";"<U0054><U0068><U0067><U0031><U0032>"
-mon      "<U0074><U0068><U00E1><U006E><U0067><U0020><U0067><U0069><U00EA><U006E><U0067>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0068><U0061><U0069>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0062><U0061>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0074><U01B0>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U006E><U0103><U006D>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0073><U00E1><U0075>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0062><U1EA3><U0079>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0074><U00E1><U006D>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0063><U0068><U00ED><U006E>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U006D><U01B0><U1EDD><U0069>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U006D><U1ED9><U0074>";/
-         "<U0074><U0068><U00E1><U006E><U0067><U0020><U0063><U0068><U1EA1><U0070>"
+abday    "<U0043><U004E>";/
+         "<U0054><U0032>";/
+         "<U0054><U0033>";/
+         "<U0054><U0034>";/
+         "<U0054><U0035>";/
+         "<U0054><U0036>";/
+         "<U0054><U0037>"
+day      "<U0043><U0068><U1EE7><U0020><U006E><U0068><U1EAD><U0074>";/
+         "<U0054><U0068><U1EE9><U0020><U0068><U0061><U0069>";/
+         "<U0054><U0068><U1EE9><U0020><U0062><U0061>";/
+         "<U0054><U0068><U1EE9><U0020><U0074><U01B0>";/
+         "<U0054><U0068><U1EE9><U0020><U006E><U0103><U006D>";/
+         "<U0054><U0068><U1EE9><U0020><U0073><U00E1><U0075>";/
+         "<U0054><U0068><U1EE9><U0020><U0062><U1EA3><U0079>"
+abmon    "<U0054><U0068><U0031>";/
+         "<U0054><U0068><U0032>";/
+         "<U0054><U0068><U0033>";/
+         "<U0054><U0068><U0034>";/
+         "<U0054><U0068><U0035>";/
+         "<U0054><U0068><U0036>";/
+         "<U0054><U0068><U0037>";/
+         "<U0054><U0068><U0038>";/
+         "<U0054><U0068><U0039>";/
+         "<U0054><U0068><U0031><U0030>";/
+         "<U0054><U0068><U0031><U0031>";/
+         "<U0054><U0068><U0031><U0032>"
+mon      "<U0054><U0068><U00E1><U006E><U0067><U0020><U0067><U0069><U00EA><U006E><U0067>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0068><U0061><U0069>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0062><U0061>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0074><U01B0>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U006E><U0103><U006D>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0073><U00E1><U0075>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0062><U1EA3><U0079>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0074><U00E1><U006D>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0063><U0068><U00ED><U006E>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U006D><U01B0><U1EDD><U0069>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U006D><U1ED9><U0074>";/
+         "<U0054><U0068><U00E1><U006E><U0067><U0020><U0063><U0068><U1EA1><U0070>"
 d_t_fmt  "<U0025><U0041><U002C><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U006E><U0103><U006D><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt    "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
 t_fmt    "<U0025><U0054>"
@@ -272,9 +299,9 @@ END LC_TIME
 % yes: Va^ng / Da.
 % no: Kho^ng
 LC_MESSAGES
-yesstr   "<U0056><U00E2><U006E><U0067>"
+yesstr   "<U0043><U00F3>"
 nostr    "<U004B><U0068><U00F4><U006E><U0067>"
-yesexpr  "<U005E><U005B><U0031><U0079><U0059><U0076><U0056><U0064><U0044><U0063><U0043><U005D><U002E><U002A>"
+yesexpr  "<U005E><U005B><U0031><U0079><U0059><U0063><U0043><U005D><U002E><U002A>"
 noexpr   "<U005E><U005B><U0030><U006E><U004E><U006B><U004B><U005D><U002E><U002A>"
 END LC_MESSAGES
 
@@ -283,6 +310,45 @@ height      297
 width       210
 END LC_PAPER
 
+LC_NAME
+% This is the ISO_IEC TR14652 Locale definition for the
+% LC_NAME category.
+%
+name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074>/
+<U0025><U0067>"
+name_gen    ""
+name_mr     "<U00D4><U002E>"
+name_mrs    "<U0042><U002E>"
+name_miss   "<U0043><U002E>"
+name_ms     ""
+
+END LC_NAME
+
+
+LC_ADDRESS
+% This is the ISO_IEC TR14652 Locale definition for the
+% LC_ADDRESS
+postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
+<U0025><U0062><U0025><U0065><U0025><U0072>"
+country_name "<U0056><U0069><U1EC7><U0074><U0020><U006E><U0061><U006D>"
+lang_name "<U0056><U0069><U1EC7><U0074><U0020><U006E><U0067><U1EEF>"
+
+country_ab2 "<U0056><U004E>"
+country_ab3 "<U0056><U004E><U004D>"
+country_num 704
+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  "<U0038><U0034>"
+int_select  "<U0030><U0030>"
+
+END LC_TELEPHONE
+
 LC_MEASUREMENT
 measurement 1
 END LC_MEASUREMENT
diff --git a/malloc/tst-mtrace.sh b/malloc/tst-mtrace.sh
index d4fee2a357..771689a273 100755
--- a/malloc/tst-mtrace.sh
+++ b/malloc/tst-mtrace.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Testing the mtrace function.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2005 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -30,8 +30,7 @@ ${common_objpfx}elf/ld.so --library-path $common_objpfx \
   ${common_objpfx}malloc/tst-mtrace || status=1
 
 if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-  ${common_objpfx}malloc/mtrace ${common_objpfx}malloc/tst-mtrace \
-    ${common_objpfx}malloc/tst-mtrace.leak \
+  ${common_objpfx}malloc/mtrace ${common_objpfx}malloc/tst-mtrace.leak \
     > ${common_objpfx}malloc/tst-mtrace.out|| status=1
 fi