Update.

2000-06-28  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/unix/sysv/linux/ia64/bits/elfclass.h: Deleted.  Hash
	table entries are 32 bit on the ia64 (as specified by the ABI),
	not 64 bit as on the Alpha.

	* shlib-versions: Bump ia64 soname to ld-linux-ia64.so.2 to mark
	change of objects to use 32 bit hash table indices (see above).

2000-06-28  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/ieee754/dbl-64/e_exp.c: Add include stdlib.h to get
	prototype for abs().

4 files changed, 311 insertions, 140 deletions

diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index 14b2fcf3cc..c6a0d69adc 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -1,6 +1,5 @@
 comment_char %
 escape_char  /
-repertoiremap mnemonic.ds
 
 % German Language Locale for Austria
 % Source: O:sterreiches Normungsinstitut
@@ -19,28 +18,56 @@ repertoiremap mnemonic.ds
 % Distribution and use is free, also
 % for commercial purposes.
 
+LC_IDENTIFICATION
+title      "German locale for Austria"
+source     "O:sterreiches Normungsinstitut"
+address    "Postfach 130, A-1021 Wien"
+contact    "Gerhard Budin"
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "German"
+territory  "Austria"
+revision   "1.0"
+date       "2000-06-28"
+%
+category  "de_AT:2000";LC_IDENTIFICATION
+category  "de_AT:2000";LC_CTYPE
+category  "de_AT:2000";LC_COLLATE
+category  "de_AT:2000";LC_TIME
+category  "de_AT:2000";LC_NUMERIC
+category  "de_AT:2000";LC_MONETARY
+category  "de_AT:2000";LC_MESSAGES
+category  "de_AT:2000";LC_PAPER
+category  "de_AT:2000";LC_NAME
+category  "de_AT:2000";LC_ADDRESS
+category  "de_AT:2000";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
 LC_CTYPE
-copy "en_DK"
+copy "i18n"
 END LC_CTYPE
 
 LC_COLLATE
-copy "en_DK"
+% Copy the template from ISO/IEC 14651
+copy "iso14651_t1"
 END LC_COLLATE
 
 LC_MESSAGES
-yesexpr "<'/>><<(><j><J><y><Y><)/>><.><*>"
-noexpr  "<'/>><<(><n><N><)/>><.><*>"
+yesexpr "<U005E><U005B><U006A><U004A><U0079><U0059><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY
 
-int_curr_symbol           "<A><T><S><SP>"
-currency_symbol           "<S>"
-mon_decimal_point         "<,>"
-mon_thousands_sep         "<SP>"
+int_curr_symbol           "<U0041><U0054><U0053><U0020>"
+currency_symbol           "<U0053>"
+mon_decimal_point         "<U002C>"
+mon_thousands_sep         "<U0020>"
 mon_grouping              3;3
 positive_sign             ""
-negative_sign             "<->"
+negative_sign             "<U002D>"
 int_frac_digits           2
 frac_digits               2
 p_cs_precedes             1
@@ -53,44 +80,73 @@ n_sign_posn               1
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point             "<,>"
+decimal_point             "<U002C>"
 thousands_sep             ""
 grouping                  0;0
 END LC_NUMERIC
 
 LC_TIME
