Merge commit 'refs/top-bases/t/libc_cleanup' into t/libc_cleanup

1 files changed, 27 insertions, 24 deletions

diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro
index 1d2ac5a0dc..a71c0cc0d5 100644
--- a/localedata/locales/eu_ES@euro
+++ b/localedata/locales/eu_ES@euro
@@ -1,6 +1,13 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
+% This file is part of the GNU C Library and contains locale data.
+% The Free Software Foundation does not claim any copyright interest
+% in the locale data contained in this file.  The foregoing does not
+% affect the license of the GNU C Library as a whole.  It does not
+% exempt you from the conditions of the license if your use would
+% otherwise be governed by that license.
+
 % Basque Language Locale for Spain with Euro
 % Language: eu
 % Territory: ES
@@ -8,9 +15,6 @@ escape_char  /
 % Date: 2000-08-21
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
-% Distribution and use is free, also
-% for commercial purposes.
 
 LC_IDENTIFICATION
 title      "Basque language locale for Spain with Euro"
@@ -24,19 +28,19 @@ language   "Basque"
 territory  "Spain"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "eu_ES@euro:2000";LC_IDENTIFICATION
-category  "eu_ES@euro:2000";LC_CTYPE
-category  "eu_ES@euro:2000";LC_COLLATE
-category  "eu_ES@euro:2000";LC_TIME
-category  "eu_ES@euro:2000";LC_NUMERIC
-category  "eu_ES@euro:2000";LC_MONETARY
-category  "eu_ES@euro:2000";LC_MESSAGES
-category  "eu_ES@euro:2000";LC_PAPER
-category  "eu_ES@euro:2000";LC_NAME
-category  "eu_ES@euro:2000";LC_ADDRESS
-category  "eu_ES@euro:2000";LC_TELEPHONE
-category  "eu_ES@euro:2000";LC_MEASUREMENT
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
 END LC_IDENTIFICATION
 
 LC_COLLATE
@@ -52,13 +56,13 @@ copy "eu_ES"
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol      "<U0045><U0055><U0052><U0020>"
+int_curr_symbol      "EUR "
 currency_symbol      "<U20AC>"
-mon_decimal_point    "<U002C>"
-mon_thousands_sep    "<U002E>"
+mon_decimal_point    ","
+mon_thousands_sep    "."
 mon_grouping         3;3
 positive_sign        ""
-negative_sign        "<U002D>"
+negative_sign        "-"
 int_frac_digits      0
 frac_digits          0
 p_cs_precedes        1
@@ -86,8 +90,7 @@ copy "eu_ES"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
-measurement 1
+copy "eu_ES"
 END LC_MEASUREMENT
 
 LC_NAME