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

1 files changed, 23 insertions, 20 deletions

diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro
index 8ffc7cc1e1..3a9ab628f7 100644
--- a/localedata/locales/es_ES@euro
+++ b/localedata/locales/es_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.
+
 % Spanish Language Locale for Spain with Euro
 % Language: es
 % Territory: ES
@@ -8,9 +15,6 @@ escape_char  /
 % Date: 2000-08-20
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
-% Distribution and use is free, also
-% for commercial purposes.
 
 LC_IDENTIFICATION
 title      "Spanish locale for Spain with Euro"
@@ -23,19 +27,19 @@ fax        ""
 language   "Spanish"
 territory  "Spain"
 date       "2000-06-29"
-%
-category  "es_ES@euro:2000";LC_IDENTIFICATION
-category  "es_ES@euro:2000";LC_CTYPE
-category  "es_ES@euro:2000";LC_COLLATE
-category  "es_ES@euro:2000";LC_TIME
-category  "es_ES@euro:2000";LC_NUMERIC
-category  "es_ES@euro:2000";LC_MONETARY
-category  "es_ES@euro:2000";LC_MESSAGES
-category  "es_ES@euro:2000";LC_PAPER
-category  "es_ES@euro:2000";LC_NAME
-category  "es_ES@euro:2000";LC_ADDRESS
-category  "es_ES@euro:2000";LC_TELEPHONE
-category  "es_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
@@ -71,8 +75,7 @@ copy "es_ES"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
-measurement 1
+copy "es_ES"
 END LC_MEASUREMENT
 
 LC_NAME