-abday   "<S><o><n>";"<M><o><n>";/
-        "<D><i><e>";"<M><i><t>";/
-        "<D><o><n>";"<F><r><e>";/
-        "<S><a><m>"
-day     "<S><o><n><n><t><a><g>";/
-        "<M><o><n><t><a><g>";/
-        "<D><i><e><n><s><t><a><g>";/
-        "<M><i><t><t><w><o><c><h>";/
-        "<D><o><n><n><e><r><s><t><a><g>";/
-        "<F><r><e><i><t><a><g>";/
-        "<S><a><m><s><t><a><g>"
-abmon   "<J><a:><n>";"<F><e><b>";/
-        "<M><a:><r>";"<A><p><r>";/
-        "<M><a><i>";"<J><u><n>";/
-        "<J><u><l>";"<A><u><g>";/
-        "<S><e><p>";"<O><k><t>";/
-        "<N><o><v>";"<D><e><z>"
-mon     "<J><a:><n><n><e><r>";/
-        "<F><e><b><e><r>";/
-        "<M><a:><r><z>";/
-        "<A><p><r><i><l>";/
-        "<M><a><i>";/
-        "<J><u><n><i>";/
-        "<J><u><l><i>";/
-        "<A><u><g><u><s><t>";/
-        "<S><e><p><t><e><m><b><e><r>";/
-        "<O><k><t><o><b><e><r>";/
-        "<N><o><v><e><m><b><e><r>";/
-        "<D><e><z><e><m><b><e><r>"
-d_t_fmt "<%><a><SP><%><d><SP><%><b><SP><%><Y><SP><%><T><SP><%><Z>"
-d_fmt   "<%><Y><-><%><m><-><%><d>"
-t_fmt   "<%><T>"
+abday   "<U0053><U006F><U006E>";"<U004D><U006F><U006E>";/
+        "<U0044><U0069><U0065>";"<U004D><U0069><U0074>";/
+        "<U0044><U006F><U006E>";"<U0046><U0072><U0065>";/
+        "<U0053><U0061><U006D>"
+day     "<U0053><U006F><U006E><U006E><U0074><U0061><U0067>";/
+        "<U004D><U006F><U006E><U0074><U0061><U0067>";/
+        "<U0044><U0069><U0065><U006E><U0073><U0074><U0061><U0067>";/
+        "<U004D><U0069><U0074><U0074><U0077><U006F><U0063><U0068>";/
+        "<U0044><U006F><U006E><U006E><U0065><U0072><U0073><U0074><U0061><U0067>";/
+        "<U0046><U0072><U0065><U0069><U0074><U0061><U0067>";/
+        "<U0053><U0061><U006D><U0073><U0074><U0061><U0067>"
+abmon   "<U004A><U00E4><U006E>";"<U0046><U0065><U0062>";/
+        "<U004D><U00E4><U0072>";"<U0041><U0070><U0072>";/
+        "<U004D><U0061><U0069>";"<U004A><U0075><U006E>";/
+        "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
+        "<U0053><U0065><U0070>";"<U004F><U006B><U0074>";/
+        "<U004E><U006F><U0076>";"<U0044><U0065><U007A>"
+mon     "<U004A><U00E4><U006E><U006E><U0065><U0072>";/
+        "<U0046><U0065><U0062><U0065><U0072>";/
+        "<U004D><U00E4><U0072><U007A>";/
+        "<U0041><U0070><U0072><U0069><U006C>";/
+        "<U004D><U0061><U0069>";/
+        "<U004A><U0075><U006E><U0069>";/
+        "<U004A><U0075><U006C><U0069>";/
+        "<U0041><U0075><U0067><U0075><U0073><U0074>";/
+        "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
+        "<U004F><U006B><U0074><U006F><U0062><U0065><U0072>";/
+        "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
+        "<U0044><U0065><U007A><U0065><U006D><U0062><U0065><U0072>"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+d_fmt   "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>"
+t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
 END LC_TIME
+
+LC_PAPER
+height   297
+width    210
+END LC_PAPER
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+<U006C>"
+tel_dom_fmt    "<U0025><U0061><U0020><U0025><U006C>"
+int_prefix     "<U0034><U0033>"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+measurement    1
+END LC_MEASUREMENT
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+END LC_ADDRESS
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index 97b5979ed5..5d4e7ab777 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -1,6 +1,5 @@
 escape_char  /
 comment_char  %
-repertoiremap mnemonic.ds
 
 % English language locale for Britain
 % Source: RAP
@@ -20,22 +19,50 @@ repertoiremap mnemonic.ds
 % Distribution and use is free, also
 % for commercial purposes.
 
