Merge commit 'refs/top-bases/t/bits_atomic.h_multiple_threads' into t/bits_atomic.h_multiple_threadst/bits_atomic.h_multiple_threads

1 files changed, 23 insertions, 20 deletions

diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index ecccc23f22..6541248eff 100644
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_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.
+
 % Catalan Language Locale for Spain with Euro
 % Language: ca
 % Territory: ES
@@ -9,9 +16,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      "Catalan locale for Catalonia with Euro"
@@ -25,19 +29,19 @@ language   "Catalan"
 territory  "Spain"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "ca_ES@euro:2000";LC_IDENTIFICATION
-category  "ca_ES@euro:2000";LC_CTYPE
-category  "ca_ES@euro:2000";LC_COLLATE
-category  "ca_ES@euro:2000";LC_TIME
-category  "ca_ES@euro:2000";LC_NUMERIC
-category  "ca_ES@euro:2000";LC_MONETARY
-category  "ca_ES@euro:2000";LC_MESSAGES
-category  "ca_ES@euro:2000";LC_PAPER
-category  "ca_ES@euro:2000";LC_NAME
-category  "ca_ES@euro:2000";LC_ADDRESS
-category  "ca_ES@euro:2000";LC_TELEPHONE
-category  "ca_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
@@ -73,8 +77,7 @@ copy "ca_ES"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
-measurement 1
+copy "ca_ES"
 END LC_MEASUREMENT
 
 LC_NAME