+LC_IDENTIFICATION
+title      "English locale for Britain"
+source     "RAP"
+address    "Sankt Jo//rgens Alle 8, DK-1615 Ko//benhavn V, Danmark"
+contact    "Keld Simonsen"
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "English"
+territory  "Great Britain"
+revision   "1.0"
+date       "2000-06-28"
+%
+category  "en_GB:2000";LC_IDENTIFICATION
+category  "en_GB:2000";LC_CTYPE
+category  "en_GB:2000";LC_COLLATE
+category  "en_GB:2000";LC_TIME
+category  "en_GB:2000";LC_NUMERIC
+category  "en_GB:2000";LC_MONETARY
+category  "en_GB:2000";LC_MESSAGES
+category  "en_GB:2000";LC_PAPER
+category  "en_GB:2000";LC_NAME
+category  "en_GB:2000";LC_ADDRESS
+category  "en_GB:2000";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
 LC_CTYPE
-copy "en_DK"
+copy "i18n"
 END LC_CTYPE
 
 LC_COLLATE
-copy "en_DK"
+% Copy the template from ISO/IEC 14651
+copy "iso14651_t1"
 END LC_COLLATE
 
 LC_MONETARY
-int_curr_symbol         "<G><B><P><SP>"
-currency_symbol         "<Pd>"
-mon_decimal_point       "<.>"
-mon_thousands_sep       "<,>"
+int_curr_symbol         "<U0047><U0042><U0050><U0020>"
+currency_symbol         "<U00A3>"
+mon_decimal_point       "<U002E>"
+mon_thousands_sep       "<U002C>"
 mon_grouping            3;3
 positive_sign           ""
-negative_sign           "<->"
+negative_sign           "<U002D>"
 int_frac_digits         2
 frac_digits             2
 p_cs_precedes           1
@@ -47,49 +74,78 @@ n_sign_posn             1
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point           "<.>"
-thousands_sep           "<,>"
+decimal_point           "<U002E>"
+thousands_sep           "<U002C>"
 grouping                3;3
 END LC_NUMERIC
 
 LC_TIME
-abday       "<S><u><n>";"<M><o><n>";/
-            "<T><u><e>";"<W><e><d>";/
-            "<T><h><u>";"<F><r><i>";/
-            "<S><a><t>"
-day         "<S><u><n><d><a><y>";/
-            "<M><o><n><d><a><y>";/
-            "<T><u><e><s><d><a><y>";/
-            "<W><e><d><n><e><s><d><a><y>";/
-            "<T><h><u><r><s><d><a><y>";/
-            "<F><r><i><d><a><y>";/
-            "<S><a><t><u><r><d><a><y>"
-abmon       "<J><a><n>";"<F><e><b>";/
-            "<M><a><r>";"<A><p><r>";/
-            "<M><a><y>";"<J><u><n>";/
-            "<J><u><l>";"<A><u><g>";/
-            "<S><e><p>";"<O><c><t>";/
-            "<N><o><v>";"<D><e><c>"
-mon         "<J><a><n><u><a><r><y>";/
-            "<F><e><b><r><u><a><r><y>";/
-            "<M><a><r><c><h>";/
-            "<A><p><r><i><l>";/
-            "<M><a><y>";/
-            "<J><u><n><e>";/
-            "<J><u><l><y>";/
-            "<A><u><g><u><s><t>";/
-            "<S><e><p><t><e><m><b><e><r>";/
-            "<O><c><t><o><b><e><r>";/
-            "<N><o><v><e><m><b><e><r>";/
-            "<D><e><c><e><m><b><e><r>"
-d_t_fmt     "<%><a><SP><%><d><SP><%><b><SP><%><Y><SP><%><T><SP><%><Z>"
-d_fmt       "<%><d><//><%><m><//><%><y>"
-t_fmt       "<%><T>"
+abday       "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/
+            "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/
+            "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/
+            "<U0053><U0061><U0074>"
+day         "<U0053><U0075><U006E><U0064><U0061><U0079>";/
+            "<U004D><U006F><U006E><U0064><U0061><U0079>";/
+            "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/
+            "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/
+            "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/
+            "<U0046><U0072><U0069><U0064><U0061><U0079>";/
+            "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
+abmon       "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
+            "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
+            "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/
+            "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
+            "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/
+            "<U004E><U006F><U0076>";"<U0044><U0065><U0063>"
+mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
+            "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/
+            "<U004D><U0061><U0072><U0063><U0068>";/
+            "<U0041><U0070><U0072><U0069><U006C>";/
+            "<U004D><U0061><U0079>";/
+            "<U004A><U0075><U006E><U0065>";/
+            "<U004A><U0075><U006C><U0079>";/
+            "<U0041><U0075><U0067><U0075><U0073><U0074>";/
+            "<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>"
+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>"
 am_pm       "";""
 t_fmt_ampm  ""
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<'/>><<(><y><Y><)/>><.><*>"
-noexpr      "<'/>><<(><n><N><)/>><.><*>"
+yesexpr     "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
+noexpr      "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
+
+LC_PAPER
+height   279
+width    216
+END LC_PAPER
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+<U006C>"
+tel_dom_fmt    "<U0025><U0061><U0020><U0025><U006C>"
+int_prefix     "<U0034><U0034>"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+measurement    2
+END LC_MEASUREMENT
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+END LC_ADDRESS
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index d5a9dc64e4..8286d5bafc 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -1,6 +1,5 @@
 comment_char %
 escape_char  /
-repertoiremap mnemonic.ds
 %
 % French Language Locale for France
 % Source: RAP
@@ -20,27 +19,55 @@ repertoiremap mnemonic.ds
 % Distribution and use is free, also
 % for commercial purposes.
 
+LC_IDENTIFICATION
+title      "French locale for France"
+source     "RAP"
+address    "Sankt Jo//rgens Alle 8, DK-1615 Ko//benhavn V, Danmark"
+contact    "Keld Simonsen"
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "French"
+territory  "France"
+revision   "1.0"
+date       "2000-06-28"
+%
+category  "fr_FR:2000";LC_IDENTIFICATION
+category  "fr_FR:2000";LC_CTYPE
+category  "fr_FR:2000";LC_COLLATE
+category  "fr_FR:2000";LC_TIME
+category  "fr_FR:2000";LC_NUMERIC
+category  "fr_FR:2000";LC_MONETARY
+category  "fr_FR:2000";LC_MESSAGES
+category  "fr_FR:2000";LC_PAPER
+category  "fr_FR:2000";LC_NAME
+category  "fr_FR:2000";LC_ADDRESS
+category  "fr_FR:2000";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
 LC_CTYPE
-copy "en_DK"
+copy "i18n"
 END LC_CTYPE
 
 LC_COLLATE
-copy "en_DK"
+% Copy the template from ISO/IEC 14651
+copy "iso14651_t1"
 END LC_COLLATE
 
 LC_MESSAGES
-yesexpr "<'/>><<(><o><O><y><Y><)/>><.><*>"
-noexpr  "<'/>><<(><n><N><)/>><.><*>"
+yesexpr "<U005E><U005B><U006F><U004F><U0079><U0059><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<F><R><F><SP>"
-currency_symbol           "<F>"
-mon_decimal_point         "<,>"
-mon_thousands_sep         "<SP>"
+int_curr_symbol           "<U0046><U0052><U0046><U0020>"
+currency_symbol           "<U0046>"
+mon_decimal_point         "<U002C>"
+mon_thousands_sep         "<U0020>"
 mon_grouping              3;3
 positive_sign             ""
-negative_sign             "<->"
+negative_sign             "<U002D>"
 int_frac_digits           2
 frac_digits               2
 p_cs_precedes             0
@@ -52,44 +79,73 @@ n_sign_posn               1
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point             "<,>"
+decimal_point             "<U002C>"
 thousands_sep             ""
 grouping                  0;0
 END LC_NUMERIC
 
 LC_TIME
-abday   "<d><i><m>";"<l><u><n>";/
-        "<m><a><r>";"<m><e><r>";/
-        "<j><e><u>";"<v><e><n>";/
-        "<s><a><m>"
-day     "<d><i><m><a><n><c><h><e>";/
-        "<l><u><n><d><i>";/
-        "<m><a><r><d><i>";/
-        "<m><e><r><c><r><e><d><i>";/
-        "<j><e><u><d><i>";/
-        "<v><e><n><d><r><e><d><i>";/
-        "<s><a><m><e><d><i>"
-abmon   "<j><a><n>";"<f><e'><v>";/
-        "<m><a><r>";"<a><v><r>";/
-        "<m><a><i>";"<j><u><n>";/
-        "<j><u><i>";"<a><o><u/>>";/
-        "<s><e><p>";"<o><c><t>";/
-        "<n><o><v>";"<d><e'><c>"
-mon     "<j><a><n><v><i><e><r>";/
-        "<f><e'><v><r><i><e><r>";/
-        "<m><a><r><s>";/
-        "<a><v><r><i><l>";/
-        "<m><a><i>";/
-        "<j><u><i><n>";/
-        "<j><u><i><l><l><e><t>";/
-        "<a><o><u/>><t>";/
-        "<s><e><p><t><e><m><b><r><e>";/
-        "<o><c><t><o><b><r><e>";/
-        "<n><o><v><e><m><b><r><e>";/
-        "<d><e'><c><e><m><b><r><e>"
-d_t_fmt "<%><a><SP><%><d><SP><%><b><SP><%><Y><SP><%><T><SP><%><Z>"
-d_fmt   "<%><d><.><%><m><.><%><Y>"
-t_fmt   "<%><T>"
+abday   "<U0064><U0069><U006D>";"<U006C><U0075><U006E>";/
+        "<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>"
+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>"
+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>"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+d_fmt   "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
+t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
 END LC_TIME
+
+LC_PAPER
+height   297
+width    210
+END LC_PAPER
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+<U006C>"
+tel_dom_fmt    "<U0025><U0061><U0020><U0025><U006C>"
+int_prefix     "<U0033><U0033>"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+measurement    1
+END LC_MEASUREMENT
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+END LC_ADDRESS
diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK
index 2b91494f39..e0c99d2322 100644
--- a/localedata/locales/mk_MK
+++ b/localedata/locales/mk_MK
@@ -5,11 +5,11 @@ escape_char /
 % Address: 
 % Contact: Damjan Georgievski
 % Email: gdamjan@freemail.org.mk 
-% Tel: 
+% Tel: none 
 % Fax: none
 % Language: mk
 % Territory: MK
-% Revision: 0.2
+% Revision: 0.4 (2000-06-28)
 % Date: 1999-12-22
 % Application: general
 % Users: general
@@ -20,7 +20,8 @@ escape_char /
 %
 % Based on the rusian locale, 
 % sligtly changed to reflect macedonian language.
-% To compile: localedef -i mk_MK -f ISO-8859-5 mk_MK
+% To compile: localedef -i mk_MK.src -u mnemonic.ds -f ISO-8859-5 mk_MK
+% Or, optional: localedef -i mk_MK.src -u mnemonic.ds -f CP1251 mk_MK.cp1251
 
 LC_COLLATE
 % Base collation scheme: 1994-03-22
@@ -3015,12 +3016,12 @@ toupper (<a>,<A>);(<a!>,<A!>);/
 END LC_CTYPE
 
 LC_TIME
-abday	"<N=><e=><d=>";"<P=><o=><n=>";"<V=><t=><o=>";"<S=><r=><e=>";"<C%><e=><t=>";"<P=><e=><t=>";"<S=><a=><b=>"
-day	"<N=><e=><d=><e=><l=><a=>";"<P=><o=><n=><e=><d=><e=><l=><n=><i=><k=>";"<V=><t=><o=><r=><n=><i=><k=>";"<S=><r=><e=><d=><a=>";"<C%><e=><t=><v=><r=><t=><o=><k=>";"<P=><e=><t=><o=><k=>";"<S=><a=><b=><o=><t=><a=>"
-abmon	"<J%><a=><n=>";"<F=><e=><b=>";"<M=><a=><r=>";"<A=><p=><r=>";"<M=><a=><j%>";"<J%><u=><n=>";"<J%><u=><l=>";"<A=><v=><g=>";"<S=><e=><p=>";"<O=><k=><t=>";"<N=><o=><v=>";"<D=><e=><k=>"
-mon	"<J%><a=><n=><u=><a=><r=><i=>";"<F=><e=><b=><r=><u=><a=><r=><i=>";"<M=><a=><r=><t=>";"<A=><p=><r=><i=><l=>";"<M=><a=><j%>";"<J%><u=><n=><i=>";"<J%><u=><l=><i=>";"<A=><v=><g=><u=><s=><t=>";"<S=><e=><p=><t=><e=><m=><v=><r=><i=>";"<O=><k=><t=><o=><m=><v=><r=><i=>";"<N=><o=><e=><m=><v=><r=><i=>";"<D=><e=><k=><e=><m=><v=><r=><i=>"
+abday	"<n=><e=><d=>";"<p=><o=><n=>";"<v=><t=><o=>";"<s=><r=><e=>";"<c%><e=><t=>";"<p=><e=><t=>";"<s=><a=><b=>" 
+day	"<n=><e=><d=><e=><l=><a=>";"<p=><o=><n=><e=><d=><e=><l=><n=><i=><k=>";"<v=><t=><o=><r=><n=><i=><k=>";"<s=><r=><e=><d=><a=>";"<c%><e=><t=><v=><r=><t=><o=><k=>";"<p=><e=><t=><o=><k=>";"<s=><a=><b=><o=><t=><a=>"
+abmon	"<j%><a=><n=>";"<f=><e=><v=>";"<m=><a=><r=>";"<a=><p=><r=>";"<m=><a=><j%>";"<j%><u=><n=>";"<j%><u=><l=>";"<a=><v=><g=>";"<s=><e=><p=>";"<o=><k=><t=>";"<n=><o=><e=>";"<d=><e=><k=>"
+mon	"<j%><a=><n=><u=><a=><r=><i=>";"<f=><e=><v=><r=><u=><a=><r=><i=>";"<m=><a=><r=><t=>";"<a=><p=><r=><i=><l=>";"<m=><a=><j%>";"<j%><u=><n=><i=>";"<j%><u=><l=><i=>";"<a=><v=><g=><u=><s=><t=>";"<s=><e=><p=><t=><e=><m=><v=><r=><i=>";"<o=><k=><t=><o=><m=><v=><r=><i=>";"<n=><o=><e=><m=><v=><r=><i=>";"<d=><e=><k=><e=><m=><v=><r=><i=>"
 d_t_fmt "<%><a><comma><SP><%><d><SP><%><b><SP><%><Y><SP><%><T><SP><%><Z>"
-d_fmt   "<%><d><-><%><m><-><%><Y>"
+d_fmt   "<%><d><period><%><m><period><%><Y>"
 t_fmt   "<%><T>"
 am_pm   "";""
 t_fmt_ampm ""
@@ -3030,7 +3031,7 @@ LC_MONETARY
 int_curr_symbol           "<M><K><D><SP>"
 currency_symbol           "<d=><e=><n=>"
 mon_decimal_point         "<,>"
-mon_thousands_sep         "<.>"
+mon_thousands_sep         "<SP>"
 mon_grouping              3;3
 positive_sign             ""
 negative_sign             "<->"
@@ -3046,12 +3047,14 @@ END LC_MONETARY
 
 LC_NUMERIC
 decimal_point             "<,>"
-thousands_sep             "<.>"
+thousands_sep             "<SP>"
 grouping                  3;3
 END LC_NUMERIC
 
 LC_MESSAGES
 yesexpr "<<(><D=><d=><D><d><Y><y><1><)/>><.><*>"
 noexpr  "<<(><N=><n=><N><n><0><)/>><.><*>"
+yesstr  "<d=><a=>"
+nostr   "<n=><e=>"
 END LC_MESSAGES