localedata: LC_IDENTIFICATION.category: set to ISO 30112 2014 standard

The ISO 30112 standard defines the valid values for the category
keyword as only a few options:
	posix:1993
	i18n:2004
	i18n:2012

The vast majority of locales had changed the "i18n" string to the
name of its own locale (e.g. "ak_GH:2013") as well as tweaking the
date (presumably thinking it should be the date of submission).

Convert all of them to "i18n:2012" for consistency.  A follow up
change will update localedef to actually check/validate the field.

310 files changed, 3947 insertions, 4103 deletions

diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index 84e3470e18..370afe84b3 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -39,20 +39,19 @@ language   "Afar"
 territory  "Djibouti"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index df955350d3..6c74969c85 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -39,20 +39,19 @@ language   "Afar"
 territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
index eda573a295..e04bb6fa84 100644
--- a/localedata/locales/aa_ER@saaho
+++ b/localedata/locales/aa_ER@saaho
@@ -39,20 +39,19 @@ language   "Afar"
 territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index 90648d2ab7..1920993ec6 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -39,20 +39,19 @@ language   "Afar"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA
index 83ce0af3e4..48abe403a6 100644
--- a/localedata/locales/af_ZA
+++ b/localedata/locales/af_ZA
@@ -52,20 +52,19 @@ language   "Afrikaans"
 territory  "South Africa"
 revision   "1.2.1"
 date       "2005-10-13"
-%
-category  "af_ZA:2000";LC_IDENTIFICATION
-category  "af_ZA:2000";LC_CTYPE
-category  "af_ZA:2000";LC_COLLATE
-category  "af_ZA:2000";LC_TIME
-category  "af_ZA:2000";LC_NUMERIC
-category  "af_ZA:2000";LC_MONETARY
-category  "af_ZA:2003";LC_MESSAGES
-category  "af_ZA:2003";LC_PAPER
-category  "af_ZA:2000";LC_NAME
-category  "af_ZA:2003";LC_ADDRESS
-category  "af_ZA:2003";LC_TELEPHONE
-category  "af_ZA:2003";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_CTYPE
diff --git a/localedata/locales/ak_GH b/localedata/locales/ak_GH
index c41788894f..3b26c34a70 100644
--- a/localedata/locales/ak_GH
+++ b/localedata/locales/ak_GH
@@ -37,19 +37,19 @@ language     "Akan"
 territory    "Ghana"
 revision     "1.0"
 date         "2013-08-24"
-%
-category  "ak_GH:2013";LC_IDENTIFICATION
-category  "ak_GH:2013";LC_CTYPE
-category  "ak_GH:2013";LC_COLLATE
-category  "ak_GH:2013";LC_TIME
-category  "ak_GH:2013";LC_NUMERIC
-category  "ak_GH:2013";LC_MONETARY
-category  "ak_GH:2013";LC_PAPER
-category  "ak_GH:2013";LC_MEASUREMENT
-category  "ak_GH:2013";LC_MESSAGES
-category  "ak_GH:2013";LC_NAME
-category  "ak_GH:2013";LC_ADDRESS
-category  "ak_GH:2013";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index 942ba7dbd2..ae0673fff6 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -37,20 +37,19 @@ language   "Amharic"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
index 91932d000b..a989743ec6 100644
--- a/localedata/locales/an_ES
+++ b/localedata/locales/an_ES
@@ -37,19 +37,19 @@ language   "Aragonese"
 territory  "Spain"
 revision   "1.1"
 date       "2003-08-25"
-%
-category  "i18n:1999";LC_IDENTIFICATION
-category  "i18n:1999";LC_CTYPE
-category  "i18n:1999";LC_COLLATE
-category  "i18n:1999";LC_TIME
-category  "posix:1993";LC_NUMERIC
-category  "i18n:1999";LC_MONETARY
-category  "i18n:1999";LC_MESSAGES
-category  "i18n:1999";LC_PAPER
-category  "i18n:1999";LC_NAME
-category  "i18n:1999";LC_ADDRESS
-category  "i18n:1999";LC_TELEPHONE
-category  "i18n:1999";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
diff --git a/localedata/locales/anp_IN b/localedata/locales/anp_IN
index c9fcc60bee..5dfc08f27e 100644
--- a/localedata/locales/anp_IN
+++ b/localedata/locales/anp_IN
@@ -30,19 +30,19 @@ language   "Angika"
 territory  "India"
 revision   "1.0"
 date       "2013-10-24"
-%
-category  "anp_IN:2013";LC_IDENTIFICATION
-category  "anp_IN:2013";LC_CTYPE
-category  "anp_IN:2013";LC_COLLATE
-category  "anp_IN:2013";LC_TIME
-category  "anp_IN:2013";LC_NUMERIC
-category  "anp_IN:2013";LC_MONETARY
-category  "anp_IN:2013";LC_MESSAGES
-category  "anp_IN:2013";LC_PAPER
-category  "anp_IN:2013";LC_NAME
-category  "anp_IN:2013";LC_ADDRESS
-category  "anp_IN:2013";LC_TELEPHONE
-category  "anp_IN:2013";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_CTYPE
diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE
index 4c73dd234a..2557644309 100644
--- a/localedata/locales/ar_AE
+++ b/localedata/locales/ar_AE
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "United Arab Emirates"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_AE:2000";LC_IDENTIFICATION
-category  "ar_AE:2000";LC_CTYPE
-category  "ar_AE:2000";LC_COLLATE
-category  "ar_AE:2000";LC_TIME
-category  "ar_AE:2000";LC_NUMERIC
-category  "ar_AE:2000";LC_MONETARY
-category  "ar_AE:2000";LC_MESSAGES
-category  "ar_AE:2000";LC_PAPER
-category  "ar_AE:2000";LC_NAME
-category  "ar_AE:2000";LC_ADDRESS
-category  "ar_AE:2000";LC_TELEPHONE
-category  "ar_AE: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_CTYPE
diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH
index 10cebb5b5c..d916ae4bcb 100644
--- a/localedata/locales/ar_BH
+++ b/localedata/locales/ar_BH
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Bahrain"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_BH:2000";LC_IDENTIFICATION
-category  "ar_BH:2000";LC_CTYPE
-category  "ar_BH:2000";LC_COLLATE
-category  "ar_BH:2000";LC_TIME
-category  "ar_BH:2000";LC_NUMERIC
-category  "ar_BH:2000";LC_MONETARY
-category  "ar_BH:2000";LC_MESSAGES
-category  "ar_BH:2000";LC_PAPER
-category  "ar_BH:2000";LC_NAME
-category  "ar_BH:2000";LC_ADDRESS
-category  "ar_BH:2000";LC_TELEPHONE
-category  "ar_BH: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
 
 
diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ
index ddff210650..88816f37c6 100644
--- a/localedata/locales/ar_DZ
+++ b/localedata/locales/ar_DZ
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Algeria"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_DZ:2000";LC_IDENTIFICATION
-category  "ar_DZ:2000";LC_CTYPE
-category  "ar_DZ:2000";LC_COLLATE
-category  "ar_DZ:2000";LC_TIME
-category  "ar_DZ:2000";LC_NUMERIC
-category  "ar_DZ:2000";LC_MONETARY
-category  "ar_DZ:2000";LC_MESSAGES
-category  "ar_DZ:2000";LC_PAPER
-category  "ar_DZ:2000";LC_NAME
-category  "ar_DZ:2000";LC_ADDRESS
-category  "ar_DZ:2000";LC_TELEPHONE
-category  "ar_DZ: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_CTYPE
diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG
index e677127bdd..1a64d80b8c 100644
--- a/localedata/locales/ar_EG
+++ b/localedata/locales/ar_EG
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Egypt"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_EG:2000";LC_IDENTIFICATION
-category  "ar_EG:2000";LC_CTYPE
-category  "ar_EG:2000";LC_COLLATE
-category  "ar_EG:2000";LC_TIME
-category  "ar_EG:2000";LC_NUMERIC
-category  "ar_EG:2000";LC_MONETARY
-category  "ar_EG:2000";LC_MESSAGES
-category  "ar_EG:2000";LC_PAPER
-category  "ar_EG:2000";LC_NAME
-category  "ar_EG:2000";LC_ADDRESS
-category  "ar_EG:2000";LC_TELEPHONE
-category  "ar_EG: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_CTYPE
diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN
index c61a355a6a..3c2aed7f0c 100644
--- a/localedata/locales/ar_IN
+++ b/localedata/locales/ar_IN
@@ -24,20 +24,19 @@ language    "Arabic"
 territory   "India"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
-%
-category  "ar_IN:2000";LC_IDENTIFICATION
-category  "ar_IN:2000";LC_CTYPE
-category  "ar_IN:2000";LC_COLLATE
-category  "ar_IN:2000";LC_TIME
-category  "ar_IN:2000";LC_NUMERIC
-category  "ar_IN:2000";LC_MONETARY
-category  "ar_IN:2000";LC_MESSAGES
-category  "ar_IN:2000";LC_PAPER
-category  "ar_IN:2000";LC_NAME
-category  "ar_IN:2000";LC_ADDRESS
-category  "ar_IN:2000";LC_TELEPHONE
-category  "ar_IN: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
 
 
diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ
index b13a26ccd4..a2fd96ba2f 100644
--- a/localedata/locales/ar_IQ
+++ b/localedata/locales/ar_IQ
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Iraq"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_IQ:2000";LC_IDENTIFICATION
-category  "ar_IQ:2000";LC_CTYPE
-category  "ar_IQ:2000";LC_COLLATE
-category  "ar_IQ:2000";LC_TIME
-category  "ar_IQ:2000";LC_NUMERIC
-category  "ar_IQ:2000";LC_MONETARY
-category  "ar_IQ:2000";LC_MESSAGES
-category  "ar_IQ:2000";LC_PAPER
-category  "ar_IQ:2000";LC_NAME
-category  "ar_IQ:2000";LC_ADDRESS
-category  "ar_IQ:2000";LC_TELEPHONE
-category  "ar_IQ: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_CTYPE
diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO
index 306661dd0b..0449021508 100644
--- a/localedata/locales/ar_JO
+++ b/localedata/locales/ar_JO
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Jordan"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_JO:2000";LC_IDENTIFICATION
-category  "ar_JO:2000";LC_CTYPE
-category  "ar_JO:2000";LC_COLLATE
-category  "ar_JO:2000";LC_TIME
-category  "ar_JO:2000";LC_NUMERIC
-category  "ar_JO:2000";LC_MONETARY
-category  "ar_JO:2000";LC_MESSAGES
-category  "ar_JO:2000";LC_PAPER
-category  "ar_JO:2000";LC_NAME
-category  "ar_JO:2000";LC_ADDRESS
-category  "ar_JO:2000";LC_TELEPHONE
-category  "ar_JO: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
 
 
diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW
index 725c6288df..7c0ee8fd51 100644
--- a/localedata/locales/ar_KW
+++ b/localedata/locales/ar_KW
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Kuwait"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_KW:2000";LC_IDENTIFICATION
-category  "ar_KW:2000";LC_CTYPE
-category  "ar_KW:2000";LC_COLLATE
-category  "ar_KW:2000";LC_TIME
-category  "ar_KW:2000";LC_NUMERIC
-category  "ar_KW:2000";LC_MONETARY
-category  "ar_KW:2000";LC_MESSAGES
-category  "ar_KW:2000";LC_PAPER
-category  "ar_KW:2000";LC_NAME
-category  "ar_KW:2000";LC_ADDRESS
-category  "ar_KW:2000";LC_TELEPHONE
-category  "ar_KW: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_CTYPE
diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB
index 06b0754208..5d9980f3fb 100644
--- a/localedata/locales/ar_LB
+++ b/localedata/locales/ar_LB
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Lebanon"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_LB:2000";LC_IDENTIFICATION
-category  "ar_LB:2000";LC_CTYPE
-category  "ar_LB:2000";LC_COLLATE
-category  "ar_LB:2000";LC_TIME
-category  "ar_LB:2000";LC_NUMERIC
-category  "ar_LB:2000";LC_MONETARY
-category  "ar_LB:2000";LC_MESSAGES
-category  "ar_LB:2000";LC_PAPER
-category  "ar_LB:2000";LC_NAME
-category  "ar_LB:2000";LC_ADDRESS
-category  "ar_LB:2000";LC_TELEPHONE
-category  "ar_LB: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_CTYPE
diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY
index 8f2749a09b..c791833512 100644
--- a/localedata/locales/ar_LY
+++ b/localedata/locales/ar_LY
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Libya"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_LY:2000";LC_IDENTIFICATION
-category  "ar_LY:2000";LC_CTYPE
-category  "ar_LY:2000";LC_COLLATE
-category  "ar_LY:2000";LC_TIME
-category  "ar_LY:2000";LC_NUMERIC
-category  "ar_LY:2000";LC_MONETARY
-category  "ar_LY:2000";LC_MESSAGES
-category  "ar_LY:2000";LC_PAPER
-category  "ar_LY:2000";LC_NAME
-category  "ar_LY:2000";LC_ADDRESS
-category  "ar_LY:2000";LC_TELEPHONE
-category  "ar_LY: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_CTYPE
diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA
index 40d74c18f9..c125e289a4 100644
--- a/localedata/locales/ar_MA
+++ b/localedata/locales/ar_MA
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Morocco"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_MA:2000";LC_IDENTIFICATION
-category  "ar_MA:2000";LC_CTYPE
-category  "ar_MA:2000";LC_COLLATE
-category  "ar_MA:2000";LC_TIME
-category  "ar_MA:2000";LC_NUMERIC
-category  "ar_MA:2000";LC_MONETARY
-category  "ar_MA:2000";LC_MESSAGES
-category  "ar_MA:2000";LC_PAPER
-category  "ar_MA:2000";LC_NAME
-category  "ar_MA:2000";LC_ADDRESS
-category  "ar_MA:2000";LC_TELEPHONE
-category  "ar_MA: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_CTYPE
diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM
index 48ae504e44..c5abe9760c 100644
--- a/localedata/locales/ar_OM
+++ b/localedata/locales/ar_OM
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Oman"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_OM:2000";LC_IDENTIFICATION
-category  "ar_OM:2000";LC_CTYPE
-category  "ar_OM:2000";LC_COLLATE
-category  "ar_OM:2000";LC_TIME
-category  "ar_OM:2000";LC_NUMERIC
-category  "ar_OM:2000";LC_MONETARY
-category  "ar_OM:2000";LC_MESSAGES
-category  "ar_OM:2000";LC_PAPER
-category  "ar_OM:2000";LC_NAME
-category  "ar_OM:2000";LC_ADDRESS
-category  "ar_OM:2000";LC_TELEPHONE
-category  "ar_OM: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_CTYPE
diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA
index eb96e66e04..fc6ecb213f 100644
--- a/localedata/locales/ar_QA
+++ b/localedata/locales/ar_QA
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Qatar"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_QA:2000";LC_IDENTIFICATION
-category  "ar_QA:2000";LC_CTYPE
-category  "ar_QA:2000";LC_COLLATE
-category  "ar_QA:2000";LC_TIME
-category  "ar_QA:2000";LC_NUMERIC
-category  "ar_QA:2000";LC_MONETARY
-category  "ar_QA:2000";LC_MESSAGES
-category  "ar_QA:2000";LC_PAPER
-category  "ar_QA:2000";LC_NAME
-category  "ar_QA:2000";LC_ADDRESS
-category  "ar_QA:2000";LC_TELEPHONE
-category  "ar_QA: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_CTYPE
diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
index c7adbff40b..629c464426 100644
--- a/localedata/locales/ar_SA
+++ b/localedata/locales/ar_SA
@@ -25,20 +25,19 @@ language   "Arabic"
 territory  "Saudi Arabia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "ar_SA:2000";LC_IDENTIFICATION
-category  "ar_SA:2000";LC_CTYPE
-category  "ar_SA:2000";LC_COLLATE
-category  "ar_SA:2000";LC_TIME
-category  "ar_SA:2000";LC_NUMERIC
-category  "ar_SA:2000";LC_MONETARY
-category  "ar_SA:2000";LC_MESSAGES
-category  "ar_SA:2000";LC_PAPER
-category  "ar_SA:2000";LC_NAME
-category  "ar_SA:2000";LC_ADDRESS
-category  "ar_SA:2000";LC_TELEPHONE
-category  "ar_SA: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_CTYPE
diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD
index 0dfbbf4fc4..05594fc3a7 100644
--- a/localedata/locales/ar_SD
+++ b/localedata/locales/ar_SD
@@ -29,20 +29,19 @@ language   "Arabic"
 territory  "Sudan"
 revision   "1.1"
 date       "2000-07-20"
-%
-category  "ar_SD:2000";LC_IDENTIFICATION
-category  "ar_SD:2000";LC_CTYPE
-category  "ar_SD:2000";LC_COLLATE
-category  "ar_SD:2000";LC_TIME
-category  "ar_SD:2000";LC_NUMERIC
-category  "ar_SD:2000";LC_MONETARY
-category  "ar_SD:2000";LC_MESSAGES
-category  "ar_SD:2000";LC_PAPER
-category  "ar_SD:2000";LC_NAME
-category  "ar_SD:2000";LC_ADDRESS
-category  "ar_SD:2000";LC_TELEPHONE
-category  "ar_SD: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_CTYPE
diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS
index b379f5b2bb..fa808cd0c3 100644
--- a/localedata/locales/ar_SS
+++ b/localedata/locales/ar_SS
@@ -29,20 +29,19 @@ language   "Arabic"
 territory  "South Sudan"
 revision   "1.1"
 date       "2000-07-20"
-%
-category  "ar_SS:2000";LC_IDENTIFICATION
-category  "ar_SS:2000";LC_CTYPE
-category  "ar_SS:2000";LC_COLLATE
-category  "ar_SS:2000";LC_TIME
-category  "ar_SS:2000";LC_NUMERIC
-category  "ar_SS:2000";LC_MONETARY
-category  "ar_SS:2000";LC_MESSAGES
-category  "ar_SS:2000";LC_PAPER
-category  "ar_SS:2000";LC_NAME
-category  "ar_SS:2000";LC_ADDRESS
-category  "ar_SS:2000";LC_TELEPHONE
-category  "ar_SS: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_CTYPE
diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY
index 4901286ae0..5c93683009 100644
--- a/localedata/locales/ar_SY
+++ b/localedata/locales/ar_SY
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Syria"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_SY:2000";LC_IDENTIFICATION
-category  "ar_SY:2000";LC_CTYPE
-category  "ar_SY:2000";LC_COLLATE
-category  "ar_SY:2000";LC_TIME
-category  "ar_SY:2000";LC_NUMERIC
-category  "ar_SY:2000";LC_MONETARY
-category  "ar_SY:2000";LC_MESSAGES
-category  "ar_SY:2000";LC_PAPER
-category  "ar_SY:2000";LC_NAME
-category  "ar_SY:2000";LC_ADDRESS
-category  "ar_SY:2000";LC_TELEPHONE
-category  "ar_SY: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_CTYPE
diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN
index 5880b6883f..57d20a26ce 100644
--- a/localedata/locales/ar_TN
+++ b/localedata/locales/ar_TN
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Tunisia"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_TN:2000";LC_IDENTIFICATION
-category  "ar_TN:2000";LC_CTYPE
-category  "ar_TN:2000";LC_COLLATE
-category  "ar_TN:2000";LC_TIME
-category  "ar_TN:2000";LC_NUMERIC
-category  "ar_TN:2000";LC_MONETARY
-category  "ar_TN:2000";LC_MESSAGES
-category  "ar_TN:2000";LC_PAPER
-category  "ar_TN:2000";LC_NAME
-category  "ar_TN:2000";LC_ADDRESS
-category  "ar_TN:2000";LC_TELEPHONE
-category  "ar_TN: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_CTYPE
diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE
index 5ada780e86..b58583f511 100644
--- a/localedata/locales/ar_YE
+++ b/localedata/locales/ar_YE
@@ -24,20 +24,19 @@ language   "Arabic"
 territory  "Yemen"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ar_YE:2000";LC_IDENTIFICATION
-category  "ar_YE:2000";LC_CTYPE
-category  "ar_YE:2000";LC_COLLATE
-category  "ar_YE:2000";LC_TIME
-category  "ar_YE:2000";LC_NUMERIC
-category  "ar_YE:2000";LC_MONETARY
-category  "ar_YE:2000";LC_MESSAGES
-category  "ar_YE:2000";LC_PAPER
-category  "ar_YE:2000";LC_NAME
-category  "ar_YE:2000";LC_ADDRESS
-category  "ar_YE:2000";LC_TELEPHONE
-category  "ar_YE: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_CTYPE
diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN
index 34e7a8b63c..e731d8f09f 100644
--- a/localedata/locales/as_IN
+++ b/localedata/locales/as_IN
@@ -23,19 +23,19 @@ language    "Assamese"
 territory   "India"
 revision    "1.0"
 date        "2006-05-25"
-%
-category  "as_IN:2000";LC_IDENTIFICATION
-category  "as_IN:2000";LC_CTYPE
-category  "as_IN:2000";LC_COLLATE
-category  "as_IN:2000";LC_TIME
-category  "as_IN:2000";LC_NUMERIC
-category  "as_IN:2000";LC_MONETARY
-category  "as_IN:2000";LC_MESSAGES
-category  "as_IN:2000";LC_PAPER
-category  "as_IN:2000";LC_NAME
-category  "as_IN:2000";LC_ADDRESS
-category  "as_IN:2000";LC_TELEPHONE
-category  "as_IN: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
 
 %%%%%%%%%%%%%
diff --git a/localedata/locales/ast_ES b/localedata/locales/ast_ES
index 650a6a131a..aa27884ec0 100644
--- a/localedata/locales/ast_ES
+++ b/localedata/locales/ast_ES
@@ -36,19 +36,19 @@ language   "Asturian"
 territory  "Spain"
 revision   "1.0"
 date       "2005-08-26"
-%
-category  "ast_ES:2000";LC_IDENTIFICATION
-category  "ast_ES:2000";LC_CTYPE
-category  "ast_ES:2000";LC_COLLATE
-category  "ast_ES:2000";LC_TIME
-category  "ast_ES:2000";LC_NUMERIC
-category  "ast_ES:2000";LC_MONETARY
-category  "ast_ES:2000";LC_MESSAGES
-category  "ast_ES:2000";LC_PAPER
-category  "ast_ES:2000";LC_NAME
-category  "ast_ES:2000";LC_ADDRESS
-category  "ast_ES:2000";LC_TELEPHONE
-category  "ast_ES: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
diff --git a/localedata/locales/ayc_PE b/localedata/locales/ayc_PE
index a87e266a6c..9ad3bbad4c 100644
--- a/localedata/locales/ayc_PE
+++ b/localedata/locales/ayc_PE
@@ -46,19 +46,19 @@ language  "Aymara"
 territory "Peru"
 revision  "1.1"
 date      "2011-11-13"
-%
-category  "ayc_PE:2011";LC_IDENTIFICATION
-category  "ayc_PE:2011";LC_CTYPE
-category  "ayc_PE:2011";LC_COLLATE
-category  "ayc_PE:2011";LC_TIME
-category  "ayc_PE:2011";LC_NUMERIC
-category  "ayc_PE:2011";LC_MONETARY
-category  "ayc_PE:2011";LC_PAPER
-category  "ayc_PE:2011";LC_MEASUREMENT
-category  "ayc_PE:2011";LC_MESSAGES
-category  "ayc_PE:2011";LC_NAME
-category  "ayc_PE:2011";LC_ADDRESS
-category  "ayc_PE:2011";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
index 9650e65c5b..a6dc6b0bb2 100644
--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@@ -33,18 +33,17 @@ territory "Azerbaijan"
 revision "0.4"
 date "2001-01-26"
 
-category az_AZ:2000;LC_IDENTIFICATION
-category az_AZ:2000;LC_CTYPE
-category az_AZ:2000;LC_COLLATE
-category az_AZ:2000;LC_TIME
-category az_AZ:2000;LC_NUMERIC
-category az_AZ:2000;LC_PAPER
-category az_AZ:2000;LC_TELEPHONE
-category az_AZ:2000;LC_MEASUREMENT
-category az_AZ:2000;LC_ADDRESS
-category az_AZ:2000;LC_MONETARY
-category az_AZ:2000;LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 %
diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY
index 88094303ce..877de4c6c1 100644
--- a/localedata/locales/be_BY
+++ b/localedata/locales/be_BY
@@ -31,19 +31,19 @@ language   "Belarusian"
 territory  "Belarus"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "be_BY:2000";LC_IDENTIFICATION
-category  "be_BY:2000";LC_CTYPE
-category  "be_BY:2000";LC_COLLATE
-category  "be_BY:2000";LC_TIME
-category  "be_BY:2000";LC_NUMERIC
-category  "be_BY:2000";LC_MONETARY
-category  "be_BY:2000";LC_MESSAGES
-category  "be_BY:2000";LC_PAPER
-category  "be_BY:2000";LC_NAME
-category  "be_BY:2000";LC_ADDRESS
-category  "be_BY:2000";LC_TELEPHONE
-category  "be_BY: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
diff --git a/localedata/locales/be_BY@latin b/localedata/locales/be_BY@latin
index b61cdadab7..d7397ba35d 100644
--- a/localedata/locales/be_BY@latin
+++ b/localedata/locales/be_BY@latin
@@ -31,19 +31,19 @@ language   "Belarusian"
 territory  "Belarus"
 revision   "1.0"
 date       "2005-09-15"
-%
-category  "be_BY@latin:2000";LC_IDENTIFICATION
-category  "be_BY@latin:2000";LC_CTYPE
-category  "be_BY@latin:2000";LC_COLLATE
-category  "be_BY@latin:2000";LC_TIME
-category  "be_BY@latin:2000";LC_NUMERIC
-category  "be_BY@latin:2000";LC_MONETARY
-category  "be_BY@latin:2000";LC_MESSAGES
-category  "be_BY@latin:2000";LC_PAPER
-category  "be_BY@latin:2000";LC_NAME
-category  "be_BY@latin:2000";LC_ADDRESS
-category  "be_BY@latin:2000";LC_TELEPHONE
-category  "be_BY@latin: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_CTYPE
diff --git a/localedata/locales/bem_ZM b/localedata/locales/bem_ZM
index d0e5eca1a5..f17e70a671 100644
--- a/localedata/locales/bem_ZM
+++ b/localedata/locales/bem_ZM
@@ -22,19 +22,19 @@ language  "Bemba"
 territory "Zambia"
 revision  "1.0"
 date      "2011-04-18"
-%
-category  "bem_ZM:2000";LC_IDENTIFICATION
-category  "bem_ZM:2000";LC_CTYPE
-category  "bem_ZM:2000";LC_COLLATE
-category  "bem_ZM:2000";LC_TIME
-category  "bem_ZM:2000";LC_NUMERIC
-category  "bem_ZM:2000";LC_MONETARY
-category  "bem_ZM:2000";LC_PAPER
-category  "bem_ZM:2000";LC_MEASUREMENT
-category  "bem_ZM:2000";LC_MESSAGES
-category  "bem_ZM:2000";LC_NAME
-category  "bem_ZM:2000";LC_ADDRESS
-category  "bem_ZM:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ
index 7ac64ed980..d699503b3f 100644
--- a/localedata/locales/ber_DZ
+++ b/localedata/locales/ber_DZ
@@ -33,18 +33,17 @@ territory "Algeria"
 revision "0.1"
 date "2002-04-16"
 
-category ber_DZ:2000;LC_IDENTIFICATION
-category ber_DZ:2000;LC_CTYPE
-category ber_DZ:2000;LC_COLLATE
-category ber_DZ:2000;LC_TIME
-category ber_DZ:2000;LC_NUMERIC
-category ber_DZ:2000;LC_PAPER
-category ber_DZ:2000;LC_TELEPHONE
-category ber_DZ:2000;LC_MEASUREMENT
-category ber_DZ:2000;LC_ADDRESS
-category ber_DZ:2000;LC_MONETARY
-category ber_DZ:2000;LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 %
diff --git a/localedata/locales/ber_MA b/localedata/locales/ber_MA
index 9ebf7f7924..1f888fbdfc 100644
--- a/localedata/locales/ber_MA
+++ b/localedata/locales/ber_MA
@@ -33,18 +33,17 @@ territory "Morocco"
 revision "0.1"
 date "2002-06-26"
 
-category ber_MA:2000;LC_IDENTIFICATION
-category ber_MA:2000;LC_CTYPE
-category ber_MA:2000;LC_COLLATE
-category ber_MA:2000;LC_TIME
-category ber_MA:2000;LC_NUMERIC
-category ber_MA:2000;LC_PAPER
-category ber_MA:2000;LC_TELEPHONE
-category ber_MA:2000;LC_MEASUREMENT
-category ber_MA:2000;LC_ADDRESS
-category ber_MA:2000;LC_MONETARY
-category ber_MA:2000;LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 %
diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG
index b1b2ffe657..a46418d765 100644
--- a/localedata/locales/bg_BG
+++ b/localedata/locales/bg_BG
@@ -30,18 +30,18 @@ territory  "Bulgaria"
 revision   "2.0.1"
 date       "2002-09-10"
 
-category  "bg_BG:2000";LC_IDENTIFICATION
-category  "bg_BG:2000";LC_CTYPE
-category  "bg_BG:2000";LC_COLLATE
-category  "bg_BG:2000";LC_TIME
-category  "bg_BG:2000";LC_NUMERIC
-category  "bg_BG:2000";LC_MONETARY
-category  "bg_BG:2000";LC_MESSAGES
-category  "bg_BG:2000";LC_PAPER
-category  "bg_BG:2000";LC_NAME
-category  "bg_BG:2000";LC_ADDRESS
-category  "bg_BG:2000";LC_TELEPHONE
-category  "bg_BG: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_CTYPE
diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN
index 87cc8a5ee0..fd93137b7b 100644
--- a/localedata/locales/bhb_IN
+++ b/localedata/locales/bhb_IN
@@ -23,20 +23,19 @@ language   "Bhili"
 territory  "India"
 revision   "0.1"
 date       "2014-09-30"
-%
-category  "bhb_IN:2014";LC_IDENTIFICATION
-category  "bhb_IN:2014";LC_CTYPE
-category  "bhb_IN:2014";LC_COLLATE
-category  "bhb_IN:2014";LC_TIME
-category  "bhb_IN:2014";LC_NUMERIC
-category  "bhb_IN:2014";LC_MONETARY
-category  "bhb_IN:2014";LC_MESSAGES
-category  "bhb_IN:2014";LC_PAPER
-category  "bhb_IN:2014";LC_NAME
-category  "bhb_IN:2014";LC_ADDRESS
-category  "bhb_IN:2014";LC_TELEPHONE
-category  "bhb_IN:2014";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_CTYPE
diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN
index d9f5ff3bb2..073fa7d3a3 100644
--- a/localedata/locales/bho_IN
+++ b/localedata/locales/bho_IN
@@ -25,19 +25,19 @@ language   "Bhojpuri"
 territory  "India"
 revision   "0.1"
 date       "2011-12-20"
-%
-category  "bho_IN:2011";LC_IDENTIFICATION
-category  "bho_IN:2011";LC_CTYPE
-category  "bho_IN:2011";LC_COLLATE
-category  "bho_IN:2011";LC_TIME
-category  "bho_IN:2011";LC_NUMERIC
-category  "bho_IN:2011";LC_MONETARY
-category  "bho_IN:2011";LC_MESSAGES
-category  "bho_IN:2011";LC_PAPER
-category  "bho_IN:2011";LC_NAME
-category  "bho_IN:2011";LC_ADDRESS
-category  "bho_IN:2011";LC_TELEPHONE
-category  "bho_IN:2011";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_CTYPE
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index da508fa93f..ba60104f11 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -23,19 +23,18 @@ territory  "Bangladesh"
 revision   "0.5"
 date       "2007-01-10"
 
-category "bn_BD:2001";LC_IDENTIFICATION
-category "bn_BD:2001";LC_COLLATE
-category "bn_BD:2001";LC_CTYPE
-category "bn_BD:2001";LC_MESSAGES
-category "bn_BD:2001";LC_MONETARY
-category "bn_BD:2001";LC_NUMERIC
-category "bn_BD:2001";LC_TIME
-category "bn_BD:2001";LC_PAPER
-category "bn_BD:2001";LC_MEASUREMENT
-category "bn_BD:2001";LC_TELEPHONE
-category "bn_BD:2001";LC_ADDRESS
-category "bn_BD:2001";LC_NAME
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_NAME
 END LC_IDENTIFICATION
 
 LC_COLLATE
diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
index 1e3249055f..7a0d1a3574 100644
--- a/localedata/locales/bn_IN
+++ b/localedata/locales/bn_IN
@@ -24,19 +24,19 @@ language    "Bengali"
 territory   "India"
 revision    "1.0"
 date        "2006-05-29"
-%
-category  "bn_IN:2000";LC_IDENTIFICATION
-category  "bn_IN:2000";LC_CTYPE
-category  "bn_IN:2000";LC_COLLATE
-category  "bn_IN:2000";LC_TIME
-category  "bn_IN:2000";LC_NUMERIC
-category  "bn_IN:2000";LC_MONETARY
-category  "bn_IN:2000";LC_MESSAGES
-category  "bn_IN:2000";LC_PAPER
-category  "bn_IN:2000";LC_NAME
-category  "bn_IN:2000";LC_ADDRESS
-category  "bn_IN:2000";LC_TELEPHONE
-category  "bn_IN: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
 
 
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
index a110894c0b..cf23b27aee 100644
--- a/localedata/locales/bo_CN
+++ b/localedata/locales/bo_CN
@@ -24,18 +24,18 @@ language   "Tibetan"
 territory  "China"
 revision   "0.1"
 date       "2007-11-06"
-%
-category  "bo_CN:2007";LC_IDENTIFICATION
-category  "bo_CN:2007";LC_CTYPE
-category  "bo_CN:2007";LC_COLLATE
-category  "bo_CN:2007";LC_NUMERIC
-category  "bo_CN:2007";LC_MONETARY
-category  "bo_CN:2007";LC_MESSAGES
-category  "bo_CN:2007";LC_PAPER
-category  "bo_CN:2007";LC_NAME
-category  "bo_CN:2007";LC_ADDRESS
-category  "bo_CN:2007";LC_TELEPHONE
-category  "bo_CN:2007";LC_MEASUREMENT
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+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_CTYPE
diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN
index 4c66275a8a..d255ab4800 100644
--- a/localedata/locales/bo_IN
+++ b/localedata/locales/bo_IN
@@ -24,18 +24,18 @@ language   "Tibetan"
 territory  "India"
 revision   "0.1"
 date       "2007-11-06"
-%
-category  "bo_IN:2007";LC_IDENTIFICATION
-category  "bo_IN:2007";LC_CTYPE
-category  "bo_IN:2007";LC_COLLATE
-category  "bo_IN:2007";LC_NUMERIC
-category  "bo_IN:2007";LC_MONETARY
-category  "bo_IN:2007";LC_MESSAGES
-category  "bo_IN:2007";LC_PAPER
-category  "bo_IN:2007";LC_NAME
-category  "bo_IN:2007";LC_ADDRESS
-category  "bo_IN:2007";LC_TELEPHONE
-category  "bo_IN:2007";LC_MEASUREMENT
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+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_CTYPE
diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
index 3f7b424ef3..5a4c214c3e 100644
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@@ -35,18 +35,17 @@ territory "France"
 revision "0.54"
 date "2001-01-28"
 
-category br_FR:2000;LC_IDENTIFICATION
-category br_FR:2000;LC_CTYPE
-category br_FR:2000;LC_COLLATE
-category br_FR:2000;LC_TIME
-category br_FR:2000;LC_NUMERIC
-category br_FR:2000;LC_PAPER
-category br_FR:2000;LC_TELEPHONE
-category br_FR:2000;LC_MEASUREMENT
-category br_FR:2000;LC_ADDRESS
-category br_FR:2000;LC_MONETARY
-category br_FR:2000;LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/br_FR@euro b/localedata/locales/br_FR@euro
index 5d72c47bc3..11210e72b0 100644
--- a/localedata/locales/br_FR@euro
+++ b/localedata/locales/br_FR@euro
@@ -27,19 +27,19 @@ language   "Breton"
 territory  "France"
 revision   "1.0"
 date       "2002-02-28"
-%
-category  "br_FR@euro:2000";LC_IDENTIFICATION
-category  "br_FR@euro:2000";LC_CTYPE
-category  "br_FR@euro:2000";LC_COLLATE
-category  "br_FR@euro:2000";LC_TIME
-category  "br_FR@euro:2000";LC_NUMERIC
-category  "br_FR@euro:2000";LC_MONETARY
-category  "br_FR@euro:2000";LC_MESSAGES
-category  "br_FR@euro:2000";LC_PAPER
-category  "br_FR@euro:2000";LC_NAME
-category  "br_FR@euro:2000";LC_ADDRESS
-category  "br_FR@euro:2000";LC_TELEPHONE
-category  "br_FR@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_CTYPE
diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN
index 90385e290e..97ebca0ed1 100644
--- a/localedata/locales/brx_IN
+++ b/localedata/locales/brx_IN
@@ -24,19 +24,19 @@ language   "Bodo"
 territory  "India"
 revision   "1.0"
 date       "2011-10-17"
-%
-category  "brx_IN:2011";LC_IDENTIFICATION
-category  "brx_IN:2011";LC_CTYPE
-category  "brx_IN:2011";LC_COLLATE
-category  "brx_IN:2011";LC_TIME
-category  "brx_IN:2011";LC_NUMERIC
-category  "brx_IN:2011";LC_MONETARY
-category  "brx_IN:2011";LC_MESSAGES
-category  "brx_IN:2011";LC_PAPER
-category  "brx_IN:2011";LC_NAME
-category  "brx_IN:2011";LC_ADDRESS
-category  "brx_IN:2011";LC_TELEPHONE
-category  "brx_IN:2011";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_CTYPE
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index 58595bb6e3..74427dabda 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -36,18 +36,17 @@ territory "Bosnia & Herzegovina"
 revision "0.4"
 date "2004-01-09"
 
-category bs_BA:2000;LC_IDENTIFICATION
-category bs_BA:2000;LC_CTYPE
-category bs_BA:2000;LC_COLLATE
-category bs_BA:2000;LC_TIME
-category bs_BA:2000;LC_NUMERIC
-category bs_BA:2000;LC_PAPER
-category bs_BA:2000;LC_TELEPHONE
-category bs_BA:2000;LC_MEASUREMENT
-category bs_BA:2000;LC_ADDRESS
-category bs_BA:2000;LC_MONETARY
-category bs_BA:2000;LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 LC_COLLATE
diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
index 9df1844766..542c6f2629 100644
--- a/localedata/locales/byn_ER
+++ b/localedata/locales/byn_ER
@@ -35,20 +35,19 @@ language   "Blin"
 territory  "Eritrea"
 revision   "0.21"
 date       "2003-11-01"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD
index 153666c022..77c40471e9 100644
--- a/localedata/locales/ca_AD
+++ b/localedata/locales/ca_AD
@@ -30,19 +30,19 @@ language   "Catalan"
 territory  "Andorra"
 revision   "1.0"
 date       "2006-01-16"
-%
-category  "ca_AD:2000";LC_IDENTIFICATION
-category  "ca_AD:2000";LC_CTYPE
-category  "ca_AD:2000";LC_COLLATE
-category  "ca_AD:2000";LC_TIME
-category  "ca_AD:2000";LC_NUMERIC
-category  "ca_AD:2000";LC_MONETARY
-category  "ca_AD:2000";LC_MESSAGES
-category  "ca_AD:2000";LC_PAPER
-category  "ca_AD:2000";LC_NAME
-category  "ca_AD:2000";LC_ADDRESS
-category  "ca_AD:2000";LC_TELEPHONE
-category  "ca_AD: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
diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index 316bb9d056..d943610cdb 100644
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -34,19 +34,19 @@ language   "Catalan"
 territory  "Spain"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "ca_ES:2000";LC_IDENTIFICATION
-category  "ca_ES:2000";LC_CTYPE
-category  "ca_ES:2000";LC_COLLATE
-category  "ca_ES:2000";LC_TIME
-category  "ca_ES:2000";LC_NUMERIC
-category  "ca_ES:2000";LC_MONETARY
-category  "ca_ES:2000";LC_MESSAGES
-category  "ca_ES:2000";LC_PAPER
-category  "ca_ES:2000";LC_NAME
-category  "ca_ES:2000";LC_ADDRESS
-category  "ca_ES:2000";LC_TELEPHONE
-category  "ca_ES: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
diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index 9c9f593a25..bdec0c95ad 100644
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_ES@euro
@@ -30,19 +30,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
diff --git a/localedata/locales/ca_FR b/localedata/locales/ca_FR
index 6520a2ddf5..1107ae1f2f 100644
--- a/localedata/locales/ca_FR
+++ b/localedata/locales/ca_FR
@@ -30,19 +30,19 @@ language   "Catalan"
 territory  "France"
 revision   "1.0"
 date       "2006-01-16"
-%
-category  "ca_FR:2000";LC_IDENTIFICATION
-category  "ca_FR:2000";LC_CTYPE
-category  "ca_FR:2000";LC_COLLATE
-category  "ca_FR:2000";LC_TIME
-category  "ca_FR:2000";LC_NUMERIC
-category  "ca_FR:2000";LC_MONETARY
-category  "ca_FR:2000";LC_MESSAGES
-category  "ca_FR:2000";LC_PAPER
-category  "ca_FR:2000";LC_NAME
-category  "ca_FR:2000";LC_ADDRESS
-category  "ca_FR:2000";LC_TELEPHONE
-category  "ca_FR: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
diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT
index 310a442980..c4f816fc0a 100644
--- a/localedata/locales/ca_IT
+++ b/localedata/locales/ca_IT
@@ -30,19 +30,19 @@ language   "Catalan"
 territory  "Italy"
 revision   "1.0"
 date       "2006-01-16"
-%
-category  "ca_IT:2000";LC_IDENTIFICATION
-category  "ca_IT:2000";LC_CTYPE
-category  "ca_IT:2000";LC_COLLATE
-category  "ca_IT:2000";LC_TIME
-category  "ca_IT:2000";LC_NUMERIC
-category  "ca_IT:2000";LC_MONETARY
-category  "ca_IT:2000";LC_MESSAGES
-category  "ca_IT:2000";LC_PAPER
-category  "ca_IT:2000";LC_NAME
-category  "ca_IT:2000";LC_ADDRESS
-category  "ca_IT:2000";LC_TELEPHONE
-category  "ca_IT: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
diff --git a/localedata/locales/ce_RU b/localedata/locales/ce_RU
index eeb0531531..2780ea2470 100644
--- a/localedata/locales/ce_RU
+++ b/localedata/locales/ce_RU
@@ -19,19 +19,19 @@ language  "Chechen"
 territory "Russia"
 revision  "1.0"
 date      "2014-08-25"
-%
-category  "ce_RU:2014";LC_IDENTIFICATION
-category  "ce_RU:2014";LC_CTYPE
-category  "ce_RU:2014";LC_COLLATE
-category  "ce_RU:2014";LC_TIME
-category  "ce_RU:2014";LC_NUMERIC
-category  "ce_RU:2014";LC_MONETARY
-category  "ce_RU:2014";LC_PAPER
-category  "ce_RU:2014";LC_MEASUREMENT
-category  "ce_RU:2014";LC_MESSAGES
-category  "ce_RU:2014";LC_NAME
-category  "ce_RU:2014";LC_ADDRESS
-category  "ce_RU:2014";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index ae74e99a64..7bf4bbe2dd 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -32,19 +32,19 @@ language     "Mandarin Chinese"
 territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
-%
-category  "cmn_TW:2000";LC_IDENTIFICATION
-category  "cmn_TW:2000";LC_CTYPE
-category  "cmn_TW:2000";LC_COLLATE
-category  "cmn_TW:2000";LC_TIME
-category  "cmn_TW:2000";LC_NUMERIC
-category  "cmn_TW:2000";LC_MONETARY
-category  "cmn_TW:2000";LC_PAPER
-category  "cmn_TW:2000";LC_MEASUREMENT
-category  "cmn_TW:2000";LC_MESSAGES
-category  "cmn_TW:2000";LC_NAME
-category  "cmn_TW:2000";LC_ADDRESS
-category  "cmn_TW:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA
index ebeffbfb66..bcc42699ca 100644
--- a/localedata/locales/crh_UA
+++ b/localedata/locales/crh_UA
@@ -33,19 +33,18 @@ territory	"Ukraine"
 revision	"0.4"
 date		"2009-08-16"
 
-category crh_UA:2000;LC_IDENTIFICATION
-category crh_UA:2000;LC_CTYPE
-category crh_UA:2000;LC_COLLATE
-category crh_UA:2000;LC_TIME
-category crh_UA:2000;LC_NUMERIC
-category crh_UA:2000;LC_PAPER
-category crh_UA:2000;LC_TELEPHONE
-category crh_UA:2000;LC_MEASUREMENT
-category crh_UA:2000;LC_ADDRESS
-category crh_UA:2000;LC_MONETARY
-category crh_UA:2000;LC_MESSAGES
-category crh_UA:2000;LC_NAME
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
 END LC_IDENTIFICATION
 
 %
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 3dd4893914..cbc4086a70 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -121,19 +121,19 @@ language   "Czech"
 territory  "Czech Republic"
 revision   "1.0"
 date       "2000-06-28"
-%
-category  "cs_CZ:2000";LC_IDENTIFICATION
-category  "cs_CZ:2000";LC_CTYPE
-category  "cs_CZ:2000";LC_COLLATE
-category  "cs_CZ:2000";LC_TIME
-category  "cs_CZ:2000";LC_NUMERIC
-category  "cs_CZ:2000";LC_MONETARY
-category  "cs_CZ:2000";LC_MESSAGES
-category  "cs_CZ:2000";LC_PAPER
-category  "cs_CZ:2000";LC_NAME
-category  "cs_CZ:2000";LC_ADDRESS
-category  "cs_CZ:2000";LC_TELEPHONE
-category  "cs_CZ: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
 
 %% Pořadí znaků
diff --git a/localedata/locales/csb_PL b/localedata/locales/csb_PL
index 1bc460592b..d3cfa5c86b 100644
--- a/localedata/locales/csb_PL
+++ b/localedata/locales/csb_PL
@@ -37,19 +37,19 @@ date       "2006-07-25"
 audience   "general"
 application   "GNU locale"
 abbreviation  ""
-%
-category  "csb_PL:2000";LC_IDENTIFICATION
-category  "csb_PL:2000";LC_CTYPE
-category  "csb_PL:2000";LC_COLLATE
-category  "csb_PL:2000";LC_TIME
-category  "csb_PL:2000";LC_NUMERIC
-category  "csb_PL:2000";LC_MONETARY
-category  "csb_PL:2000";LC_MESSAGES
-category  "csb_PL:2000";LC_PAPER
-category  "csb_PL:2000";LC_NAME
-category  "csb_PL:2000";LC_ADDRESS
-category  "csb_PL:2000";LC_TELEPHONE
-category  "csb_PL: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_CTYPE
diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU
index 6cacea31e7..90b8b4d35a 100644
--- a/localedata/locales/cv_RU
+++ b/localedata/locales/cv_RU
@@ -35,19 +35,19 @@ language   "Chuvash"
 territory  "Russia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "cv_RU:2000";LC_IDENTIFICATION
-category  "cv_RU:2000";LC_CTYPE
-category  "cv_RU:2000";LC_COLLATE
-category  "cv_RU:2000";LC_TIME
-category  "cv_RU:2000";LC_NUMERIC
-category  "cv_RU:2000";LC_MONETARY
-category  "cv_RU:2000";LC_MESSAGES
-category  "cv_RU:2000";LC_PAPER
-category  "cv_RU:2000";LC_NAME
-category  "cv_RU:2000";LC_ADDRESS
-category  "cv_RU:2000";LC_TELEPHONE
-category  "cv_RU: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
diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 5475dfeb7b..b4a5f5910c 100644
--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@@ -23,18 +23,17 @@ territory "United Kingdom"
 revision "0.9"
 date "2004-09-27"
 
-category cy_GB:2000;LC_IDENTIFICATION
-category cy_GB:2000;LC_CTYPE
-category cy_GB:2000;LC_COLLATE
-category cy_GB:2000;LC_TIME
-category cy_GB:2000;LC_NUMERIC
-category cy_GB:2000;LC_PAPER
-category cy_GB:2000;LC_TELEPHONE
-category cy_GB:2000;LC_MEASUREMENT
-category cy_GB:2000;LC_ADDRESS
-category cy_GB:2000;LC_MESSAGES
-category cy_GB:2000;LC_MONETARY
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index 3519a35a3c..8ca540cfd2 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -43,19 +43,19 @@ language   "Danish"
 territory  "Denmark"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "da_DK:2000";LC_IDENTIFICATION
-category  "da_DK:2000";LC_CTYPE
-category  "da_DK:2000";LC_COLLATE
-category  "da_DK:2000";LC_TIME
-category  "da_DK:2000";LC_NUMERIC
-category  "da_DK:2000";LC_MONETARY
-category  "da_DK:2000";LC_MESSAGES
-category  "da_DK:2000";LC_PAPER
-category  "da_DK:2000";LC_NAME
-category  "da_DK:2000";LC_ADDRESS
-category  "da_DK:2000";LC_TELEPHONE
-category  "da_DK: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
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index f26c8caed0..9e69524018 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -34,19 +34,19 @@ language   "Austrian 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
-category  "de_AT: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_CTYPE
diff --git a/localedata/locales/de_AT@euro b/localedata/locales/de_AT@euro
index 824e853cac..6c977c622d 100644
--- a/localedata/locales/de_AT@euro
+++ b/localedata/locales/de_AT@euro
@@ -34,19 +34,19 @@ language   "German"
 territory  "Austria"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "de_AT@euro:2000";LC_IDENTIFICATION
-category  "de_AT@euro:2000";LC_CTYPE
-category  "de_AT@euro:2000";LC_COLLATE
-category  "de_AT@euro:2000";LC_TIME
-category  "de_AT@euro:2000";LC_NUMERIC
-category  "de_AT@euro:2000";LC_MONETARY
-category  "de_AT@euro:2000";LC_MESSAGES
-category  "de_AT@euro:2000";LC_PAPER
-category  "de_AT@euro:2000";LC_NAME
-category  "de_AT@euro:2000";LC_ADDRESS
-category  "de_AT@euro:2000";LC_TELEPHONE
-category  "de_AT@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_CTYPE
diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 24c35e1b64..b83c2dcaed 100644
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -35,19 +35,19 @@ language   "German"
 territory  "Belgium"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "de_BE:2000";LC_IDENTIFICATION
-category  "de_BE:2000";LC_CTYPE
-category  "de_BE:2000";LC_COLLATE
-category  "de_BE:2000";LC_TIME
-category  "de_BE:2000";LC_NUMERIC
-category  "de_BE:2000";LC_MONETARY
-category  "de_BE:2000";LC_MESSAGES
-category  "de_BE:2000";LC_PAPER
-category  "de_BE:2000";LC_NAME
-category  "de_BE:2000";LC_ADDRESS
-category  "de_BE:2000";LC_TELEPHONE
-category  "de_BE: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
diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro
index a5ab1428e2..22ea14bea4 100644
--- a/localedata/locales/de_BE@euro
+++ b/localedata/locales/de_BE@euro
@@ -28,19 +28,19 @@ language   "German"
 territory  "Belgium"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "de_BE@euro:2000";LC_IDENTIFICATION
-category  "de_BE@euro:2000";LC_CTYPE
-category  "de_BE@euro:2000";LC_COLLATE
-category  "de_BE@euro:2000";LC_TIME
-category  "de_BE@euro:2000";LC_NUMERIC
-category  "de_BE@euro:2000";LC_MONETARY
-category  "de_BE@euro:2000";LC_MESSAGES
-category  "de_BE@euro:2000";LC_PAPER
-category  "de_BE@euro:2000";LC_NAME
-category  "de_BE@euro:2000";LC_ADDRESS
-category  "de_BE@euro:2000";LC_TELEPHONE
-category  "de_BE@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
diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH
index 9ecbd39d71..12323d39a7 100644
--- a/localedata/locales/de_CH
+++ b/localedata/locales/de_CH
@@ -34,19 +34,19 @@ language   "Swiss High German"
 territory  "Switzerland"
 revision   "1.0"
 date       "2007-09-23"
-%
-category  "de_CH:2000";LC_IDENTIFICATION
-category  "de_CH:2000";LC_CTYPE
-category  "de_CH:2000";LC_COLLATE
-category  "de_CH:2000";LC_TIME
-category  "de_CH:2000";LC_NUMERIC
-category  "de_CH:2000";LC_MONETARY
-category  "de_CH:2000";LC_MESSAGES
-category  "de_CH:2000";LC_PAPER
-category  "de_CH:2000";LC_NAME
-category  "de_CH:2000";LC_ADDRESS
-category  "de_CH:2000";LC_TELEPHONE
-category  "de_CH: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
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index 55a18811a2..654afaa2b9 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -23,19 +23,19 @@ language   "German"
 territory  "Germany"
 revision   "1.0"
 date       "2000-06-24"
-%
-category  "de_DE:2000";LC_IDENTIFICATION
-category  "de_DE:2000";LC_CTYPE
-category  "de_DE:2000";LC_COLLATE
-category  "de_DE:2000";LC_TIME
-category  "de_DE:2000";LC_NUMERIC
-category  "de_DE:2000";LC_MONETARY
-category  "de_DE:2000";LC_MESSAGES
-category  "de_DE:2000";LC_PAPER
-category  "de_DE:2000";LC_NAME
-category  "de_DE:2000";LC_ADDRESS
-category  "de_DE:2000";LC_TELEPHONE
-category  "de_DE: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_CTYPE
diff --git a/localedata/locales/de_DE@euro b/localedata/locales/de_DE@euro
index e06ec5fd7e..63a3ec9538 100644
--- a/localedata/locales/de_DE@euro
+++ b/localedata/locales/de_DE@euro
@@ -23,19 +23,19 @@ language   "German"
 territory  "Germany"
 revision   "1.0"
 date       "2000-06-24"
-%
-category  "de_DE@euro:2000";LC_IDENTIFICATION
-category  "de_DE@euro:2000";LC_CTYPE
-category  "de_DE@euro:2000";LC_COLLATE
-category  "de_DE@euro:2000";LC_TIME
-category  "de_DE@euro:2000";LC_NUMERIC
-category  "de_DE@euro:2000";LC_MONETARY
-category  "de_DE@euro:2000";LC_MESSAGES
-category  "de_DE@euro:2000";LC_PAPER
-category  "de_DE@euro:2000";LC_NAME
-category  "de_DE@euro:2000";LC_ADDRESS
-category  "de_DE@euro:2000";LC_TELEPHONE
-category  "de_DE@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_CTYPE
diff --git a/localedata/locales/de_IT b/localedata/locales/de_IT
index 3cd144df47..1f9f4b65b1 100644
--- a/localedata/locales/de_IT
+++ b/localedata/locales/de_IT
@@ -33,18 +33,18 @@ territory  "Italy"
 revision   "1.0"
 date       "2000-06-28"
 
-category "i18n:2002";LC_IDENTIFICATION
-category "i18n:2002";LC_CTYPE
-category "i18n:2002";LC_COLLATE
-category "i18n:2002";LC_TIME
-category "i18n:2002";LC_NUMERIC
-category "i18n:2002";LC_MONETARY
-category "i18n:2002";LC_MESSAGES
-category "i18n:2002";LC_PAPER
-category "i18n:2002";LC_NAME
-category "i18n:2002";LC_ADDRESS
-category "i18n:2002";LC_TELEPHONE
-category "i18n:2002";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_CTYPE
diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index 13552d2a77..4f3c57dbb2 100644
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -35,19 +35,19 @@ language   "German"
 territory  "Luxembourg"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "de_LU:2000";LC_IDENTIFICATION
-category  "de_LU:2000";LC_CTYPE
-category  "de_LU:2000";LC_COLLATE
-category  "de_LU:2000";LC_TIME
-category  "de_LU:2000";LC_NUMERIC
-category  "de_LU:2000";LC_MONETARY
-category  "de_LU:2000";LC_MESSAGES
-category  "de_LU:2000";LC_PAPER
-category  "de_LU:2000";LC_NAME
-category  "de_LU:2000";LC_ADDRESS
-category  "de_LU:2000";LC_TELEPHONE
-category  "de_LU: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
diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro
index 6d33f2ed21..b123580883 100644
--- a/localedata/locales/de_LU@euro
+++ b/localedata/locales/de_LU@euro
@@ -28,19 +28,19 @@ language   "German"
 territory  "Luxembourg"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "de_LU:2000@euro";LC_IDENTIFICATION
-category  "de_LU:2000@euro";LC_CTYPE
-category  "de_LU:2000@euro";LC_COLLATE
-category  "de_LU:2000@euro";LC_TIME
-category  "de_LU:2000@euro";LC_NUMERIC
-category  "de_LU:2000@euro";LC_MONETARY
-category  "de_LU:2000@euro";LC_MESSAGES
-category  "de_LU:2000@euro";LC_PAPER
-category  "de_LU:2000@euro";LC_NAME
-category  "de_LU:2000@euro";LC_ADDRESS
-category  "de_LU:2000@euro";LC_TELEPHONE
-category  "de_LU:2000@euro";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
diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
index f5bfae7f45..89c89127cd 100644
--- a/localedata/locales/doi_IN
+++ b/localedata/locales/doi_IN
@@ -23,19 +23,19 @@ language   "Dogri"
 territory  "India"
 revision   "1.0"
 date       "2012-02-16"
-%
-category  "doi_IN:2012";LC_IDENTIFICATION
-category  "doi_IN:2012";LC_CTYPE
-category  "doi_IN:2012";LC_COLLATE
-category  "doi_IN:2012";LC_TIME
-category  "doi_IN:2012";LC_NUMERIC
-category  "doi_IN:2012";LC_MONETARY
-category  "doi_IN:2012";LC_MESSAGES
-category  "doi_IN:2012";LC_PAPER
-category  "doi_IN:2012";LC_NAME
-category  "doi_IN:2012";LC_ADDRESS
-category  "doi_IN:2012";LC_TELEPHONE
-category  "doi_IN:2012";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_CTYPE
diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV
index 40ce6849ce..2ca84b3f31 100644
--- a/localedata/locales/dv_MV
+++ b/localedata/locales/dv_MV
@@ -31,19 +31,19 @@ language   "Divehi"
 territory  "Maldives"
 revision   "0.1"
 date       "2006-05-13"
-%
-category  "dv_MV:2006";LC_IDENTIFICATION
-category  "dv_MV:2006";LC_CTYPE
-category  "dv_MV:2006";LC_COLLATE
-category  "dv_MV:2006";LC_TIME
-category  "dv_MV:2006";LC_NUMERIC
-category  "dv_MV:2006";LC_MONETARY
-category  "dv_MV:2006";LC_MESSAGES
-category  "dv_MV:2006";LC_PAPER
-category  "dv_MV:2006";LC_NAME
-category  "dv_MV:2006";LC_ADDRESS
-category  "dv_MV:2006";LC_TELEPHONE
-category  "dv_MV:2006";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_CTYPE
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index 19849597d8..337b6040ce 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -35,19 +35,19 @@ language   "Dzongkha"
 territory  "Bhutan"
 revision   "0.3"
 date       "2004-09-03"
-%
-category  "dz_BT:2004";LC_IDENTIFICATION
-category  "dz_BT:2004";LC_CTYPE
-category  "dz_BT:2004";LC_TIME
-category  "dz_BT:2004";LC_COLLATE
-category  "dz_BT:2004";LC_NUMERIC
-category  "dz_BT:2004";LC_MONETARY
-category  "dz_BT:2004";LC_MESSAGES
-category  "dz_BT:2004";LC_PAPER
-category  "dz_BT:2004";LC_NAME
-category  "dz_BT:2004";LC_ADDRESS
-category  "dz_BT:2004";LC_TELEPHONE
-category  "dz_BT:2004";LC_MEASUREMENT
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_COLLATE
+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
 
 %%%%%%%%%%%%%%%%
diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY
index d6f2b5b469..fed597d40f 100644
--- a/localedata/locales/el_CY
+++ b/localedata/locales/el_CY
@@ -23,19 +23,19 @@ language   "Greek"
 territory  "Cyprus"
 revision   "1.0"
 date       "2004-10-20"
-%
-category  "el_CY:2000";LC_IDENTIFICATION
-category  "el_CY:2000";LC_CTYPE
-category  "el_CY:2000";LC_COLLATE
-category  "el_CY:2000";LC_TIME
-category  "el_CY:2000";LC_NUMERIC
-category  "el_CY:2000";LC_MONETARY
-category  "el_CY:2000";LC_MESSAGES
-category  "el_CY:2000";LC_PAPER
-category  "el_CY:2000";LC_NAME
-category  "el_CY:2000";LC_ADDRESS
-category  "el_CY:2000";LC_TELEPHONE
-category  "el_CY: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
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index 7987b86249..5b0a247d14 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -35,19 +35,19 @@ language   "Greek"
 territory  "Greece"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "el_GR:2000";LC_IDENTIFICATION
-category  "el_GR:2000";LC_CTYPE
-category  "el_GR:2000";LC_COLLATE
-category  "el_GR:2000";LC_TIME
-category  "el_GR:2000";LC_NUMERIC
-category  "el_GR:2000";LC_MONETARY
-category  "el_GR:2000";LC_MESSAGES
-category  "el_GR:2000";LC_PAPER
-category  "el_GR:2000";LC_NAME
-category  "el_GR:2000";LC_ADDRESS
-category  "el_GR:2000";LC_TELEPHONE
-category  "el_GR: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
diff --git a/localedata/locales/el_GR@euro b/localedata/locales/el_GR@euro
index c98c7a4f88..c07d633ac1 100644
--- a/localedata/locales/el_GR@euro
+++ b/localedata/locales/el_GR@euro
@@ -20,19 +20,19 @@ language   "Greek"
 territory  "Greece"
 revision   "1.0"
 date       "2000-06-24"
-%
-category  "el_GR@euro:2000";LC_IDENTIFICATION
-category  "el_GR@euro:2000";LC_CTYPE
-category  "el_GR@euro:2000";LC_COLLATE
-category  "el_GR@euro:2000";LC_TIME
-category  "el_GR@euro:2000";LC_NUMERIC
-category  "el_GR@euro:2000";LC_MONETARY
-category  "el_GR@euro:2000";LC_MESSAGES
-category  "el_GR@euro:2000";LC_PAPER
-category  "el_GR@euro:2000";LC_NAME
-category  "el_GR@euro:2000";LC_ADDRESS
-category  "el_GR@euro:2000";LC_TELEPHONE
-category  "el_GR@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_CTYPE
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index b78d7a73f3..2cdb1b172a 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -23,19 +23,19 @@ language   "English"
 territory  "Antigua & Barbuda"
 revision   "1.0"
 date       "2008-09-16"
-%
-category  "en_AG:2008";LC_IDENTIFICATION
-category  "en_AG:2008";LC_CTYPE
-category  "en_AG:2008";LC_COLLATE
-category  "en_AG:2008";LC_TIME
-category  "en_AG:2008";LC_NUMERIC
-category  "en_AG:2008";LC_MONETARY
-category  "en_AG:2008";LC_MESSAGES
-category  "en_AG:2008";LC_PAPER
-category  "en_AG:2008";LC_NAME
-category  "en_AG:2008";LC_ADDRESS
-category  "en_AG:2008";LC_TELEPHONE
-category  "en_AG:2008";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_CTYPE
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index d6102af970..149040e578 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -35,19 +35,19 @@ language   "Australian English"
 territory  "Australia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "en_AU:2000";LC_IDENTIFICATION
-category  "en_AU:2000";LC_CTYPE
-category  "en_AU:2000";LC_COLLATE
-category  "en_AU:2000";LC_TIME
-category  "en_AU:2000";LC_NUMERIC
-category  "en_AU:2000";LC_MONETARY
-category  "en_AU:2000";LC_MESSAGES
-category  "en_AU:2000";LC_PAPER
-category  "en_AU:2000";LC_NAME
-category  "en_AU:2000";LC_ADDRESS
-category  "en_AU:2000";LC_TELEPHONE
-category  "en_AU: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_CTYPE
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
index 77c836a5ab..94dfcbe221 100644
--- a/localedata/locales/en_BW
+++ b/localedata/locales/en_BW
@@ -32,19 +32,19 @@ language   "English"
 territory  "Botswana"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "en_BW:2000";LC_IDENTIFICATION
-category  "en_BW:2000";LC_CTYPE
-category  "en_BW:2000";LC_COLLATE
-category  "en_BW:2000";LC_TIME
-category  "en_BW:2000";LC_NUMERIC
-category  "en_BW:2000";LC_MONETARY
-category  "en_BW:2000";LC_MESSAGES
-category  "en_BW:2000";LC_PAPER
-category  "en_BW:2000";LC_NAME
-category  "en_BW:2000";LC_ADDRESS
-category  "en_BW:2000";LC_TELEPHONE
-category  "en_BW: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_CTYPE
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index 37a2115c7d..9eabcd0812 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -37,19 +37,19 @@ language   "Canadian English"
 territory  "Canada"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "en_CA:2000";LC_IDENTIFICATION
-category  "en_CA:2000";LC_CTYPE
-category  "en_CA:2000";LC_COLLATE
-category  "en_CA:2000";LC_TIME
-category  "en_CA:2000";LC_NUMERIC
-category  "en_CA:2000";LC_MONETARY
-category  "en_CA:2000";LC_MESSAGES
-category  "en_CA:2000";LC_PAPER
-category  "en_CA:2000";LC_NAME
-category  "en_CA:2000";LC_ADDRESS
-category  "en_CA:2000";LC_TELEPHONE
-category  "en_CA: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
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index bf799c1570..f1fd8ddb58 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -40,19 +40,19 @@ language   "English"
 territory  "Denmark"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "en_DK:2000";LC_IDENTIFICATION
-category  "en_DK:2000";LC_CTYPE
-category  "en_DK:2000";LC_COLLATE
-category  "en_DK:2000";LC_TIME
-category  "en_DK:2000";LC_NUMERIC
-category  "en_DK:2000";LC_MONETARY
-category  "en_DK:2000";LC_MESSAGES
-category  "en_DK:2000";LC_PAPER
-category  "en_DK:2000";LC_NAME
-category  "en_DK:2000";LC_ADDRESS
-category  "en_DK:2000";LC_TELEPHONE
-category  "en_DK: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
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index 0e97dbd0f0..bc2e1767f5 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -35,19 +35,19 @@ language   "British English"
 territory  "United Kingdom"
 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
-category  "en_GB: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_CTYPE
diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
index 3046ec235b..de8a32a307 100644
--- a/localedata/locales/en_HK
+++ b/localedata/locales/en_HK
@@ -27,19 +27,19 @@ language    "English"
 territory   "Hong Kong SAR China"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
-%
-category  "en_HK:2000";LC_IDENTIFICATION
-category  "en_HK:2000";LC_CTYPE
-category  "en_HK:2000";LC_COLLATE
-category  "en_HK:2000";LC_TIME
-category  "en_HK:2000";LC_NUMERIC
-category  "en_HK:2000";LC_MONETARY
-category  "en_HK:2000";LC_MESSAGES
-category  "en_HK:2000";LC_PAPER
-category  "en_HK:2000";LC_NAME
-category  "en_HK:2000";LC_ADDRESS
-category  "en_HK:2000";LC_TELEPHONE
-category  "en_HK: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
 
 
diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE
index 063d288242..3eba8382b8 100644
--- a/localedata/locales/en_IE
+++ b/localedata/locales/en_IE
@@ -35,19 +35,19 @@ language   "English"
 territory  "Ireland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "en_IE:2000";LC_IDENTIFICATION
-category  "en_IE:2000";LC_CTYPE
-category  "en_IE:2000";LC_COLLATE
-category  "en_IE:2000";LC_TIME
-category  "en_IE:2000";LC_NUMERIC
-category  "en_IE:2000";LC_MONETARY
-category  "en_IE:2000";LC_MESSAGES
-category  "en_IE:2000";LC_PAPER
-category  "en_IE:2000";LC_NAME
-category  "en_IE:2000";LC_ADDRESS
-category  "en_IE:2000";LC_TELEPHONE
-category  "en_IE: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_CTYPE
diff --git a/localedata/locales/en_IE@euro b/localedata/locales/en_IE@euro
index 797468525e..cdadcfa7ea 100644
--- a/localedata/locales/en_IE@euro
+++ b/localedata/locales/en_IE@euro
@@ -28,19 +28,19 @@ language   "English"
 territory  "Ireland"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "en_IE@euro:2000";LC_IDENTIFICATION
-category  "en_IE@euro:2000";LC_CTYPE
-category  "en_IE@euro:2000";LC_COLLATE
-category  "en_IE@euro:2000";LC_TIME
-category  "en_IE@euro:2000";LC_NUMERIC
-category  "en_IE@euro:2000";LC_MONETARY
-category  "en_IE@euro:2000";LC_MESSAGES
-category  "en_IE@euro:2000";LC_PAPER
-category  "en_IE@euro:2000";LC_NAME
-category  "en_IE@euro:2000";LC_ADDRESS
-category  "en_IE@euro:2000";LC_TELEPHONE
-category  "en_IE@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_CTYPE
diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN
index c0bd029a99..8c780c3751 100644
--- a/localedata/locales/en_IN
+++ b/localedata/locales/en_IN
@@ -24,19 +24,19 @@ language    "English"
 territory   "India"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
-%
-category  "en_IN:2000";LC_IDENTIFICATION
-category  "en_IN:2000";LC_CTYPE
-category  "en_IN:2000";LC_COLLATE
-category  "en_IN:2000";LC_TIME
-category  "en_IN:2000";LC_NUMERIC
-category  "en_IN:2000";LC_MONETARY
-category  "en_IN:2000";LC_MESSAGES
-category  "en_IN:2000";LC_PAPER
-category  "en_IN:2000";LC_NAME
-category  "en_IN:2000";LC_ADDRESS
-category  "en_IN:2000";LC_TELEPHONE
-category  "en_IN: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
 
 
diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG
index 5a19f1995f..1ce91ac0e5 100644
--- a/localedata/locales/en_NG
+++ b/localedata/locales/en_NG
@@ -30,20 +30,19 @@ language   "English"
 territory  "Nigeria"
 revision   "0.2"
 date       "2006-02-01"
-%
-category  "en_NG:2003";LC_IDENTIFICATION
-category  "en_NG:2000";LC_CTYPE
-category  "en_NG:2000";LC_COLLATE
-category  "en_NG:2003";LC_TIME
-category  "en_NG:2000";LC_NUMERIC
-category  "en_NG:2000";LC_MONETARY
-category  "en_NG:2003";LC_MESSAGES
-category  "en_NG:2000";LC_PAPER
-category  "en_NG:2000";LC_MEASUREMENT
-category  "en_NG:2003";LC_NAME
-category  "en_NG:2003";LC_ADDRESS
-category  "en_NG:2003";LC_TELEPHONE
 
+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_MEASUREMENT
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ
index caf01f1457..d0d2304184 100644
--- a/localedata/locales/en_NZ
+++ b/localedata/locales/en_NZ
@@ -35,19 +35,19 @@ language   "English"
 territory  "New Zealand"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "en_NZ:2000";LC_IDENTIFICATION
-category  "en_NZ:2000";LC_CTYPE
-category  "en_NZ:2000";LC_COLLATE
-category  "en_NZ:2000";LC_TIME
-category  "en_NZ:2000";LC_NUMERIC
-category  "en_NZ:2000";LC_MONETARY
-category  "en_NZ:2000";LC_MESSAGES
-category  "en_NZ:2000";LC_PAPER
-category  "en_NZ:2000";LC_NAME
-category  "en_NZ:2000";LC_ADDRESS
-category  "en_NZ:2000";LC_TELEPHONE
-category  "en_NZ: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_CTYPE
diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH
index 91df849530..f9716e762b 100644
--- a/localedata/locales/en_PH
+++ b/localedata/locales/en_PH
@@ -27,19 +27,19 @@ language    "English"
 territory   "Philippines"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
-%
-category  "en_PH:2000";LC_IDENTIFICATION
-category  "en_PH:2000";LC_CTYPE
-category  "en_PH:2000";LC_COLLATE
-category  "en_PH:2000";LC_TIME
-category  "en_PH:2000";LC_NUMERIC
-category  "en_PH:2000";LC_MONETARY
-category  "en_PH:2000";LC_MESSAGES
-category  "en_PH:2000";LC_PAPER
-category  "en_PH:2000";LC_NAME
-category  "en_PH:2000";LC_ADDRESS
-category  "en_PH:2000";LC_TELEPHONE
-category  "en_PH: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
 
 
diff --git a/localedata/locales/en_SG b/localedata/locales/en_SG
index 752fa48aa9..64cfb6dd57 100644
--- a/localedata/locales/en_SG
+++ b/localedata/locales/en_SG
@@ -24,19 +24,19 @@ language    "English"
 territory   "Singapore"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
-%
-category  "en_SG:2000";LC_IDENTIFICATION
-category  "en_SG:2000";LC_CTYPE
-category  "en_SG:2000";LC_COLLATE
-category  "en_SG:2000";LC_TIME
-category  "en_SG:2000";LC_NUMERIC
-category  "en_SG:2000";LC_MONETARY
-category  "en_SG:2000";LC_MESSAGES
-category  "en_SG:2000";LC_PAPER
-category  "en_SG:2000";LC_NAME
-category  "en_SG:2000";LC_ADDRESS
-category  "en_SG:2000";LC_TELEPHONE
-category  "en_SG: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_CTYPE
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index e4468dec44..c4b558481a 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -23,19 +23,19 @@ language   "American English"
 territory  "United States"
 revision   "1.0"
 date       "2000-06-24"
-%
-category  "en_US:2000";LC_IDENTIFICATION
-category  "en_US:2000";LC_CTYPE
-category  "en_US:2000";LC_COLLATE
-category  "en_US:2000";LC_TIME
-category  "en_US:2000";LC_NUMERIC
-category  "en_US:2000";LC_MONETARY
-category  "en_US:2000";LC_MESSAGES
-category  "en_US:2000";LC_PAPER
-category  "en_US:2000";LC_NAME
-category  "en_US:2000";LC_ADDRESS
-category  "en_US:2000";LC_TELEPHONE
-category  "en_US: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_CTYPE
diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA
index 0655cee4f9..ef68942dcd 100644
--- a/localedata/locales/en_ZA
+++ b/localedata/locales/en_ZA
@@ -64,20 +64,19 @@ territory  "South Africa"
 abbreviation "Translate.org.za"
 revision   "1.3"
 date       "2007-04-19"
-%
-category  "en_ZA:2003";LC_IDENTIFICATION
-category  "en_ZA:2000";LC_CTYPE
-category  "en_ZA:2000";LC_COLLATE
-category  "en_ZA:2003";LC_TIME
-category  "en_ZA:2000";LC_NUMERIC
-category  "en_ZA:2000";LC_MONETARY
-category  "en_ZA:2003";LC_MESSAGES
-category  "en_ZA:2000";LC_PAPER
-category  "en_ZA:2000";LC_MEASUREMENT
-category  "en_ZA:2003";LC_NAME
-category  "en_ZA:2003";LC_ADDRESS
-category  "en_ZA:2003";LC_TELEPHONE
 
+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_MEASUREMENT
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/en_ZM b/localedata/locales/en_ZM
index b424c629d8..f678b7ab63 100644
--- a/localedata/locales/en_ZM
+++ b/localedata/locales/en_ZM
@@ -22,19 +22,19 @@ language  "English"
 territory "Zambia"
 revision  "1.0"
 date      "2011-04-18"
-%
-category  "en_ZM:2000";LC_IDENTIFICATION
-category  "en_ZM:2000";LC_CTYPE
-category  "en_ZM:2000";LC_COLLATE
-category  "en_ZM:2000";LC_TIME
-category  "en_ZM:2000";LC_NUMERIC
-category  "en_ZM:2000";LC_MONETARY
-category  "en_ZM:2000";LC_PAPER
-category  "en_ZM:2000";LC_MEASUREMENT
-category  "en_ZM:2000";LC_MESSAGES
-category  "en_ZM:2000";LC_NAME
-category  "en_ZM:2000";LC_ADDRESS
-category  "en_ZM:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW
index cb681cc16c..60769a1a95 100644
--- a/localedata/locales/en_ZW
+++ b/localedata/locales/en_ZW
@@ -32,19 +32,19 @@ language   "English"
 territory  "Zimbabwe"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "en_ZW:2000";LC_IDENTIFICATION
-category  "en_ZW:2000";LC_CTYPE
-category  "en_ZW:2000";LC_COLLATE
-category  "en_ZW:2000";LC_TIME
-category  "en_ZW:2000";LC_NUMERIC
-category  "en_ZW:2000";LC_MONETARY
-category  "en_ZW:2000";LC_MESSAGES
-category  "en_ZW:2000";LC_PAPER
-category  "en_ZW:2000";LC_NAME
-category  "en_ZW:2000";LC_ADDRESS
-category  "en_ZW:2000";LC_TELEPHONE
-category  "en_ZW: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_CTYPE
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index 26177dd4ee..1415ddbe46 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Argentina"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_AR:2000";LC_IDENTIFICATION
-category  "es_AR:2000";LC_CTYPE
-category  "es_AR:2000";LC_COLLATE
-category  "es_AR:2000";LC_TIME
-category  "es_AR:2000";LC_NUMERIC
-category  "es_AR:2000";LC_MONETARY
-category  "es_AR:2000";LC_MESSAGES
-category  "es_AR:2000";LC_PAPER
-category  "es_AR:2000";LC_NAME
-category  "es_AR:2000";LC_ADDRESS
-category  "es_AR:2000";LC_TELEPHONE
-category  "es_AR: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
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index 428b60a8f2..c1fe587fbb 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Bolivia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_BO:2000";LC_IDENTIFICATION
-category  "es_BO:2000";LC_CTYPE
-category  "es_BO:2000";LC_COLLATE
-category  "es_BO:2000";LC_TIME
-category  "es_BO:2000";LC_NUMERIC
-category  "es_BO:2000";LC_MONETARY
-category  "es_BO:2000";LC_MESSAGES
-category  "es_BO:2000";LC_PAPER
-category  "es_BO:2000";LC_NAME
-category  "es_BO:2000";LC_ADDRESS
-category  "es_BO:2000";LC_TELEPHONE
-category  "es_BO: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
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index d5f00195f2..908ab6ae1c 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Chile"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_CL:2000";LC_IDENTIFICATION
-category  "es_CL:2000";LC_CTYPE
-category  "es_CL:2000";LC_COLLATE
-category  "es_CL:2000";LC_TIME
-category  "es_CL:2000";LC_NUMERIC
-category  "es_CL:2000";LC_MONETARY
-category  "es_CL:2000";LC_MESSAGES
-category  "es_CL:2000";LC_PAPER
-category  "es_CL:2000";LC_NAME
-category  "es_CL:2000";LC_ADDRESS
-category  "es_CL:2000";LC_TELEPHONE
-category  "es_CL: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
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index a69ad8cbfe..2d612f7b1d 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Colombia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_CO:2000";LC_IDENTIFICATION
-category  "es_CO:2000";LC_CTYPE
-category  "es_CO:2000";LC_COLLATE
-category  "es_CO:2000";LC_TIME
-category  "es_CO:2000";LC_NUMERIC
-category  "es_CO:2000";LC_MONETARY
-category  "es_CO:2000";LC_MESSAGES
-category  "es_CO:2000";LC_PAPER
-category  "es_CO:2000";LC_NAME
-category  "es_CO:2000";LC_ADDRESS
-category  "es_CO:2000";LC_TELEPHONE
-category  "es_CO: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
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index f2919f801d..2b38edcc05 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -28,19 +28,19 @@ language   "Spanish"
 territory  "Costa Rica"
 revision   "1.1"
 date       "2009-12-23"
-%
-category  "es_CR:2000";LC_IDENTIFICATION
-category  "es_CR:2000";LC_CTYPE
-category  "es_CR:2000";LC_COLLATE
-category  "es_CR:2000";LC_TIME
-category  "es_CR:2000";LC_NUMERIC
-category  "es_CR:2000";LC_MONETARY
-category  "es_CR:2000";LC_MESSAGES
-category  "es_CR:2000";LC_PAPER
-category  "es_CR:2000";LC_NAME
-category  "es_CR:2000";LC_ADDRESS
-category  "es_CR:2000";LC_TELEPHONE
-category  "es_CR: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
diff --git a/localedata/locales/es_CU b/localedata/locales/es_CU
index 090f1a7938..b7752149ae 100644
--- a/localedata/locales/es_CU
+++ b/localedata/locales/es_CU
@@ -34,19 +34,19 @@ language   "Spanish"
 territory  "Cuba"
 revision   "0.1"
 date       "2011-10-19"
-%
-category  "es_CU:2000";LC_IDENTIFICATION
-category  "es_CU:2000";LC_CTYPE
-category  "es_CU:2000";LC_COLLATE
-category  "es_CU:2000";LC_TIME
-category  "es_CU:2000";LC_NUMERIC
-category  "es_CU:2000";LC_MONETARY
-category  "es_CU:2000";LC_MESSAGES
-category  "es_CU:2000";LC_PAPER
-category  "es_CU:2000";LC_NAME
-category  "es_CU:2000";LC_ADDRESS
-category  "es_CU:2000";LC_TELEPHONE
-category  "es_CU: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
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index b1e8295e4e..844a8166fa 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Dominican Republic"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_DO:2000";LC_IDENTIFICATION
-category  "es_DO:2000";LC_CTYPE
-category  "es_DO:2000";LC_COLLATE
-category  "es_DO:2000";LC_TIME
-category  "es_DO:2000";LC_NUMERIC
-category  "es_DO:2000";LC_MONETARY
-category  "es_DO:2000";LC_MESSAGES
-category  "es_DO:2000";LC_PAPER
-category  "es_DO:2000";LC_NAME
-category  "es_DO:2000";LC_ADDRESS
-category  "es_DO:2000";LC_TELEPHONE
-category  "es_DO: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
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index 949f2e541c..806eb488d6 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Ecuador"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_EC:2000";LC_IDENTIFICATION
-category  "es_EC:2000";LC_CTYPE
-category  "es_EC:2000";LC_COLLATE
-category  "es_EC:2000";LC_TIME
-category  "es_EC:2000";LC_NUMERIC
-category  "es_EC:2000";LC_MONETARY
-category  "es_EC:2000";LC_MESSAGES
-category  "es_EC:2000";LC_PAPER
-category  "es_EC:2000";LC_NAME
-category  "es_EC:2000";LC_ADDRESS
-category  "es_EC:2000";LC_TELEPHONE
-category  "es_EC: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
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index 481f55f292..06191b52bc 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -36,19 +36,19 @@ language   "European Spanish"
 territory  "Spain"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_ES:2000";LC_IDENTIFICATION
-category  "es_ES:2000";LC_CTYPE
-category  "es_ES:2000";LC_COLLATE
-category  "es_ES:2000";LC_TIME
-category  "es_ES:2000";LC_NUMERIC
-category  "es_ES:2000";LC_MONETARY
-category  "es_ES:2000";LC_MESSAGES
-category  "es_ES:2000";LC_PAPER
-category  "es_ES:2000";LC_NAME
-category  "es_ES:2000";LC_ADDRESS
-category  "es_ES:2000";LC_TELEPHONE
-category  "es_ES: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
diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro
index 4bb33eb3ec..de4bd5aef9 100644
--- a/localedata/locales/es_ES@euro
+++ b/localedata/locales/es_ES@euro
@@ -28,19 +28,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
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index dd52768daf..ec7cb15dd4 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Guatemala"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_GT:2000";LC_IDENTIFICATION
-category  "es_GT:2000";LC_CTYPE
-category  "es_GT:2000";LC_COLLATE
-category  "es_GT:2000";LC_TIME
-category  "es_GT:2000";LC_NUMERIC
-category  "es_GT:2000";LC_MONETARY
-category  "es_GT:2000";LC_MESSAGES
-category  "es_GT:2000";LC_PAPER
-category  "es_GT:2000";LC_NAME
-category  "es_GT:2000";LC_ADDRESS
-category  "es_GT:2000";LC_TELEPHONE
-category  "es_GT: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
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 67e19a7631..3f181f3c8c 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Honduras"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_HN:2000";LC_IDENTIFICATION
-category  "es_HN:2000";LC_CTYPE
-category  "es_HN:2000";LC_COLLATE
-category  "es_HN:2000";LC_TIME
-category  "es_HN:2000";LC_NUMERIC
-category  "es_HN:2000";LC_MONETARY
-category  "es_HN:2000";LC_MESSAGES
-category  "es_HN:2000";LC_PAPER
-category  "es_HN:2000";LC_NAME
-category  "es_HN:2000";LC_ADDRESS
-category  "es_HN:2000";LC_TELEPHONE
-category  "es_HN: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
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 9b9a4969cf..1f205fe5c0 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -36,19 +36,19 @@ language   "Mexican Spanish"
 territory  "Mexico"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_MX:2000";LC_IDENTIFICATION
-category  "es_MX:2000";LC_CTYPE
-category  "es_MX:2000";LC_COLLATE
-category  "es_MX:2000";LC_TIME
-category  "es_MX:2000";LC_NUMERIC
-category  "es_MX:2000";LC_MONETARY
-category  "es_MX:2000";LC_MESSAGES
-category  "es_MX:2000";LC_PAPER
-category  "es_MX:2000";LC_NAME
-category  "es_MX:2000";LC_ADDRESS
-category  "es_MX:2000";LC_TELEPHONE
-category  "es_MX: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
diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
index b9a93c7cc8..6e9647ba43 100644
--- a/localedata/locales/es_NI
+++ b/localedata/locales/es_NI
@@ -28,19 +28,19 @@ language   "Spanish"
 territory  "Nicaragua"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "es_NI:2000";LC_IDENTIFICATION
-category  "es_NI:2000";LC_CTYPE
-category  "es_NI:2000";LC_COLLATE
-category  "es_NI:2000";LC_TIME
-category  "es_NI:2000";LC_NUMERIC
-category  "es_NI:2000";LC_MONETARY
-category  "es_NI:2000";LC_MESSAGES
-category  "es_NI:2000";LC_PAPER
-category  "es_NI:2000";LC_NAME
-category  "es_NI:2000";LC_ADDRESS
-category  "es_NI:2000";LC_TELEPHONE
-category  "es_NI: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
diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index 6146a9462d..1ada1c1080 100644
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Panama"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_PA:2000";LC_IDENTIFICATION
-category  "es_PA:2000";LC_CTYPE
-category  "es_PA:2000";LC_COLLATE
-category  "es_PA:2000";LC_TIME
-category  "es_PA:2000";LC_NUMERIC
-category  "es_PA:2000";LC_MONETARY
-category  "es_PA:2000";LC_MESSAGES
-category  "es_PA:2000";LC_PAPER
-category  "es_PA:2000";LC_NAME
-category  "es_PA:2000";LC_ADDRESS
-category  "es_PA:2000";LC_TELEPHONE
-category  "es_PA: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
diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index 376b402c76..8b4aeece33 100644
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Peru"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_PE:2000";LC_IDENTIFICATION
-category  "es_PE:2000";LC_CTYPE
-category  "es_PE:2000";LC_COLLATE
-category  "es_PE:2000";LC_TIME
-category  "es_PE:2000";LC_NUMERIC
-category  "es_PE:2000";LC_MONETARY
-category  "es_PE:2000";LC_MESSAGES
-category  "es_PE:2000";LC_PAPER
-category  "es_PE:2000";LC_NAME
-category  "es_PE:2000";LC_ADDRESS
-category  "es_PE:2000";LC_TELEPHONE
-category  "es_PE: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
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index c1cd26662a..7982aa9dcf 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -28,19 +28,19 @@ language   "Spanish"
 territory  "Puerto Rico"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "es_PR:2000";LC_IDENTIFICATION
-category  "es_PR:2000";LC_CTYPE
-category  "es_PR:2000";LC_COLLATE
-category  "es_PR:2000";LC_TIME
-category  "es_PR:2000";LC_NUMERIC
-category  "es_PR:2000";LC_MONETARY
-category  "es_PR:2000";LC_MESSAGES
-category  "es_PR:2000";LC_PAPER
-category  "es_PR:2000";LC_NAME
-category  "es_PR:2000";LC_ADDRESS
-category  "es_PR:2000";LC_TELEPHONE
-category  "es_PR: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
diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index 39c741e67f..1df986e6da 100644
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Paraguay"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_PY:2000";LC_IDENTIFICATION
-category  "es_PY:2000";LC_CTYPE
-category  "es_PY:2000";LC_COLLATE
-category  "es_PY:2000";LC_TIME
-category  "es_PY:2000";LC_NUMERIC
-category  "es_PY:2000";LC_MONETARY
-category  "es_PY:2000";LC_MESSAGES
-category  "es_PY:2000";LC_PAPER
-category  "es_PY:2000";LC_NAME
-category  "es_PY:2000";LC_ADDRESS
-category  "es_PY:2000";LC_TELEPHONE
-category  "es_PY: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
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index 26fcbe3a3b..9db5070739 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "El Salvador"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_SV:2000";LC_IDENTIFICATION
-category  "es_SV:2000";LC_CTYPE
-category  "es_SV:2000";LC_COLLATE
-category  "es_SV:2000";LC_TIME
-category  "es_SV:2000";LC_NUMERIC
-category  "es_SV:2000";LC_MONETARY
-category  "es_SV:2000";LC_MESSAGES
-category  "es_SV:2000";LC_PAPER
-category  "es_SV:2000";LC_NAME
-category  "es_SV:2000";LC_ADDRESS
-category  "es_SV:2000";LC_TELEPHONE
-category  "es_SV: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
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index 45be1a1b9c..ce5dd8c558 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "United States"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_US:2000";LC_IDENTIFICATION
-category  "es_US:2000";LC_CTYPE
-category  "es_US:2000";LC_COLLATE
-category  "es_US:2000";LC_TIME
-category  "es_US:2000";LC_NUMERIC
-category  "es_US:2000";LC_MONETARY
-category  "es_US:2000";LC_MESSAGES
-category  "es_US:2000";LC_PAPER
-category  "es_US:2000";LC_NAME
-category  "es_US:2000";LC_ADDRESS
-category  "es_US:2000";LC_TELEPHONE
-category  "es_US: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
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index 9b51833b1b..83438ff984 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Uruguay"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_UY:2000";LC_IDENTIFICATION
-category  "es_UY:2000";LC_CTYPE
-category  "es_UY:2000";LC_COLLATE
-category  "es_UY:2000";LC_TIME
-category  "es_UY:2000";LC_NUMERIC
-category  "es_UY:2000";LC_MONETARY
-category  "es_UY:2000";LC_MESSAGES
-category  "es_UY:2000";LC_PAPER
-category  "es_UY:2000";LC_NAME
-category  "es_UY:2000";LC_ADDRESS
-category  "es_UY:2000";LC_TELEPHONE
-category  "es_UY: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
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index d528773b9f..ae463616a6 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -36,19 +36,19 @@ language   "Spanish"
 territory  "Venezuela"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "es_VE:2000";LC_IDENTIFICATION
-category  "es_VE:2000";LC_CTYPE
-category  "es_VE:2000";LC_COLLATE
-category  "es_VE:2000";LC_TIME
-category  "es_VE:2000";LC_NUMERIC
-category  "es_VE:2000";LC_MONETARY
-category  "es_VE:2000";LC_MESSAGES
-category  "es_VE:2000";LC_PAPER
-category  "es_VE:2000";LC_NAME
-category  "es_VE:2000";LC_ADDRESS
-category  "es_VE:2000";LC_TELEPHONE
-category  "es_VE: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
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index 9879b50823..a6cdc4eaed 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -43,19 +43,19 @@ language   "Estonian"
 territory  "Estonia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "et_EE:2000";LC_IDENTIFICATION
-category  "et_EE:2000";LC_CTYPE
-category  "et_EE:2000";LC_COLLATE
-category  "et_EE:2000";LC_TIME
-category  "et_EE:2000";LC_NUMERIC
-category  "et_EE:2000";LC_MONETARY
-category  "et_EE:2000";LC_MESSAGES
-category  "et_EE:2000";LC_PAPER
-category  "et_EE:2000";LC_NAME
-category  "et_EE:2000";LC_ADDRESS
-category  "et_EE:2000";LC_TELEPHONE
-category  "et_EE: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
diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
index 4eb3384ed3..bbf35e27f1 100644
--- a/localedata/locales/eu_ES
+++ b/localedata/locales/eu_ES
@@ -40,19 +40,19 @@ language   "Basque"
 territory  "Spain"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "eu_ES:2000";LC_IDENTIFICATION
-category  "eu_ES:2000";LC_CTYPE
-category  "eu_ES:2000";LC_COLLATE
-category  "eu_ES:2000";LC_TIME
-category  "eu_ES:2000";LC_NUMERIC
-category  "eu_ES:2000";LC_MONETARY
-category  "eu_ES:2000";LC_MESSAGES
-category  "eu_ES:2000";LC_PAPER
-category  "eu_ES:2000";LC_NAME
-category  "eu_ES:2000";LC_ADDRESS
-category  "eu_ES:2000";LC_TELEPHONE
-category  "eu_ES: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
diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro
index 1600eebdd9..5426042bfc 100644
--- a/localedata/locales/eu_ES@euro
+++ b/localedata/locales/eu_ES@euro
@@ -29,19 +29,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
diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR
index ac43036233..bcce55ec71 100644
--- a/localedata/locales/fa_IR
+++ b/localedata/locales/fa_IR
@@ -34,19 +34,19 @@ language   "Persian"
 territory  "Iran"
 revision   "3.0"
 date       "2005-04-06"
-%
-category  "fa_IR:2005";LC_IDENTIFICATION
-category  "fa_IR:2005";LC_CTYPE
-category  "fa_IR:2005";LC_COLLATE
-category  "fa_IR:2005";LC_TIME
-category  "fa_IR:2005";LC_NUMERIC
-category  "fa_IR:2005";LC_MONETARY
-category  "fa_IR:2005";LC_MESSAGES
-category  "fa_IR:2005";LC_PAPER
-category  "fa_IR:2005";LC_NAME
-category  "fa_IR:2005";LC_ADDRESS
-category  "fa_IR:2005";LC_TELEPHONE
-category  "fa_IR:2005";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_CTYPE
diff --git a/localedata/locales/ff_SN b/localedata/locales/ff_SN
index 892be61f08..9e174aec05 100644
--- a/localedata/locales/ff_SN
+++ b/localedata/locales/ff_SN
@@ -22,19 +22,19 @@ language   "Fulah"
 territory  "Senegal"
 revision   "1.0"
 date       "2011-03-28"
-%
-category  "ff_SN:2000";LC_IDENTIFICATION
-category  "ff_SN:2000";LC_CTYPE
-category  "ff_SN:2000";LC_COLLATE
-category  "ff_SN:2000";LC_TIME
-category  "ff_SN:2000";LC_NUMERIC
-category  "ff_SN:2000";LC_MONETARY
-category  "ff_SN:2000";LC_PAPER
-category  "ff_SN:2000";LC_MEASUREMENT
-category  "ff_SN:2000";LC_MESSAGES
-category  "ff_SN:2000";LC_NAME
-category  "ff_SN:2000";LC_ADDRESS
-category  "ff_SN:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index e7638d8d3e..03d73719ba 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -41,19 +41,19 @@ language   "Finnish"
 territory  "Finland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "fi_FI:2000";LC_IDENTIFICATION
-category  "fi_FI:2000";LC_CTYPE
-category  "fi_FI:2000";LC_COLLATE
-category  "fi_FI:2000";LC_TIME
-category  "fi_FI:2000";LC_NUMERIC
-category  "fi_FI:2000";LC_MONETARY
-category  "fi_FI:2000";LC_MESSAGES
-category  "fi_FI:2000";LC_PAPER
-category  "fi_FI:2000";LC_MEASUREMENT
-category  "fi_FI:2000";LC_NAME
-category  "fi_FI:2000";LC_ADDRESS
-category  "fi_FI:2000";LC_TELEPHONE
+
+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_MEASUREMENT
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_COLLATE
diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro
index 6127b03d73..78d441905d 100644
--- a/localedata/locales/fi_FI@euro
+++ b/localedata/locales/fi_FI@euro
@@ -29,19 +29,19 @@ language   "Finnish"
 territory  "Finland"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "fi_FI@euro:2000";LC_IDENTIFICATION
-category  "fi_FI@euro:2000";LC_CTYPE
-category  "fi_FI@euro:2000";LC_COLLATE
-category  "fi_FI@euro:2000";LC_TIME
-category  "fi_FI@euro:2000";LC_NUMERIC
-category  "fi_FI@euro:2000";LC_MONETARY
-category  "fi_FI@euro:2000";LC_MESSAGES
-category  "fi_FI@euro:2000";LC_PAPER
-category  "fi_FI@euro:2000";LC_MEASUREMENT
-category  "fi_FI@euro:2000";LC_NAME
-category  "fi_FI@euro:2000";LC_ADDRESS
-category  "fi_FI@euro:2000";LC_TELEPHONE
+
+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_MEASUREMENT
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_COLLATE
diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH
index ca637d4450..492b238bf5 100644
--- a/localedata/locales/fil_PH
+++ b/localedata/locales/fil_PH
@@ -32,18 +32,17 @@ territory "Philippines"
 revision "0.5"
 date "2005-02-02"
 
-category ph_PH:2000;LC_IDENTIFICATION
-category ph_PH:2000;LC_CTYPE
-category ph_PH:2000;LC_COLLATE
-category ph_PH:2000;LC_TIME
-category ph_PH:2000;LC_NUMERIC
-category ph_PH:2000;LC_PAPER
-category ph_PH:2000;LC_TELEPHONE
-category ph_PH:2000;LC_MEASUREMENT
-category ph_PH:2000;LC_ADDRESS
-category ph_PH:2000;LC_MESSAGES
-category ph_PH:2000;LC_MONETARY
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO
index 84c3c46b8e..2ebbbe35c6 100644
--- a/localedata/locales/fo_FO
+++ b/localedata/locales/fo_FO
@@ -38,19 +38,19 @@ language   "Faroese"
 territory  "Faroe Islands"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "fo_FO:2000";LC_IDENTIFICATION
-category  "fo_FO:2000";LC_CTYPE
-category  "fo_FO:2000";LC_COLLATE
-category  "fo_FO:2000";LC_TIME
-category  "fo_FO:2000";LC_NUMERIC
-category  "fo_FO:2000";LC_MONETARY
-category  "fo_FO:2000";LC_MESSAGES
-category  "fo_FO:2000";LC_PAPER
-category  "fo_FO:2000";LC_NAME
-category  "fo_FO:2000";LC_ADDRESS
-category  "fo_FO:2000";LC_TELEPHONE
-category  "fo_FO: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_CTYPE
diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index 86e3a21368..40654ead89 100644
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -35,19 +35,19 @@ language   "French"
 territory  "Belgium"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "fr_BE:2000";LC_IDENTIFICATION
-category  "fr_BE:2000";LC_CTYPE
-category  "fr_BE:2000";LC_COLLATE
-category  "fr_BE:2000";LC_TIME
-category  "fr_BE:2000";LC_NUMERIC
-category  "fr_BE:2000";LC_MONETARY
-category  "fr_BE:2000";LC_MESSAGES
-category  "fr_BE:2000";LC_PAPER
-category  "fr_BE:2000";LC_NAME
-category  "fr_BE:2000";LC_ADDRESS
-category  "fr_BE:2000";LC_TELEPHONE
-category  "fr_BE: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_CTYPE
diff --git a/localedata/locales/fr_BE@euro b/localedata/locales/fr_BE@euro
index 9b5eb0868e..b8b2cb74dd 100644
--- a/localedata/locales/fr_BE@euro
+++ b/localedata/locales/fr_BE@euro
@@ -28,19 +28,19 @@ language   "French"
 territory  "Belgium"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "fr_BE@euro:2000";LC_IDENTIFICATION
-category  "fr_BE@euro:2000";LC_CTYPE
-category  "fr_BE@euro:2000";LC_COLLATE
-category  "fr_BE@euro:2000";LC_TIME
-category  "fr_BE@euro:2000";LC_NUMERIC
-category  "fr_BE@euro:2000";LC_MONETARY
-category  "fr_BE@euro:2000";LC_MESSAGES
-category  "fr_BE@euro:2000";LC_PAPER
-category  "fr_BE@euro:2000";LC_NAME
-category  "fr_BE@euro:2000";LC_ADDRESS
-category  "fr_BE@euro:2000";LC_TELEPHONE
-category  "fr_BE@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_CTYPE
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 6e551d5185..2861800d3a 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -35,19 +35,19 @@ language   "Canadian French"
 territory  "Canada"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "fr_CA:2000";LC_IDENTIFICATION
-category  "fr_CA:2000";LC_CTYPE
-category  "fr_CA:2000";LC_COLLATE
-category  "fr_CA:2000";LC_TIME
-category  "fr_CA:2000";LC_NUMERIC
-category  "fr_CA:2000";LC_MONETARY
-category  "fr_CA:2000";LC_MESSAGES
-category  "fr_CA:2000";LC_PAPER
-category  "fr_CA:2000";LC_NAME
-category  "fr_CA:2000";LC_ADDRESS
-category  "fr_CA:2000";LC_TELEPHONE
-category  "fr_CA: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_CTYPE
diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
index 4522e35672..31f934fd32 100644
--- a/localedata/locales/fr_CH
+++ b/localedata/locales/fr_CH
@@ -35,19 +35,19 @@ language   "Swiss French"
 territory  "Switzerland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "fr_CH:2000";LC_IDENTIFICATION
-category  "fr_CH:2000";LC_CTYPE
-category  "fr_CH:2000";LC_COLLATE
-category  "fr_CH:2000";LC_TIME
-category  "fr_CH:2000";LC_NUMERIC
-category  "fr_CH:2000";LC_MONETARY
-category  "fr_CH:2000";LC_MESSAGES
-category  "fr_CH:2000";LC_PAPER
-category  "fr_CH:2000";LC_NAME
-category  "fr_CH:2000";LC_ADDRESS
-category  "fr_CH:2000";LC_TELEPHONE
-category  "fr_CH: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_CTYPE
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index 0e475a8a05..6fbbbaeea1 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -36,19 +36,19 @@ language   "French"
 territory  "France"
 revision   "1.0"
 date       "2008-03-15"
-%
-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
-category  "fr_FR: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_CTYPE
diff --git a/localedata/locales/fr_FR@euro b/localedata/locales/fr_FR@euro
index 64ad18c633..afdfe5e331 100644
--- a/localedata/locales/fr_FR@euro
+++ b/localedata/locales/fr_FR@euro
@@ -27,19 +27,19 @@ language   "French"
 territory  "France"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "fr_FR@euro:2000";LC_IDENTIFICATION
-category  "fr_FR@euro:2000";LC_CTYPE
-category  "fr_FR@euro:2000";LC_COLLATE
-category  "fr_FR@euro:2000";LC_TIME
-category  "fr_FR@euro:2000";LC_NUMERIC
-category  "fr_FR@euro:2000";LC_MONETARY
-category  "fr_FR@euro:2000";LC_MESSAGES
-category  "fr_FR@euro:2000";LC_PAPER
-category  "fr_FR@euro:2000";LC_NAME
-category  "fr_FR@euro:2000";LC_ADDRESS
-category  "fr_FR@euro:2000";LC_TELEPHONE
-category  "fr_FR@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_CTYPE
diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
index ed04faeee6..849b6fec93 100644
--- a/localedata/locales/fr_LU
+++ b/localedata/locales/fr_LU
@@ -35,19 +35,19 @@ language   "French"
 territory  "Luxembourg"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "fr_LU:2000";LC_IDENTIFICATION
-category  "fr_LU:2000";LC_CTYPE
-category  "fr_LU:2000";LC_COLLATE
-category  "fr_LU:2000";LC_TIME
-category  "fr_LU:2000";LC_NUMERIC
-category  "fr_LU:2000";LC_MONETARY
-category  "fr_LU:2000";LC_MESSAGES
-category  "fr_LU:2000";LC_PAPER
-category  "fr_LU:2000";LC_NAME
-category  "fr_LU:2000";LC_ADDRESS
-category  "fr_LU:2000";LC_TELEPHONE
-category  "fr_LU: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_CTYPE
diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro
index a1ea28ea82..1a7307aea0 100644
--- a/localedata/locales/fr_LU@euro
+++ b/localedata/locales/fr_LU@euro
@@ -28,19 +28,19 @@ language   "French"
 territory  "Luxembourg"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "fr_LU@euro:2000";LC_IDENTIFICATION
-category  "fr_LU@euro:2000";LC_CTYPE
-category  "fr_LU@euro:2000";LC_COLLATE
-category  "fr_LU@euro:2000";LC_TIME
-category  "fr_LU@euro:2000";LC_NUMERIC
-category  "fr_LU@euro:2000";LC_MONETARY
-category  "fr_LU@euro:2000";LC_MESSAGES
-category  "fr_LU@euro:2000";LC_PAPER
-category  "fr_LU@euro:2000";LC_NAME
-category  "fr_LU@euro:2000";LC_ADDRESS
-category  "fr_LU@euro:2000";LC_TELEPHONE
-category  "fr_LU@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_CTYPE
diff --git a/localedata/locales/fur_IT b/localedata/locales/fur_IT
index 71789ab9ef..4b4f14383a 100644
--- a/localedata/locales/fur_IT
+++ b/localedata/locales/fur_IT
@@ -28,19 +28,19 @@ language   "Friulian"
 territory  "Italy"
 revision   "0.3"
 date       "2004-04-26"
-%
-category  "fur_IT:2000";LC_IDENTIFICATION
-category  "fur_IT:2000";LC_CTYPE
-category  "fur_IT:2000";LC_COLLATE
-category  "fur_IT:2000";LC_TIME
-category  "fur_IT:2000";LC_NUMERIC
-category  "fur_IT:2000";LC_MONETARY
-category  "fur_IT:2000";LC_MESSAGES
-category  "fur_IT:2000";LC_PAPER
-category  "fur_IT:2000";LC_NAME
-category  "fur_IT:2000";LC_ADDRESS
-category  "fur_IT:2000";LC_TELEPHONE
-category  "fur_IT: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_CTYPE
diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE
index 866c4c3c80..cd2de2135e 100644
--- a/localedata/locales/fy_DE
+++ b/localedata/locales/fy_DE
@@ -23,24 +23,18 @@ territory "Germany"
 revision "0.1"
 date "2003-11-30"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_NAME
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-%  copied LC_MONETARY, LC_NUMERIC from de_DE for simplicity
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
index ca6996fd4b..4ee6dc98d5 100644
--- a/localedata/locales/fy_NL
+++ b/localedata/locales/fy_NL
@@ -27,19 +27,19 @@ language   "Western Frisian"
 territory  "Netherlands"
 revision   "1.0"
 date       "2006-08-13"
-%
-category  "fy_NL:2000";LC_IDENTIFICATION
-category  "fy_NL:2000";LC_CTYPE
-category  "fy_NL:2000";LC_COLLATE
-category  "fy_NL:2000";LC_TIME
-category  "fy_NL:2000";LC_NUMERIC
-category  "fy_NL:2000";LC_MONETARY
-category  "fy_NL:2000";LC_MEASUREMENT
-category  "fy_NL:2000";LC_MESSAGES
-category  "fy_NL:2000";LC_PAPER
-category  "fy_NL:2000";LC_NAME
-category  "fy_NL:2000";LC_ADDRESS
-category  "fy_NL:2000";LC_TELEPHONE
+
+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_MEASUREMENT
+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
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE
index b71a67c5fe..e404bc8c3d 100644
--- a/localedata/locales/ga_IE
+++ b/localedata/locales/ga_IE
@@ -34,19 +34,19 @@ language   "Irish"
 territory  "Ireland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "ga_IE:2000";LC_IDENTIFICATION
-category  "ga_IE:2000";LC_CTYPE
-category  "ga_IE:2000";LC_COLLATE
-category  "ga_IE:2000";LC_TIME
-category  "ga_IE:2000";LC_NUMERIC
-category  "ga_IE:2000";LC_MONETARY
-category  "ga_IE:2000";LC_MESSAGES
-category  "ga_IE:2000";LC_PAPER
-category  "ga_IE:2000";LC_NAME
-category  "ga_IE:2000";LC_ADDRESS
-category  "ga_IE:2000";LC_TELEPHONE
-category  "ga_IE: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_CTYPE
diff --git a/localedata/locales/ga_IE@euro b/localedata/locales/ga_IE@euro
index 3a9d5b242e..ee910b2993 100644
--- a/localedata/locales/ga_IE@euro
+++ b/localedata/locales/ga_IE@euro
@@ -28,19 +28,19 @@ language   "Irish"
 territory  "Ireland"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "ga_IE@euro:2000";LC_IDENTIFICATION
-category  "ga_IE@euro:2000";LC_CTYPE
-category  "ga_IE@euro:2000";LC_COLLATE
-category  "ga_IE@euro:2000";LC_TIME
-category  "ga_IE@euro:2000";LC_NUMERIC
-category  "ga_IE@euro:2000";LC_MONETARY
-category  "ga_IE@euro:2000";LC_MESSAGES
-category  "ga_IE@euro:2000";LC_PAPER
-category  "ga_IE@euro:2000";LC_NAME
-category  "ga_IE@euro:2000";LC_ADDRESS
-category  "ga_IE@euro:2000";LC_TELEPHONE
-category  "ga_IE@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_CTYPE
diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
index 0425d74747..7c7852b4ec 100644
--- a/localedata/locales/gd_GB
+++ b/localedata/locales/gd_GB
@@ -28,19 +28,19 @@ language     "Scottish Gaelic"
 territory    "United Kingdom"
 revision     "1.2"
 date         "2013-04-25"
-%
-category  "gd_GB:2000";LC_IDENTIFICATION
-category  "gd_GB:2000";LC_CTYPE
-category  "gd_GB:2000";LC_COLLATE
-category  "gd_GB:2000";LC_TIME
-category  "gd_GB:2000";LC_NUMERIC
-category  "gd_GB:2000";LC_MONETARY
-category  "gd_GB:2000";LC_PAPER
-category  "gd_GB:2000";LC_MEASUREMENT
-category  "gd_GB:2000";LC_MESSAGES
-category  "gd_GB:2000";LC_NAME
-category  "gd_GB:2000";LC_ADDRESS
-category  "gd_GB:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
index e6dae3f93a..4b88edf93e 100644
--- a/localedata/locales/gez_ER
+++ b/localedata/locales/gez_ER
@@ -37,20 +37,19 @@ language   "Geez"
 territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/gez_ER@abegede b/localedata/locales/gez_ER@abegede
index 09cbe210bd..b665c4af82 100644
--- a/localedata/locales/gez_ER@abegede
+++ b/localedata/locales/gez_ER@abegede
@@ -37,20 +37,19 @@ language   "Geez"
 territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
index 384593c72d..23839aa324 100644
--- a/localedata/locales/gez_ET
+++ b/localedata/locales/gez_ET
@@ -37,20 +37,19 @@ language   "Geez"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/gez_ET@abegede b/localedata/locales/gez_ET@abegede
index a60162adc7..2780c50aec 100644
--- a/localedata/locales/gez_ET@abegede
+++ b/localedata/locales/gez_ET@abegede
@@ -37,20 +37,19 @@ language   "Geez"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES
index d796816b2d..ba858f28b6 100644
--- a/localedata/locales/gl_ES
+++ b/localedata/locales/gl_ES
@@ -36,19 +36,19 @@ language   "Galician"
 territory  "Spain"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "gl_ES:2000";LC_IDENTIFICATION
-category  "gl_ES:2000";LC_CTYPE
-category  "gl_ES:2000";LC_COLLATE
-category  "gl_ES:2000";LC_TIME
-category  "gl_ES:2000";LC_NUMERIC
-category  "gl_ES:2000";LC_MONETARY
-category  "gl_ES:2000";LC_MESSAGES
-category  "gl_ES:2000";LC_PAPER
-category  "gl_ES:2000";LC_NAME
-category  "gl_ES:2000";LC_ADDRESS
-category  "gl_ES:2000";LC_TELEPHONE
-category  "gl_ES: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
diff --git a/localedata/locales/gl_ES@euro b/localedata/locales/gl_ES@euro
index 0d25af344e..d52a015d96 100644
--- a/localedata/locales/gl_ES@euro
+++ b/localedata/locales/gl_ES@euro
@@ -29,19 +29,19 @@ language   "Galician"
 territory  "Spain"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "gl_ES@euro:2000";LC_IDENTIFICATION
-category  "gl_ES@euro:2000";LC_CTYPE
-category  "gl_ES@euro:2000";LC_COLLATE
-category  "gl_ES@euro:2000";LC_TIME
-category  "gl_ES@euro:2000";LC_NUMERIC
-category  "gl_ES@euro:2000";LC_MONETARY
-category  "gl_ES@euro:2000";LC_MESSAGES
-category  "gl_ES@euro:2000";LC_PAPER
-category  "gl_ES@euro:2000";LC_NAME
-category  "gl_ES@euro:2000";LC_ADDRESS
-category  "gl_ES@euro:2000";LC_TELEPHONE
-category  "gl_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
diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
index d2a151098d..10c9d7d409 100644
--- a/localedata/locales/gu_IN
+++ b/localedata/locales/gu_IN
@@ -25,19 +25,19 @@ language   "Gujarati"
 territory  "India"
 revision   "0.2"
 date       "2004-14-09"
-%
-category  "gu_IN:2000";LC_IDENTIFICATION
-category  "gu_IN:2000";LC_CTYPE
-category  "gu_IN:2000";LC_COLLATE
-category  "gu_IN:2000";LC_TIME
-category  "gu_IN:2000";LC_NUMERIC
-category  "gu_IN:2000";LC_MONETARY
-category  "gu_IN:2000";LC_MESSAGES
-category  "gu_IN:2000";LC_PAPER
-category  "gu_IN:2000";LC_NAME
-category  "gu_IN:2000";LC_ADDRESS
-category  "gu_IN:2000";LC_TELEPHONE
-category  "gu_IN: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_CTYPE
diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB
index 9b7bc0a7f2..73fa14e7f3 100644
--- a/localedata/locales/gv_GB
+++ b/localedata/locales/gv_GB
@@ -37,19 +37,19 @@ language   "Manx"
 territory  "United Kingdom"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "gv_GB:2000";LC_IDENTIFICATION
-category  "gv_GB:2000";LC_CTYPE
-category  "gv_GB:2000";LC_COLLATE
-category  "gv_GB:2000";LC_TIME
-category  "gv_GB:2000";LC_NUMERIC
-category  "gv_GB:2000";LC_MONETARY
-category  "gv_GB:2000";LC_MESSAGES
-category  "gv_GB:2000";LC_PAPER
-category  "gv_GB:2000";LC_NAME
-category  "gv_GB:2000";LC_ADDRESS
-category  "gv_GB:2000";LC_TELEPHONE
-category  "gv_GB: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_CTYPE
diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG
index 6218b31ef0..fa89c649ea 100644
--- a/localedata/locales/ha_NG
+++ b/localedata/locales/ha_NG
@@ -31,19 +31,19 @@ language   "Hausa"
 territory  "Nigeria"
 revision   "0.2"
 date       "2006-02-01"
-%
-category  "ha_NG:2000";LC_IDENTIFICATION
-category  "ha_NG:2000";LC_CTYPE
-category  "ha_NG:2000";LC_COLLATE
-category  "ha_NG:2000";LC_TIME
-category  "ha_NG:2000";LC_NUMERIC
-category  "ha_NG:2000";LC_MONETARY
-category  "ha_NG:2000";LC_MESSAGES
-category  "ha_NG:2000";LC_PAPER
-category  "ha_NG:2000";LC_NAME
-category  "ha_NG:2000";LC_ADDRESS
-category  "ha_NG:2000";LC_TELEPHONE
-category  "ha_NG: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
diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
index 0de8550dbb..ca5689a738 100644
--- a/localedata/locales/hak_TW
+++ b/localedata/locales/hak_TW
@@ -32,19 +32,19 @@ language     "Hakka Chinese"
 territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
-%
-category  "hak_TW:2000";LC_IDENTIFICATION
-category  "hak_TW:2000";LC_CTYPE
-category  "hak_TW:2000";LC_COLLATE
-category  "hak_TW:2000";LC_TIME
-category  "hak_TW:2000";LC_NUMERIC
-category  "hak_TW:2000";LC_MONETARY
-category  "hak_TW:2000";LC_PAPER
-category  "hak_TW:2000";LC_MEASUREMENT
-category  "hak_TW:2000";LC_MESSAGES
-category  "hak_TW:2000";LC_NAME
-category  "hak_TW:2000";LC_ADDRESS
-category  "hak_TW:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL
index 0d92853e2e..10fad57a5a 100644
--- a/localedata/locales/he_IL
+++ b/localedata/locales/he_IL
@@ -39,19 +39,19 @@ language   "Hebrew"
 territory  "Israel"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "he_IL:2000";LC_IDENTIFICATION
-category  "he_IL:2000";LC_CTYPE
-category  "he_IL:2000";LC_COLLATE
-category  "he_IL:2000";LC_TIME
-category  "he_IL:2000";LC_NUMERIC
-category  "he_IL:2000";LC_MONETARY
-category  "he_IL:2000";LC_MESSAGES
-category  "he_IL:2000";LC_PAPER
-category  "he_IL:2000";LC_NAME
-category  "he_IL:2000";LC_ADDRESS
-category  "he_IL:2000";LC_TELEPHONE
-category  "he_IL: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_CTYPE
diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN
index 4c3fdb7ad2..c6b86f17b5 100644
--- a/localedata/locales/hi_IN
+++ b/localedata/locales/hi_IN
@@ -24,19 +24,19 @@ language   "Hindi"
 territory  "India"
 revision   "1.0"
 date       "2000-07-21"
-%
-category  "hi_IN:2000";LC_IDENTIFICATION
-category  "hi_IN:2000";LC_CTYPE
-category  "hi_IN:2000";LC_COLLATE
-category  "hi_IN:2000";LC_TIME
-category  "hi_IN:2000";LC_NUMERIC
-category  "hi_IN:2000";LC_MONETARY
-category  "hi_IN:2000";LC_MESSAGES
-category  "hi_IN:2000";LC_PAPER
-category  "hi_IN:2000";LC_NAME
-category  "hi_IN:2000";LC_ADDRESS
-category  "hi_IN:2000";LC_TELEPHONE
-category  "hi_IN: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_CTYPE
diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN
index 47ef384670..26f3eb547b 100644
--- a/localedata/locales/hne_IN
+++ b/localedata/locales/hne_IN
@@ -24,19 +24,19 @@ language   "Chhattisgarhi"
 territory  "India"
 revision   "1.0"
 date       "2008-12-03"
-%
-category  "hne_IN:2008";LC_IDENTIFICATION
-category  "hne_IN:2008";LC_CTYPE
-category  "hne_IN:2008";LC_COLLATE
-category  "hne_IN:2008";LC_TIME
-category  "hne_IN:2008";LC_NUMERIC
-category  "hne_IN:2008";LC_MONETARY
-category  "hne_IN:2008";LC_MESSAGES
-category  "hne_IN:2008";LC_PAPER
-category  "hne_IN:2008";LC_NAME
-category  "hne_IN:2008";LC_ADDRESS
-category  "hne_IN:2008";LC_TELEPHONE
-category  "hne_IN:2008";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_CTYPE
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index ce73d8826f..a1fe6f8d33 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -36,19 +36,19 @@ language   "Croatian"
 territory  "Croatia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "hr_HR:2000";LC_IDENTIFICATION
-category  "hr_HR:2000";LC_CTYPE
-category  "hr_HR:2000";LC_COLLATE
-category  "hr_HR:2000";LC_TIME
-category  "hr_HR:2000";LC_NUMERIC
-category  "hr_HR:2000";LC_MONETARY
-category  "hr_HR:2000";LC_MESSAGES
-category  "hr_HR:2000";LC_PAPER
-category  "hr_HR:2000";LC_NAME
-category  "hr_HR:2000";LC_ADDRESS
-category  "hr_HR:2000";LC_TELEPHONE
-category  "hr_HR: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
diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE
index a473f69319..6ef5963ebd 100644
--- a/localedata/locales/hsb_DE
+++ b/localedata/locales/hsb_DE
@@ -24,19 +24,19 @@ language   "Upper Sorbian"
 territory  "Germany"
 revision   "0.1"
 date       "2004-09-09"
-%
-category  "i18n:1997";LC_IDENTIFICATION
-category  "i18n:1997";LC_CTYPE
-category  "i18n:1997";LC_COLLATE
-category  "i18n:1997";LC_TIME
-category  "i18n:1997";LC_NUMERIC
-category  "i18n:1997";LC_MONETARY
-category  "i18n:1997";LC_MESSAGES
-category  "i18n:1997";LC_PAPER
-category  "i18n:1997";LC_NAME
-category  "i18n:1997";LC_ADDRESS
-category  "i18n:1997";LC_TELEPHONE
-category  "i18n:1997";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
diff --git a/localedata/locales/ht_HT b/localedata/locales/ht_HT
index dd95d87b67..5500301158 100644
--- a/localedata/locales/ht_HT
+++ b/localedata/locales/ht_HT
@@ -39,19 +39,19 @@ language     "Haitian Creole"
 territory    "Haiti"
 revision     "1.1"
 date         "2013-08-09"
-%
-category  "ht_HT:2000";LC_IDENTIFICATION
-category  "ht_HT:2000";LC_CTYPE
-category  "ht_HT:2000";LC_COLLATE
-category  "ht_HT:2000";LC_TIME
-category  "ht_HT:2000";LC_NUMERIC
-category  "ht_HT:2000";LC_MONETARY
-category  "ht_HT:2000";LC_PAPER
-category  "ht_HT:2000";LC_MEASUREMENT
-category  "ht_HT:2000";LC_MESSAGES
-category  "ht_HT:2000";LC_NAME
-category  "ht_HT:2000";LC_ADDRESS
-category  "ht_HT:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index 8330848397..d76226dcda 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -48,19 +48,19 @@ language   "Hungarian"
 territory  "Hungary"
 revision   "4.7"
 date       "2001-01-29"
-%
-category  "hu_HU:2000";LC_IDENTIFICATION
-category  "hu_HU:2000";LC_CTYPE
-category  "hu_HU:2000";LC_COLLATE
-category  "hu_HU:2000";LC_TIME
-category  "hu_HU:2000";LC_NUMERIC
-category  "hu_HU:2000";LC_MONETARY
-category  "hu_HU:2000";LC_MESSAGES
-category  "hu_HU:2000";LC_PAPER
-category  "hu_HU:2000";LC_NAME
-category  "hu_HU:2000";LC_ADDRESS
-category  "hu_HU:2000";LC_TELEPHONE
-category  "hu_HU: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
diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM
index ffb3d3473d..795938153a 100644
--- a/localedata/locales/hy_AM
+++ b/localedata/locales/hy_AM
@@ -25,22 +25,17 @@ territory "Armenia"
 revision "0.4"
 date "2001-01-26"
 
-category "hy_AM:2000";LC_IDENTIFICATION
-category "hy_AM:2000";LC_COLLATE
-category "hy_AM:2000";LC_CTYPE
-category "hy_AM:2000";LC_MESSAGES
-category "hy_AM:2000";LC_MONETARY
-category "hy_AM:2000";LC_NUMERIC
-category "hy_AM:2000";LC_TIME
-category "hy_AM:2000";LC_PAPER
-category "hy_AM:2000";LC_MEASUREMENT
-category "hy_AM:2000";LC_TELEPHONE
-category "hy_AM:2000";LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE
-% -- mckinstry@computer.org, 2000-06-20
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/i18n b/localedata/locales/i18n
index be60caaf4e..115cb05287 100644
--- a/localedata/locales/i18n
+++ b/localedata/locales/i18n
@@ -20,19 +20,18 @@ language              ""
 territory             ""
 revision              ""
 date                  "2015-12-09"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_TIME
-category  "i18n:2000";LC_NUMERIC
-category  "i18n:2000";LC_MONETARY
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_TELEPHONE
 
+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
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/ia_FR b/localedata/locales/ia_FR
index a25a89a34f..20d70c15ff 100644
--- a/localedata/locales/ia_FR
+++ b/localedata/locales/ia_FR
@@ -30,19 +30,18 @@ territory "France"
 revision "1.0"
 date "2013-03-01"
 
-category ia_FR:2000;LC_IDENTIFICATION
-category ia_FR:2000;LC_CTYPE
-category ia_FR:2000;LC_COLLATE
-category ia_FR:2000;LC_TIME
-category ia_FR:2000;LC_NUMERIC
-category ia_FR:2000;LC_MONETARY
-category ia_FR:2000;LC_MESSAGES
-category ia_FR:2000;LC_MEASUREMENT
-category ia_FR:2000;LC_PAPER
-category ia_FR:2000;LC_NAME
-category ia_FR:2000;LC_ADDRESS
-category ia_FR:2000;LC_TELEPHONE
-
+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_MEASUREMENT
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID
index d985cf4459..4322e2c8de 100644
--- a/localedata/locales/id_ID
+++ b/localedata/locales/id_ID
@@ -35,19 +35,19 @@ language   "Indonesian"
 territory  "Indonesia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "id_ID:2000";LC_IDENTIFICATION
-category  "id_ID:2000";LC_CTYPE
-category  "id_ID:2000";LC_COLLATE
-category  "id_ID:2000";LC_TIME
-category  "id_ID:2000";LC_NUMERIC
-category  "id_ID:2000";LC_MONETARY
-category  "id_ID:2000";LC_MESSAGES
-category  "id_ID:2000";LC_PAPER
-category  "id_ID:2000";LC_NAME
-category  "id_ID:2000";LC_ADDRESS
-category  "id_ID:2000";LC_TELEPHONE
-category  "id_ID: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_CTYPE
diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG
index 5824d3b4b8..890e401cc8 100644
--- a/localedata/locales/ig_NG
+++ b/localedata/locales/ig_NG
@@ -31,19 +31,19 @@ language   "Igbo"
 territory  "Nigeria"
 revision   "0.2"
 date       "2005-12-14"
-%
-category  "ig_NG:2000";LC_IDENTIFICATION
-category  "ig_NG:2000";LC_CTYPE
-category  "ig_NG:2000";LC_COLLATE
-category  "ig_NG:2000";LC_TIME
-category  "ig_NG:2000";LC_NUMERIC
-category  "ig_NG:2000";LC_MONETARY
-category  "ig_NG:2000";LC_MESSAGES
-category  "ig_NG:2000";LC_PAPER
-category  "ig_NG:2000";LC_NAME
-category  "ig_NG:2000";LC_ADDRESS
-category  "ig_NG:2000";LC_TELEPHONE
-category  "ig_NG: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
diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
index 1d7b9c9be7..04886909e9 100644
--- a/localedata/locales/ik_CA
+++ b/localedata/locales/ik_CA
@@ -31,19 +31,19 @@ language   "Inupiaq"
 territory  "Canada"
 revision   "0.2"
 date       "2004-08-01"
-%
-category  "ik_CA:2000";LC_IDENTIFICATION
-category  "ik_CA:2000";LC_CTYPE
-category  "ik_CA:2000";LC_COLLATE
-category  "ik_CA:2000";LC_TIME
-category  "ik_CA:2000";LC_NUMERIC
-category  "ik_CA:2000";LC_MONETARY
-category  "ik_CA:2000";LC_MESSAGES
-category  "ik_CA:2000";LC_PAPER
-category  "ik_CA:2000";LC_NAME
-category  "ik_CA:2000";LC_ADDRESS
-category  "ik_CA:2000";LC_TELEPHONE
-category  "ik_CA: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
diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index 45da779c19..c7479fbb0a 100644
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -36,19 +36,19 @@ language   "Icelandic"
 territory  "Iceland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "is_IS:2000";LC_IDENTIFICATION
-category  "is_IS:2000";LC_CTYPE
-category  "is_IS:2000";LC_COLLATE
-category  "is_IS:2000";LC_TIME
-category  "is_IS:2000";LC_NUMERIC
-category  "is_IS:2000";LC_MONETARY
-category  "is_IS:2000";LC_MESSAGES
-category  "is_IS:2000";LC_PAPER
-category  "is_IS:2000";LC_NAME
-category  "is_IS:2000";LC_ADDRESS
-category  "is_IS:2000";LC_TELEPHONE
-category  "is_IS: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
diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH
index 4eedc88822..9b4e94d9dd 100644
--- a/localedata/locales/it_CH
+++ b/localedata/locales/it_CH
@@ -28,19 +28,19 @@ language   "Italian"
 territory  "Switzerland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "it_CH:2000";LC_IDENTIFICATION
-category  "it_CH:2000";LC_CTYPE
-category  "it_CH:2000";LC_COLLATE
-category  "it_CH:2000";LC_TIME
-category  "it_CH:2000";LC_NUMERIC
-category  "it_CH:2000";LC_MONETARY
-category  "it_CH:2000";LC_MESSAGES
-category  "it_CH:2000";LC_PAPER
-category  "it_CH:2000";LC_NAME
-category  "it_CH:2000";LC_ADDRESS
-category  "it_CH:2000";LC_TELEPHONE
-category  "it_CH: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_CTYPE
diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
index 6efec968a8..1389171730 100644
--- a/localedata/locales/it_IT
+++ b/localedata/locales/it_IT
@@ -35,19 +35,19 @@ language   "Italian"
 territory  "Italy"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "it_IT:2000";LC_IDENTIFICATION
-category  "it_IT:2000";LC_CTYPE
-category  "it_IT:2000";LC_COLLATE
-category  "it_IT:2000";LC_TIME
-category  "it_IT:2000";LC_NUMERIC
-category  "it_IT:2000";LC_MONETARY
-category  "it_IT:2000";LC_MESSAGES
-category  "it_IT:2000";LC_PAPER
-category  "it_IT:2000";LC_NAME
-category  "it_IT:2000";LC_ADDRESS
-category  "it_IT:2000";LC_TELEPHONE
-category  "it_IT: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
diff --git a/localedata/locales/it_IT@euro b/localedata/locales/it_IT@euro
index 980d9ac647..569037347a 100644
--- a/localedata/locales/it_IT@euro
+++ b/localedata/locales/it_IT@euro
@@ -28,19 +28,19 @@ language   "Italian"
 territory  "Italy"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "it_IT@euro:2000";LC_IDENTIFICATION
-category  "it_IT@euro:2000";LC_CTYPE
-category  "it_IT@euro:2000";LC_COLLATE
-category  "it_IT@euro:2000";LC_TIME
-category  "it_IT@euro:2000";LC_NUMERIC
-category  "it_IT@euro:2000";LC_MONETARY
-category  "it_IT@euro:2000";LC_MESSAGES
-category  "it_IT@euro:2000";LC_PAPER
-category  "it_IT@euro:2000";LC_NAME
-category  "it_IT@euro:2000";LC_ADDRESS
-category  "it_IT@euro:2000";LC_TELEPHONE
-category  "it_IT@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
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index 0634020514..7c8b25712f 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -23,18 +23,18 @@ territory "Canada"
 revision "0.1"
 date "2001-05-04"
 
-category iu_CA:2000;LC_IDENTIFICATION
-category iu_CA:2000;LC_COLLATE
-category iu_CA:2000;LC_CTYPE
-category iu_CA:2000;LC_MESSAGES
-category iu_CA:2000;LC_MONETARY
-category iu_CA:2000;LC_NUMERIC
-category iu_CA:2000;LC_TIME
-category iu_CA:2000;LC_PAPER
-category iu_CA:2000;LC_NAME
-category iu_CA:2000;LC_MEASUREMENT
-category iu_CA:2000;LC_TELEPHONE
-category iu_CA:2000;LC_ADDRESS
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index 847e600937..a9cdc6e701 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -26,19 +26,19 @@ language   "Japanese"
 territory  "Japan"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "ja_JP:2000";LC_IDENTIFICATION
-category  "ja_JP:2000";LC_CTYPE
-category  "ja_JP:2000";LC_COLLATE
-category  "ja_JP:2000";LC_TIME
-category  "ja_JP:2000";LC_NUMERIC
-category  "ja_JP:2000";LC_MONETARY
-category  "ja_JP:2000";LC_MESSAGES
-category  "ja_JP:2000";LC_PAPER
-category  "ja_JP:2000";LC_NAME
-category  "ja_JP:2000";LC_ADDRESS
-category  "ja_JP:2000";LC_TELEPHONE
-category  "ja_JP: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_CTYPE
diff --git a/localedata/locales/ka_GE b/localedata/locales/ka_GE
index 89e26c037f..e29ca01259 100644
--- a/localedata/locales/ka_GE
+++ b/localedata/locales/ka_GE
@@ -23,23 +23,18 @@ territory "Georgia"
 revision "0.6"
 date "2001-01-26"
 
-category ka_GE:2000;LC_IDENTIFICATION
-category ka_GE:2000;LC_CTYPE
-category ka_GE:2000;LC_COLLATE
-category ka_GE:2000;LC_TIME
-category ka_GE:2000;LC_NUMERIC
-category ka_GE:2000;LC_PAPER
-category ka_GE:2000;LC_NAME
-category ka_GE:2000;LC_ADDRESS
-category ka_GE:2000;LC_TELEPHONE
-category ka_GE:2000;LC_MEASUREMENT
-category ka_GE:2000;LC_MESSAGES
-category ka_GE:2000;LC_MONETARY
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-% -- mckinstry@computer.org, 2000-06-20
-
+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_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ
index b5c895138c..da10e1d5b0 100644
--- a/localedata/locales/kk_KZ
+++ b/localedata/locales/kk_KZ
@@ -35,19 +35,19 @@ language   "Kazakh"
 territory  "Kazakhstan"
 revision   "1.0"
 date       "2003-06-06"
-%
-category  "kk_KZ:2000";LC_IDENTIFICATION
-category  "kk_KZ:2000";LC_CTYPE
-category  "kk_KZ:2000";LC_COLLATE
-category  "kk_KZ:2000";LC_TIME
-category  "kk_KZ:2000";LC_NUMERIC
-category  "kk_KZ:2000";LC_MONETARY
-category  "kk_KZ:2000";LC_MESSAGES
-category  "kk_KZ:2000";LC_PAPER
-category  "kk_KZ:2000";LC_NAME
-category  "kk_KZ:2000";LC_ADDRESS
-category  "kk_KZ:2000";LC_TELEPHONE
-category  "kk_KZ: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
diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
index 2c2455f763..033872ff90 100644
--- a/localedata/locales/kl_GL
+++ b/localedata/locales/kl_GL
@@ -39,19 +39,19 @@ language   "Kalaallisut"
 territory  "Greenland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "kl_GL:2000";LC_IDENTIFICATION
-category  "kl_GL:2000";LC_CTYPE
-category  "kl_GL:2000";LC_COLLATE
-category  "kl_GL:2000";LC_TIME
-category  "kl_GL:2000";LC_NUMERIC
-category  "kl_GL:2000";LC_MONETARY
-category  "kl_GL:2000";LC_MESSAGES
-category  "kl_GL:2000";LC_PAPER
-category  "kl_GL:2000";LC_NAME
-category  "kl_GL:2000";LC_ADDRESS
-category  "kl_GL:2000";LC_TELEPHONE
-category  "kl_GL: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_CTYPE
diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index d21efc0859..2f3eab7ef1 100644
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -32,19 +32,19 @@ language   "Khmer"
 territory  "Cambodia"
 revision   "1.0"
 date       "2005-3-15"
-%
-category  "km_KH:2000";LC_IDENTIFICATION
-category  "km_KH:2000";LC_CTYPE
-category  "km_KH:2000";LC_COLLATE
-category  "km_KH:2000";LC_TIME
-category  "km_KH:2000";LC_NUMERIC
-category  "km_KH:2000";LC_MONETARY
-category  "km_KH:2000";LC_MESSAGES
-category  "km_KH:2000";LC_PAPER
-category  "km_KH:2000";LC_NAME
-category  "km_KH:2000";LC_ADDRESS
-category  "km_KH:2000";LC_TELEPHONE
-category  "km_KH: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_CTYPE
diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN
index 4282f5a6f6..3a9f351842 100644
--- a/localedata/locales/kn_IN
+++ b/localedata/locales/kn_IN
@@ -26,19 +26,19 @@ language   "Kannada"
 territory  "India"
 revision   "0.1"
 date       "2002-11-28"
-%
-category  "kn_IN:2000";LC_IDENTIFICATION
-category  "kn_IN:2000";LC_CTYPE
-category  "kn_IN:2000";LC_COLLATE
-category  "kn_IN:2000";LC_TIME
-category  "kn_IN:2000";LC_NUMERIC
-category  "kn_IN:2000";LC_MONETARY
-category  "kn_IN:2000";LC_MESSAGES
-category  "kn_IN:2000";LC_PAPER
-category  "kn_IN:2000";LC_NAME
-category  "kn_IN:2000";LC_ADDRESS
-category  "kn_IN:2000";LC_TELEPHONE
-category  "kn_IN: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_CTYPE
diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR
index 66057436d8..71f6305c00 100644
--- a/localedata/locales/ko_KR
+++ b/localedata/locales/ko_KR
@@ -56,19 +56,19 @@ language   "Korean"
 territory  "South Korea"
 revision   "1.1"
 date       "2000-11-09"
-%
-category  "ko_KR:2000";LC_IDENTIFICATION
-category  "ko_KR:2000";LC_CTYPE
-category  "ko_KR:2000";LC_COLLATE
-category  "ko_KR:2000";LC_TIME
-category  "ko_KR:2000";LC_NUMERIC
-category  "ko_KR:2000";LC_MONETARY
-category  "ko_KR:2000";LC_MESSAGES
-category  "ko_KR:2000";LC_PAPER
-category  "ko_KR:2000";LC_NAME
-category  "ko_KR:2000";LC_ADDRESS
-category  "ko_KR:2000";LC_TELEPHONE
-category  "ko_KR: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
diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN
index cb34a94504..1a5418695e 100644
--- a/localedata/locales/kok_IN
+++ b/localedata/locales/kok_IN
@@ -24,19 +24,19 @@ language   "Konkani"
 territory  "India"
 revision   "1.0"
 date       "2009,December,08"
-%
-category  "kok_IN:2009";LC_IDENTIFICATION
-category  "kok_IN:2009";LC_CTYPE
-category  "kok_IN:2009";LC_COLLATE
-category  "kok_IN:2009";LC_TIME
-category  "kok_IN:2009";LC_NUMERIC
-category  "kok_IN:2009";LC_MONETARY
-category  "kok_IN:2009";LC_MESSAGES
-category  "kok_IN:2009";LC_PAPER
-category  "kok_IN:2009";LC_NAME
-category  "kok_IN:2009";LC_ADDRESS
-category  "kok_IN:2009";LC_TELEPHONE
-category  "kok_IN:2009";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_CTYPE
diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN
index b208e9d82e..2c0da758d4 100644
--- a/localedata/locales/ks_IN
+++ b/localedata/locales/ks_IN
@@ -25,19 +25,19 @@ language    "Kashmiri"
 territory   "India"
 revision    "1.0"
 date        "2009,April,06"
-%
-category  "ks_IN:2009";LC_IDENTIFICATION
-category  "ks_IN:2009";LC_CTYPE
-category  "ks_IN:2009";LC_COLLATE
-category  "ks_IN:2009";LC_TIME
-category  "ks_IN:2009";LC_NUMERIC
-category  "ks_IN:2009";LC_MONETARY
-category  "ks_IN:2009";LC_MESSAGES
-category  "ks_IN:2009";LC_PAPER
-category  "ks_IN:2009";LC_NAME
-category  "ks_IN:2009";LC_ADDRESS
-category  "ks_IN:2009";LC_TELEPHONE
-category  "ks_IN:2009";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
 
 
diff --git a/localedata/locales/ks_IN@devanagari b/localedata/locales/ks_IN@devanagari
index 2c4af38f1c..6c780005e5 100644
--- a/localedata/locales/ks_IN@devanagari
+++ b/localedata/locales/ks_IN@devanagari
@@ -24,19 +24,19 @@ language   "Kashmiri"
 territory  "India"
 revision   "0.1"
 date       "2008-08-26"
-%
-category  "ks_IN@devanagari:2008";LC_IDENTIFICATION
-category  "ks_IN@devanagari:2008";LC_CTYPE
-category  "ks_IN@devanagari:2008";LC_COLLATE
-category  "ks_IN@devanagari:2008";LC_TIME
-category  "ks_IN@devanagari:2008";LC_NUMERIC
-category  "ks_IN@devanagari:2008";LC_MONETARY
-category  "ks_IN@devanagari:2008";LC_MESSAGES
-category  "ks_IN@devanagari:2008";LC_PAPER
-category  "ks_IN@devanagari:2008";LC_NAME
-category  "ks_IN@devanagari:2008";LC_ADDRESS
-category  "ks_IN@devanagari:2008";LC_TELEPHONE
-category  "ks_IN@devanagari:2008";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_CTYPE
diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR
index f47141e2a4..91ef993e20 100644
--- a/localedata/locales/ku_TR
+++ b/localedata/locales/ku_TR
@@ -34,20 +34,19 @@ language   "Kurdish"
 territory  "Turkey"
 revision   "0.1"
 date       "2003-07-27"
-%
-category  "ku_TR:2000";LC_IDENTIFICATION
-category  "ku_TR:2000";LC_CTYPE
-category  "ku_TR:2000";LC_COLLATE
-category  "ku_TR:2000";LC_TIME
-category  "ku_TR:2000";LC_NUMERIC
-category  "ku_TR:2000";LC_MONETARY
-category  "ku_TR:2000";LC_MESSAGES
-category  "ku_TR:2000";LC_PAPER
-category  "ku_TR:2000";LC_NAME
-category  "ku_TR:2000";LC_ADDRESS
-category  "ku_TR:2000";LC_TELEPHONE
-category  "ku_TR: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_CTYPE
diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB
index 898f623481..6bb6a3aff0 100644
--- a/localedata/locales/kw_GB
+++ b/localedata/locales/kw_GB
@@ -38,19 +38,19 @@ language   "Cornish"
 territory  "United Kingdom"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "kw_GB:2000";LC_IDENTIFICATION
-category  "kw_GB:2000";LC_CTYPE
-category  "kw_GB:2000";LC_COLLATE
-category  "kw_GB:2000";LC_TIME
-category  "kw_GB:2000";LC_NUMERIC
-category  "kw_GB:2000";LC_MONETARY
-category  "kw_GB:2000";LC_MESSAGES
-category  "kw_GB:2000";LC_PAPER
-category  "kw_GB:2000";LC_NAME
-category  "kw_GB:2000";LC_ADDRESS
-category  "kw_GB:2000";LC_TELEPHONE
-category  "kw_GB: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_CTYPE
diff --git a/localedata/locales/ky_KG b/localedata/locales/ky_KG
index adf54845ec..356acbaed5 100644
--- a/localedata/locales/ky_KG
+++ b/localedata/locales/ky_KG
@@ -26,19 +26,19 @@ language "Kyrgyz"
 territory "Kyrgyzstan"
 revision "0.2"
 date "2004-10-14"
-%
-category  "ky_KG:2000";LC_IDENTIFICATION
-category  "ky_KG:2000";LC_CTYPE
-category  "ky_KG:2000";LC_COLLATE
-category  "ky_KG:2000";LC_TIME
-category  "ky_KG:2000";LC_NUMERIC
-category  "ky_KG:2000";LC_MONETARY
-category  "ky_KG:2000";LC_MESSAGES
-category  "ky_KG:2000";LC_PAPER
-category  "ky_KG:2000";LC_NAME
-category  "ky_KG:2000";LC_ADDRESS
-category  "ky_KG:2000";LC_TELEPHONE
-category  "ky_KG: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
diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU
index dd30e9bbdc..301cdc0bb6 100644
--- a/localedata/locales/lb_LU
+++ b/localedata/locales/lb_LU
@@ -24,20 +24,19 @@ language   "Luxembourgish"
 territory  "Luxembourg"
 revision   "0.2"
 date       "2011-01-28"
-%
-category  "lb_LU:2011";LC_IDENTIFICATION
-category  "lb_LU:2011";LC_CTYPE
-category  "lb_LU:2011";LC_COLLATE
-category  "lb_LU:2011";LC_MONETARY
-category  "lb_LU:2011";LC_NUMERIC
-category  "lb_LU:2011";LC_TIME
-category  "lb_LU:2011";LC_MESSAGES
-category  "lb_LU:2011";LC_PAPER
-category  "lb_LU:2011";LC_NAME
-category  "lb_LU:2011";LC_ADDRESS
-category  "lb_LU:2011";LC_TELEPHONE
-category  "lb_LU:2011";LC_MEASUREMENT
 
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+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_CTYPE
diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG
index 4fb6efd314..482ad509d4 100644
--- a/localedata/locales/lg_UG
+++ b/localedata/locales/lg_UG
@@ -35,19 +35,19 @@ language   "Ganda"
 territory  "Uganda"
 revision   "1.0"
 date       "2001-11-04"
-%
-category  "lg_UG:2001";LC_IDENTIFICATION
-category  "lg_UG:2001";LC_CTYPE
-category  "lg_UG:2001";LC_COLLATE
-category  "lg_UG:2001";LC_TIME
-category  "lg_UG:2001";LC_NUMERIC
-category  "lg_UG:2001";LC_MONETARY
-category  "lg_UG:2001";LC_MESSAGES
-category  "lg_UG:2001";LC_PAPER
-category  "lg_UG:2001";LC_NAME
-category  "lg_UG:2001";LC_ADDRESS
-category  "lg_UG:2001";LC_TELEPHONE
-category  "lg_UG:2001";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_CTYPE
diff --git a/localedata/locales/li_BE b/localedata/locales/li_BE
index 805e958d61..f30ab042ad 100644
--- a/localedata/locales/li_BE
+++ b/localedata/locales/li_BE
@@ -21,24 +21,18 @@ territory "Belgium"
 revision "0.1"
 date "2003-11-30"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_NAME
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-%  copied LC_MONETARY, LC_NUMERIC from de_DE for simplicity
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/li_NL b/localedata/locales/li_NL
index 1f8ac17e08..127037f255 100644
--- a/localedata/locales/li_NL
+++ b/localedata/locales/li_NL
@@ -21,24 +21,18 @@ territory "Netherlands"
 revision "0.1"
 date "2003-11-30"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_NAME
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-%  copied LC_MONETARY, LC_NUMERIC from de_DE for simplicity
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/lij_IT b/localedata/locales/lij_IT
index 73e5b5d7af..2449bc085f 100644
--- a/localedata/locales/lij_IT
+++ b/localedata/locales/lij_IT
@@ -23,19 +23,19 @@ language   "Ligurian"
 territory  "Italy"
 revision   "1.0"
 date       "2010-10-22"
-%
-category  "lij_IT:2000";LC_IDENTIFICATION
-category  "lij_IT:2000";LC_CTYPE
-category  "lij_IT:2000";LC_COLLATE
-category  "lij_IT:2000";LC_TIME
-category  "lij_IT:2000";LC_NUMERIC
-category  "lij_IT:2000";LC_MONETARY
-category  "lij_IT:2000";LC_MESSAGES
-category  "lij_IT:2000";LC_PAPER
-category  "lij_IT:2000";LC_NAME
-category  "lij_IT:2000";LC_ADDRESS
-category  "lij_IT:2000";LC_TELEPHONE
-category  "lij_IT: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
diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
index 2b363b6df9..1d27568d77 100644
--- a/localedata/locales/lo_LA
+++ b/localedata/locales/lo_LA
@@ -32,19 +32,19 @@ language   "Lao"
 territory  "Laos"
 revision   "1.0"
 date       "2003-4-1"
-%
-category  "lo_LA:2000";LC_IDENTIFICATION
-category  "lo_LA:2000";LC_CTYPE
-category  "lo_LA:2000";LC_COLLATE
-category  "lo_LA:2000";LC_TIME
-category  "lo_LA:2000";LC_NUMERIC
-category  "lo_LA:2000";LC_MONETARY
-category  "lo_LA:2000";LC_MESSAGES
-category  "lo_LA:2000";LC_PAPER
-category  "lo_LA:2000";LC_NAME
-category  "lo_LA:2000";LC_ADDRESS
-category  "lo_LA:2000";LC_TELEPHONE
-category  "lo_LA: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_CTYPE
diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT
index 84bac3650f..8558b4ea6a 100644
--- a/localedata/locales/lt_LT
+++ b/localedata/locales/lt_LT
@@ -46,19 +46,19 @@ language   "Lithuanian"
 territory  "Lithuania"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "lt_LT:2000";LC_IDENTIFICATION
-category  "lt_LT:2000";LC_CTYPE
-category  "lt_LT:2000";LC_COLLATE
-category  "lt_LT:2000";LC_TIME
-category  "lt_LT:2000";LC_NUMERIC
-category  "lt_LT:2000";LC_MONETARY
-category  "lt_LT:2000";LC_MESSAGES
-category  "lt_LT:2000";LC_PAPER
-category  "lt_LT:2000";LC_NAME
-category  "lt_LT:2000";LC_ADDRESS
-category  "lt_LT:2000";LC_TELEPHONE
-category  "lt_LT: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
diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV
index 3ca20e15bc..3b0df334b5 100644
--- a/localedata/locales/lv_LV
+++ b/localedata/locales/lv_LV
@@ -38,19 +38,19 @@ language   "Latvian"
 territory  "Latvia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "lv_LV:2000";LC_IDENTIFICATION
-category  "lv_LV:2000";LC_CTYPE
-category  "lv_LV:2000";LC_COLLATE
-category  "lv_LV:2000";LC_TIME
-category  "lv_LV:2000";LC_NUMERIC
-category  "lv_LV:2000";LC_MONETARY
-category  "lv_LV:2000";LC_MESSAGES
-category  "lv_LV:2000";LC_PAPER
-category  "lv_LV:2000";LC_NAME
-category  "lv_LV:2000";LC_ADDRESS
-category  "lv_LV:2000";LC_TELEPHONE
-category  "lv_LV: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
diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
index 4293b44c38..d479a3f552 100644
--- a/localedata/locales/lzh_TW
+++ b/localedata/locales/lzh_TW
@@ -32,19 +32,19 @@ language     "Literary Chinese"
 territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
-%
-category  "lzh_TW:2000";LC_IDENTIFICATION
-category  "lzh_TW:2000";LC_CTYPE
-category  "lzh_TW:2000";LC_COLLATE
-category  "lzh_TW:2000";LC_TIME
-category  "lzh_TW:2000";LC_NUMERIC
-category  "lzh_TW:2000";LC_MONETARY
-category  "lzh_TW:2000";LC_PAPER
-category  "lzh_TW:2000";LC_MEASUREMENT
-category  "lzh_TW:2000";LC_MESSAGES
-category  "lzh_TW:2000";LC_NAME
-category  "lzh_TW:2000";LC_ADDRESS
-category  "lzh_TW:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/mag_IN b/localedata/locales/mag_IN
index e3609d9aad..3bc64fe8ee 100644
--- a/localedata/locales/mag_IN
+++ b/localedata/locales/mag_IN
@@ -25,19 +25,19 @@ language   "Magahi"
 territory  "India"
 revision   "0.1"
 date       "2012-04-11"
-%
-category  "mag_IN:2012";LC_IDENTIFICATION
-category  "mag_IN:2012";LC_CTYPE
-category  "mag_IN:2012";LC_COLLATE
-category  "mag_IN:2012";LC_TIME
-category  "mag_IN:2012";LC_NUMERIC
-category  "mag_IN:2012";LC_MONETARY
-category  "mag_IN:2012";LC_MESSAGES
-category  "mag_IN:2012";LC_PAPER
-category  "mag_IN:2012";LC_NAME
-category  "mag_IN:2012";LC_ADDRESS
-category  "mag_IN:2012";LC_TELEPHONE
-category  "mag_IN:2012";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_CTYPE
diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN
index d906d8387e..a005d0a57f 100644
--- a/localedata/locales/mai_IN
+++ b/localedata/locales/mai_IN
@@ -24,19 +24,19 @@ language   "Maithili"
 territory  "India"
 revision   "1.0"
 date       "2006-11-01"
-%
-category  "mai_IN:2006";LC_IDENTIFICATION
-category  "mai_IN:2006";LC_CTYPE
-category  "mai_IN:2006";LC_COLLATE
-category  "mai_IN:2006";LC_TIME
-category  "mai_IN:2006";LC_NUMERIC
-category  "mai_IN:2006";LC_MONETARY
-category  "mai_IN:2006";LC_MESSAGES
-category  "mai_IN:2006";LC_PAPER
-category  "mai_IN:2006";LC_NAME
-category  "mai_IN:2006";LC_ADDRESS
-category  "mai_IN:2006";LC_TELEPHONE
-category  "mai_IN:2006";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_CTYPE
diff --git a/localedata/locales/mg_MG b/localedata/locales/mg_MG
index 4fd5ab4d36..1c82d374ee 100644
--- a/localedata/locales/mg_MG
+++ b/localedata/locales/mg_MG
@@ -32,19 +32,19 @@ language   "Malagasy"
 territory  "Madagascar"
 revision   "1.1"
 date       "2005-02-02"
-%
-category  "mg_MG:2000";LC_IDENTIFICATION
-category  "mg_MG:2000";LC_CTYPE
-category  "mg_MG:2000";LC_COLLATE
-category  "mg_MG:2000";LC_TIME
-category  "mg_MG:2000";LC_NUMERIC
-category  "mg_MG:2000";LC_MONETARY
-category  "mg_MG:2000";LC_MESSAGES
-category  "mg_MG:2000";LC_PAPER
-category  "mg_MG:2000";LC_NAME
-category  "mg_MG:2000";LC_ADDRESS
-category  "mg_MG:2000";LC_TELEPHONE
-category  "mg_MG: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_CTYPE
diff --git a/localedata/locales/mhr_RU b/localedata/locales/mhr_RU
index 7da18fa83d..3be3662298 100644
--- a/localedata/locales/mhr_RU
+++ b/localedata/locales/mhr_RU
@@ -34,19 +34,19 @@ language   "Meadow Mari"
 territory  "Russia"
 revision   "0.2"
 date       "2011-04-18"
-%
-category  "mhr_RU:2000";LC_IDENTIFICATION
-category  "mhr_RU:2000";LC_CTYPE
-category  "mhr_RU:2000";LC_COLLATE
-category  "mhr_RU:2000";LC_TIME
-category  "mhr_RU:2000";LC_NUMERIC
-category  "mhr_RU:2000";LC_MONETARY
-category  "mhr_RU:2000";LC_MESSAGES
-category  "mhr_RU:2000";LC_PAPER
-category  "mhr_RU:2000";LC_NAME
-category  "mhr_RU:2000";LC_ADDRESS
-category  "mhr_RU:2000";LC_TELEPHONE
-category  "mhr_RU: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
diff --git a/localedata/locales/mi_NZ b/localedata/locales/mi_NZ
index 8f9146103f..67c662196e 100644
--- a/localedata/locales/mi_NZ
+++ b/localedata/locales/mi_NZ
@@ -32,18 +32,17 @@ territory "New Zealand"
 revision "0.3"
 date "2001-01-28"
 
-category mi_NZ:2000;LC_IDENTIFICATION
-category mi_NZ:2000;LC_CTYPE
-category mi_NZ:2000;LC_COLLATE
-category mi_NZ:2000;LC_TIME
-category mi_NZ:2000;LC_NUMERIC
-category mi_NZ:2000;LC_PAPER
-category mi_NZ:2000;LC_TELEPHONE
-category mi_NZ:2000;LC_MEASUREMENT
-category mi_NZ:2000;LC_ADDRESS
-category mi_NZ:2000;LC_MESSAGES
-category mi_NZ:2000;LC_MONETARY
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK
index 018e3683f8..7a20ae3036 100644
--- a/localedata/locales/mk_MK
+++ b/localedata/locales/mk_MK
@@ -25,19 +25,19 @@ language   "Macedonian"
 territory  "Macedonia"
 revision   "2.2"
 date       "2006-09-12"
-%
-category  "mk_MK:2000";LC_IDENTIFICATION
-category  "mk_MK:2000";LC_CTYPE
-category  "mk_MK:2000";LC_COLLATE
-category  "mk_MK:2000";LC_TIME
-category  "mk_MK:2000";LC_NUMERIC
-category  "mk_MK:2000";LC_MONETARY
-category  "mk_MK:2000";LC_MESSAGES
-category  "mk_MK:2000";LC_PAPER
-category  "mk_MK:2000";LC_NAME
-category  "mk_MK:2000";LC_ADDRESS
-category  "mk_MK:2000";LC_TELEPHONE
-category  "mk_MK: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
diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN
index 3e8f216b16..6d1ec5193c 100644
--- a/localedata/locales/ml_IN
+++ b/localedata/locales/ml_IN
@@ -24,19 +24,19 @@ language     "Malayalam"
 territory     "India"
 revision     "0.1"
 date     "2003-February-01"
-%
-category     "ml_IN:2000";LC_IDENTIFICATION
-category     "ml_IN:2000";LC_CTYPE
-category     "ml_IN:2000";LC_COLLATE
-category     "ml_IN:2000";LC_TIME
-category     "ml_IN:2000";LC_NUMERIC
-category     "ml_IN:2000";LC_MONETARY
-category     "ml_IN:2000";LC_MESSAGES
-category     "ml_IN:2000";LC_PAPER
-category     "ml_IN:2000";LC_NAME
-category     "ml_IN:2000";LC_ADDRESS
-category     "ml_IN:2000";LC_TELEPHONE
-category     "ml_IN: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_CTYPE
 copy	"i18n"
diff --git a/localedata/locales/mn_MN b/localedata/locales/mn_MN
index 4d2ecb7226..7d71eb5152 100644
--- a/localedata/locales/mn_MN
+++ b/localedata/locales/mn_MN
@@ -27,19 +27,19 @@ revision   "1.0"
 date       "2005-05-21"
 audience   "general"
 application   "GNU locale"
-%
-category  "mn_MN:2000";LC_IDENTIFICATION
-category  "mn_MN:2000";LC_CTYPE
-category  "mn_MN:2000";LC_COLLATE
-category  "mn_MN:2000";LC_TIME
-category  "mn_MN:2000";LC_NUMERIC
-category  "mn_MN:2000";LC_MONETARY
-category  "mn_MN:2000";LC_MESSAGES
-category  "mn_MN:2000";LC_PAPER
-category  "mn_MN:2000";LC_NAME
-category  "mn_MN:2000";LC_ADDRESS
-category  "mn_MN:2000";LC_TELEPHONE
-category  "mn_MN: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
diff --git a/localedata/locales/mni_IN b/localedata/locales/mni_IN
index 38aa524dfa..b4875e2240 100644
--- a/localedata/locales/mni_IN
+++ b/localedata/locales/mni_IN
@@ -23,19 +23,19 @@ language   "Manipuri"
 territory  "India"
 revision   "1.0"
 date       "2012-01-17"
-%
-category  "mni_IN:2012";LC_IDENTIFICATION
-category  "mni_IN:2012";LC_CTYPE
-category  "mni_IN:2012";LC_COLLATE
-category  "mni_IN:2012";LC_TIME
-category  "mni_IN:2012";LC_NUMERIC
-category  "mni_IN:2012";LC_MONETARY
-category  "mni_IN:2012";LC_MESSAGES
-category  "mni_IN:2012";LC_PAPER
-category  "mni_IN:2012";LC_NAME
-category  "mni_IN:2012";LC_ADDRESS
-category  "mni_IN:2012";LC_TELEPHONE
-category  "mni_IN:2012";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_CTYPE
diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
index aaeb743d40..66c4b85fb9 100644
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@@ -23,19 +23,19 @@ language   "Marathi"
 territory  "India"
 revision   "1.0"
 date       "2000-07-21"
-%
-category  "mr_IN:2000";LC_IDENTIFICATION
-category  "mr_IN:2000";LC_CTYPE
-category  "mr_IN:2000";LC_COLLATE
-category  "mr_IN:2000";LC_TIME
-category  "mr_IN:2000";LC_NUMERIC
-category  "mr_IN:2000";LC_MONETARY
-category  "mr_IN:2000";LC_MESSAGES
-category  "mr_IN:2000";LC_PAPER
-category  "mr_IN:2000";LC_NAME
-category  "mr_IN:2000";LC_ADDRESS
-category  "mr_IN:2000";LC_TELEPHONE
-category  "mr_IN: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_CTYPE
diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY
index 1f25ec3c78..fb5ce64541 100644
--- a/localedata/locales/ms_MY
+++ b/localedata/locales/ms_MY
@@ -25,19 +25,19 @@ language    "Malay"
 territory   "Malaysia"
 revision    "0.92b"
 date        "2001, December, 10"
-%
-category  "ms_MY:2000";LC_IDENTIFICATION
-category  "ms_MY:2000";LC_CTYPE
-category  "ms_MY:2000";LC_COLLATE
-category  "ms_MY:2000";LC_TIME
-category  "ms_MY:2000";LC_NUMERIC
-category  "ms_MY:2000";LC_MONETARY
-category  "ms_MY:2000";LC_MESSAGES
-category  "ms_MY:2000";LC_PAPER
-category  "ms_MY:2000";LC_NAME
-category  "ms_MY:2000";LC_ADDRESS
-category  "ms_MY:2000";LC_TELEPHONE
-category  "ms_MY: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_CTYPE
diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT
index 57c849d500..9c8c55ab20 100644
--- a/localedata/locales/mt_MT
+++ b/localedata/locales/mt_MT
@@ -27,19 +27,19 @@ language   "Maltese"
 territory  "malta"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "mt_MT:2000";LC_IDENTIFICATION
-category  "mt_MT:2000";LC_CTYPE
-category  "mt_MT:2000";LC_COLLATE
-category  "mt_MT:2000";LC_TIME
-category  "mt_MT:2000";LC_NUMERIC
-category  "mt_MT:2000";LC_MONETARY
-category  "mt_MT:2000";LC_MESSAGES
-category  "mt_MT:2000";LC_PAPER
-category  "mt_MT:2000";LC_NAME
-category  "mt_MT:2000";LC_ADDRESS
-category  "mt_MT:2000";LC_TELEPHONE
-category  "mt_MT: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_CTYPE
diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
index d889668a08..4902e15114 100644
--- a/localedata/locales/my_MM
+++ b/localedata/locales/my_MM
@@ -27,18 +27,18 @@ territory  "Myanmar (Burma)"
 revision "1.3"
 date       "2009-10-02"
 
-category "my_MM:2006";LC_IDENTIFICATION
-category "my_MM:2006";LC_COLLATE
-category "my_MM:2006";LC_CTYPE
-category "my_MM:2006";LC_MESSAGES
-category "my_MM:2006";LC_MONETARY
-category "my_MM:2006";LC_NUMERIC
-category "my_MM:2006";LC_TIME
-category "my_MM:2006";LC_PAPER
-category "my_MM:2006";LC_MEASUREMENT
-category "my_MM:2006";LC_TELEPHONE
-category "my_MM:2006";LC_ADDRESS
-category "my_MM:2006";LC_NAME
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_NAME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
index a8d2ef9a5f..828f6e631f 100644
--- a/localedata/locales/nan_TW
+++ b/localedata/locales/nan_TW
@@ -32,19 +32,19 @@ language     "Min Nan Chinese"
 territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
-%
-category  "nan_TW:2000";LC_IDENTIFICATION
-category  "nan_TW:2000";LC_CTYPE
-category  "nan_TW:2000";LC_COLLATE
-category  "nan_TW:2000";LC_TIME
-category  "nan_TW:2000";LC_NUMERIC
-category  "nan_TW:2000";LC_MONETARY
-category  "nan_TW:2000";LC_PAPER
-category  "nan_TW:2000";LC_MEASUREMENT
-category  "nan_TW:2000";LC_MESSAGES
-category  "nan_TW:2000";LC_NAME
-category  "nan_TW:2000";LC_ADDRESS
-category  "nan_TW:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index 83e7723496..f09ff74106 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -32,18 +32,17 @@ territory "Taiwan"
 revision "0.1"
 date "2008-06-16"
 
-category "nan_TW@latin:2000";LC_IDENTIFICATION
-category "nan_TW@latin:2000";LC_CTYPE
-category "nan_TW@latin:2000";LC_COLLATE
-category "nan_TW@latin:2000";LC_TIME
-category "nan_TW@latin:2000";LC_NUMERIC
-category "nan_TW@latin:2000";LC_PAPER
-category "nan_TW@latin:2000";LC_TELEPHONE
-category "nan_TW@latin:2000";LC_MEASUREMENT
-category "nan_TW@latin:2000";LC_ADDRESS
-category "nan_TW@latin:2000";LC_MESSAGES
-category "nan_TW@latin:2000";LC_MONETARY
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO
index 9cef259231..a2b182aa58 100644
--- a/localedata/locales/nb_NO
+++ b/localedata/locales/nb_NO
@@ -35,19 +35,19 @@ language   "Norwegian Bokmål"
 territory  "Norway"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "nb_NO:2000";LC_IDENTIFICATION
-category  "nb_NO:2000";LC_CTYPE
-category  "nb_NO:2000";LC_COLLATE
-category  "nb_NO:2000";LC_TIME
-category  "nb_NO:2000";LC_NUMERIC
-category  "nb_NO:2000";LC_MONETARY
-category  "nb_NO:2000";LC_MESSAGES
-category  "nb_NO:2000";LC_PAPER
-category  "nb_NO:2000";LC_NAME
-category  "nb_NO:2000";LC_ADDRESS
-category  "nb_NO:2000";LC_TELEPHONE
-category  "nb_NO: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
diff --git a/localedata/locales/nds_DE b/localedata/locales/nds_DE
index e4350de6cc..ed52e093e2 100644
--- a/localedata/locales/nds_DE
+++ b/localedata/locales/nds_DE
@@ -21,24 +21,18 @@ territory "Germany"
 revision "0.1"
 date "2003-11-30"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_NAME
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-%  copied LC_MONETARY, LC_NUMERIC from de_DE for simplicity
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/nds_NL b/localedata/locales/nds_NL
index 119f816a93..36a4a9f634 100644
--- a/localedata/locales/nds_NL
+++ b/localedata/locales/nds_NL
@@ -21,24 +21,18 @@ territory "Netherlands"
 revision "0.1"
 date "2003-11-30"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_NAME
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-%  copied LC_MONETARY, LC_NUMERIC from de_DE for simplicity
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/ne_NP b/localedata/locales/ne_NP
index 5612c13554..17bb3093df 100644
--- a/localedata/locales/ne_NP
+++ b/localedata/locales/ne_NP
@@ -23,19 +23,19 @@ language   "Nepali"
 territory  "Nepal"
 revision   "1.1"
 date       "2003-05-12"
-%
-category  "ne_NP:2003";LC_IDENTIFICATION
-category  "ne_NP:2003";LC_CTYPE
-category  "ne_NP:2003";LC_COLLATE
-category  "ne_NP:2003";LC_TIME
-category  "ne_NP:2003";LC_NUMERIC
-category  "ne_NP:2003";LC_MONETARY
-category  "ne_NP:2003";LC_MESSAGES
-category  "ne_NP:2003";LC_PAPER
-category  "ne_NP:2003";LC_NAME
-category  "ne_NP:2003";LC_ADDRESS
-category  "ne_NP:2003";LC_TELEPHONE
-category  "ne_NP:2003";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_CTYPE
diff --git a/localedata/locales/nhn_MX b/localedata/locales/nhn_MX
index 44384abb77..6918a94fbd 100644
--- a/localedata/locales/nhn_MX
+++ b/localedata/locales/nhn_MX
@@ -35,20 +35,19 @@ language   "Central Nahuatl"
 territory  "Mexico"
 revision   "1.0"
 date       "2012-08-19"
-%
-category   "nhn_MX:2012";LC_IDENTIFICATION
-category   "nhn_MX:2012";LC_CTYPE
-category   "nhn_MX:2012";LC_COLLATE
-category   "nhn_MX:2012";LC_TIME
-category   "nhn_MX:2012";LC_NUMERIC
-category   "nhn_MX:2012";LC_MONETARY
-category   "nhn_MX:2012";LC_MEASUREMENT
-category   "nhn_MX:2012";LC_MESSAGES
-category   "nhn_MX:2012";LC_PAPER
-category   "nhn_MX:2012";LC_NAME
-category   "nhn_MX:2012";LC_ADDRESS
-category   "nhn_MX:2012";LC_TELEPHONE
 
+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_MEASUREMENT
+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
 END LC_IDENTIFICATION
 
 LC_COLLATE
diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU
index 21d932d275..e39eb89e73 100644
--- a/localedata/locales/niu_NU
+++ b/localedata/locales/niu_NU
@@ -8,20 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-LC_IDENTIFICATION
-title        "Niuean (Vagahau Niue) locale for Niue"
-source       "RockET Systems"
-address      "PO Box 229, Fatalupe, Alofi, Niue"
-contact      "Emani Fakaotimanava-Lui"
-email        "emani@niue.nu"
-tel          ""
-fax          ""
-language     "Niuean"
-territory    "Niue"
-revision     "1.0"
-date         "2012-07-18"
-%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Niuean, Vagahau Niue language locale for Niue
@@ -41,19 +27,32 @@ date         "2012-07-18"
 % http://pacific.scoop.co.nz/2012/06/internet-society-funds-niue-language-lifeline/
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-category  "niu_NU:2012";LC_IDENTIFICATION
-category  "niu_NU:2012";LC_CTYPE
-category  "niu_NU:2012";LC_COLLATE
-category  "niu_NU:2012";LC_TIME
-category  "niu_NU:2012";LC_NUMERIC
-category  "niu_NU:2012";LC_MONETARY
-category  "niu_NU:2012";LC_PAPER
-category  "niu_NU:2012";LC_MEASUREMENT
-category  "niu_NU:2012";LC_MESSAGES
-category  "niu_NU:2012";LC_NAME
-category  "niu_NU:2012";LC_ADDRESS
-category  "niu_NU:2012";LC_TELEPHONE
+
+LC_IDENTIFICATION
+title        "Niuean (Vagahau Niue) locale for Niue"
+source       "RockET Systems"
+address      "PO Box 229, Fatalupe, Alofi, Niue"
+contact      "Emani Fakaotimanava-Lui"
+email        "emani@niue.nu"
+tel          ""
+fax          ""
+language     "Niuean"
+territory    "Niue"
+revision     "1.0"
+date         "2012-07-18"
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ
index aa3f77f9af..64d21285e2 100644
--- a/localedata/locales/niu_NZ
+++ b/localedata/locales/niu_NZ
@@ -8,21 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-LC_IDENTIFICATION
-title        "Niuean (Vagahau Niue) locale for New Zealand"
-source       "RockET Systems"
-address      "PO Box 229, Fatalupe, Alofi, Niue"
-contact      "Emani Fakaotimanava-Lui"
-email        "emani@niue.nu"
-tel          ""
-fax          ""
-language     "Niuean"
-territory    "New Zealand"
-revision     "1.0"
-date         "2012-07-18"
-% This file is distributed under the same license as the glibc package.
-%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Niuean, Vagahau Niue language locale for New Zealand
@@ -42,19 +27,32 @@ date         "2012-07-18"
 % http://pacific.scoop.co.nz/2012/06/internet-society-funds-niue-language-lifeline/
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-category  "niu_NZ:2012";LC_IDENTIFICATION
-category  "niu_NZ:2012";LC_CTYPE
-category  "niu_NZ:2012";LC_COLLATE
-category  "niu_NZ:2012";LC_TIME
-category  "niu_NZ:2012";LC_NUMERIC
-category  "niu_NZ:2012";LC_MONETARY
-category  "niu_NZ:2012";LC_PAPER
-category  "niu_NZ:2012";LC_MEASUREMENT
-category  "niu_NZ:2012";LC_MESSAGES
-category  "niu_NZ:2012";LC_NAME
-category  "niu_NZ:2012";LC_ADDRESS
-category  "niu_NZ:2012";LC_TELEPHONE
+
+LC_IDENTIFICATION
+title        "Niuean (Vagahau Niue) locale for New Zealand"
+source       "RockET Systems"
+address      "PO Box 229, Fatalupe, Alofi, Niue"
+contact      "Emani Fakaotimanava-Lui"
+email        "emani@niue.nu"
+tel          ""
+fax          ""
+language     "Niuean"
+territory    "New Zealand"
+revision     "1.0"
+date         "2012-07-18"
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
index 9f0c2ebdf3..329b36ff6d 100644
--- a/localedata/locales/nl_AW
+++ b/localedata/locales/nl_AW
@@ -23,19 +23,19 @@ language   "Dutch"
 territory  "Aruba"
 revision   "1.0"
 date       "2008-09-16"
-%
-category  "nl_AW:2008";LC_IDENTIFICATION
-category  "nl_AW:2008";LC_CTYPE
-category  "nl_AW:2008";LC_COLLATE
-category  "nl_AW:2008";LC_TIME
-category  "nl_AW:2008";LC_NUMERIC
-category  "nl_AW:2008";LC_MONETARY
-category  "nl_AW:2008";LC_MESSAGES
-category  "nl_AW:2008";LC_PAPER
-category  "nl_AW:2008";LC_NAME
-category  "nl_AW:2008";LC_ADDRESS
-category  "nl_AW:2008";LC_TELEPHONE
-category  "nl_AW:2008";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_CTYPE
diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index a2b7683603..cf0e9ff82e 100644
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -35,19 +35,19 @@ language   "Flemish"
 territory  "Belgium"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "nl_BE:2000";LC_IDENTIFICATION
-category  "nl_BE:2000";LC_CTYPE
-category  "nl_BE:2000";LC_COLLATE
-category  "nl_BE:2000";LC_TIME
-category  "nl_BE:2000";LC_NUMERIC
-category  "nl_BE:2000";LC_MONETARY
-category  "nl_BE:2000";LC_MESSAGES
-category  "nl_BE:2000";LC_PAPER
-category  "nl_BE:2000";LC_NAME
-category  "nl_BE:2000";LC_ADDRESS
-category  "nl_BE:2000";LC_TELEPHONE
-category  "nl_BE: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_CTYPE
diff --git a/localedata/locales/nl_BE@euro b/localedata/locales/nl_BE@euro
index b4987af926..93d7ad3fdb 100644
--- a/localedata/locales/nl_BE@euro
+++ b/localedata/locales/nl_BE@euro
@@ -28,19 +28,19 @@ language   "Dutch"
 territory  "Belgium"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "nl_BE@euro:2000";LC_IDENTIFICATION
-category  "nl_BE@euro:2000";LC_CTYPE
-category  "nl_BE@euro:2000";LC_COLLATE
-category  "nl_BE@euro:2000";LC_TIME
-category  "nl_BE@euro:2000";LC_NUMERIC
-category  "nl_BE@euro:2000";LC_MONETARY
-category  "nl_BE@euro:2000";LC_MESSAGES
-category  "nl_BE@euro:2000";LC_PAPER
-category  "nl_BE@euro:2000";LC_NAME
-category  "nl_BE@euro:2000";LC_ADDRESS
-category  "nl_BE@euro:2000";LC_TELEPHONE
-category  "nl_BE@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_CTYPE
diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL
index 5a8477e596..094c52df4b 100644
--- a/localedata/locales/nl_NL
+++ b/localedata/locales/nl_NL
@@ -37,19 +37,19 @@ language   "Dutch"
 territory  "Netherlands"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "nl_NL:2000";LC_IDENTIFICATION
-category  "nl_NL:2000";LC_CTYPE
-category  "nl_NL:2000";LC_COLLATE
-category  "nl_NL:2000";LC_TIME
-category  "nl_NL:2000";LC_NUMERIC
-category  "nl_NL:2000";LC_MONETARY
-category  "nl_NL:2000";LC_MESSAGES
-category  "nl_NL:2000";LC_PAPER
-category  "nl_NL:2000";LC_NAME
-category  "nl_NL:2000";LC_ADDRESS
-category  "nl_NL:2000";LC_TELEPHONE
-category  "nl_NL: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_CTYPE
diff --git a/localedata/locales/nl_NL@euro b/localedata/locales/nl_NL@euro
index ac6c1df0e3..f300361037 100644
--- a/localedata/locales/nl_NL@euro
+++ b/localedata/locales/nl_NL@euro
@@ -28,19 +28,19 @@ language   "Dutch"
 territory  "Netherlands"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "nl_NL@euro:2000";LC_IDENTIFICATION
-category  "nl_NL@euro:2000";LC_CTYPE
-category  "nl_NL@euro:2000";LC_COLLATE
-category  "nl_NL@euro:2000";LC_TIME
-category  "nl_NL@euro:2000";LC_NUMERIC
-category  "nl_NL@euro:2000";LC_MONETARY
-category  "nl_NL@euro:2000";LC_MESSAGES
-category  "nl_NL@euro:2000";LC_PAPER
-category  "nl_NL@euro:2000";LC_NAME
-category  "nl_NL@euro:2000";LC_ADDRESS
-category  "nl_NL@euro:2000";LC_TELEPHONE
-category  "nl_NL@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_CTYPE
diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO
index e8046485f2..ec11e114cf 100644
--- a/localedata/locales/nn_NO
+++ b/localedata/locales/nn_NO
@@ -24,19 +24,19 @@ language   "Norwegian Nynorsk"
 territory  "Norway"
 revision   "1.0"
 date       "2000-08-31"
-%
-category  "nn_NO:2000";LC_IDENTIFICATION
-category  "nn_NO:2000";LC_CTYPE
-category  "nn_NO:2000";LC_COLLATE
-category  "nn_NO:2000";LC_TIME
-category  "nn_NO:2000";LC_NUMERIC
-category  "nn_NO:2000";LC_MONETARY
-category  "nn_NO:2000";LC_MESSAGES
-category  "nn_NO:2000";LC_PAPER
-category  "nn_NO:2000";LC_NAME
-category  "nn_NO:2000";LC_ADDRESS
-category  "nn_NO:2000";LC_TELEPHONE
-category  "nn_NO: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_CTYPE
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index dfeda9a791..875ce452b0 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -45,20 +45,19 @@ language   "South Ndebele"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
-%
-category  "nr_ZA:2004";LC_IDENTIFICATION
-category  "nr_ZA:2004";LC_CTYPE
-category  "nr_ZA:2004";LC_COLLATE
-category  "nr_ZA:2004";LC_TIME
-category  "nr_ZA:2004";LC_NUMERIC
-category  "nr_ZA:2004";LC_MONETARY
-category  "nr_ZA:2004";LC_MESSAGES
-category  "nr_ZA:2004";LC_PAPER
-category  "nr_ZA:2004";LC_NAME
-category  "nr_ZA:2004";LC_ADDRESS
-category  "nr_ZA:2004";LC_TELEPHONE
-category  "nr_ZA:2004";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_CTYPE
diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
index 23589edbb9..22596f0b2f 100644
--- a/localedata/locales/nso_ZA
+++ b/localedata/locales/nso_ZA
@@ -41,20 +41,19 @@ language   "Northern Sotho"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
-%
-category  "nso_ZA:2004";LC_IDENTIFICATION
-category  "nso_ZA:2004";LC_CTYPE
-category  "nso_ZA:2004";LC_COLLATE
-category  "nso_ZA:2004";LC_TIME
-category  "nso_ZA:2004";LC_NUMERIC
-category  "nso_ZA:2004";LC_MONETARY
-category  "nso_ZA:2004";LC_MESSAGES
-category  "nso_ZA:2004";LC_PAPER
-category  "nso_ZA:2004";LC_NAME
-category  "nso_ZA:2004";LC_ADDRESS
-category  "nso_ZA:2004";LC_TELEPHONE
-category  "nso_ZA:2004";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_CTYPE
diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR
index f7e2aa8e77..d5cb56ee1d 100644
--- a/localedata/locales/oc_FR
+++ b/localedata/locales/oc_FR
@@ -23,23 +23,17 @@ territory "France"
 revision "0.2"
 date "2000-11-15"
 
-category oc_FR:2000;LC_IDENTIFICATION
-category oc_FR:2000;LC_COLLATE
-category oc_FR:2000;LC_CTYPE
-category oc_FR:2000;LC_MESSAGES
-category oc_FR:2000;LC_MONETARY
-category oc_FR:2000;LC_NUMERIC
-category oc_FR:2000;LC_TIME
-category oc_FR:2000;LC_PAPER
-category oc_FR:2000;LC_MEASUREMENT
-category oc_FR:2000;LC_TELEPHONE
-category oc_FR:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-%  copy LC_MONETARY from fr_FR for brevity
-% -- mckinstry@computer.org, 2000-06-20
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
index 9d018d204b..0df84e369e 100644
--- a/localedata/locales/om_ET
+++ b/localedata/locales/om_ET
@@ -43,20 +43,19 @@ language   "Oromo"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE
index 33e638504b..471172c385 100644
--- a/localedata/locales/om_KE
+++ b/localedata/locales/om_KE
@@ -43,20 +43,19 @@ language   "Oromo"
 territory  "Kenya"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
index 63c6c1883b..3bacf8c8dd 100644
--- a/localedata/locales/or_IN
+++ b/localedata/locales/or_IN
@@ -24,19 +24,19 @@ language    "Oriya"
 territory   "India"
 revision    "1.0"
 date        "2006-05-25"
-%
-category  "or_IN:2004";LC_IDENTIFICATION
-category  "or_IN:2004";LC_CTYPE
-category  "or_IN:2004";LC_COLLATE
-category  "or_IN:2004";LC_TIME
-category  "or_IN:2004";LC_NUMERIC
-category  "or_IN:2004";LC_MONETARY
-category  "or_IN:2004";LC_MESSAGES
-category  "or_IN:2004";LC_PAPER
-category  "or_IN:2004";LC_NAME
-category  "or_IN:2004";LC_ADDRESS
-category  "or_IN:2004";LC_TELEPHONE
-category  "or_IN:2004";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
 
 %%%%%%%%%%%%%
diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU
index d81fa9ac88..e391308bcd 100644
--- a/localedata/locales/os_RU
+++ b/localedata/locales/os_RU
@@ -35,18 +35,18 @@ territory  "Russia"
 revision   "1.0"
 date       "2000-06-29"
 
-category  "os_RU:2000";LC_IDENTIFICATION
-category  "os_RU:2000";LC_CTYPE
-category  "os_RU:2000";LC_COLLATE
-category  "os_RU:2000";LC_TIME
-category  "os_RU:2000";LC_NUMERIC
-category  "os_RU:2000";LC_MONETARY
-category  "os_RU:2000";LC_MESSAGES
-category  "os_RU:2000";LC_PAPER
-category  "os_RU:2000";LC_NAME
-category  "os_RU:2000";LC_ADDRESS
-category  "os_RU:2000";LC_TELEPHONE
-category  "os_RU: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
diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
index 612d6ed971..8d95a022e9 100644
--- a/localedata/locales/pa_IN
+++ b/localedata/locales/pa_IN
@@ -23,19 +23,19 @@ language   "Punjabi"
 territory  "India"
 revision   "0.2"
 date       "2004-09-30"
-%
-category  "pa_IN:2000";LC_IDENTIFICATION
-category  "pa_IN:2000";LC_CTYPE
-category  "pa_IN:2000";LC_COLLATE
-category  "pa_IN:2000";LC_TIME
-category  "pa_IN:2000";LC_NUMERIC
-category  "pa_IN:2000";LC_MONETARY
-category  "pa_IN:2000";LC_MESSAGES
-category  "pa_IN:2000";LC_PAPER
-category  "pa_IN:2000";LC_NAME
-category  "pa_IN:2000";LC_ADDRESS
-category  "pa_IN:2000";LC_TELEPHONE
-category  "pa_IN: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_CTYPE
diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK
index f1a3a82de5..0b449d430b 100644
--- a/localedata/locales/pa_PK
+++ b/localedata/locales/pa_PK
@@ -31,19 +31,19 @@ language   "Punjabi"
 territory  "Pakistan"
 revision   "0.3"
 date       "2000-07-11"
-%
-category  "pa_PK:2000";LC_IDENTIFICATION
-category  "pa_PK:2000";LC_CTYPE
-category  "pa_PK:2000";LC_COLLATE
-category  "pa_PK:2000";LC_TIME
-category  "pa_PK:2000";LC_NUMERIC
-category  "pa_PK:2000";LC_MONETARY
-category  "pa_PK:2000";LC_MESSAGES
-category  "pa_PK:2000";LC_PAPER
-category  "pa_PK:2000";LC_NAME
-category  "pa_PK:2000";LC_ADDRESS
-category  "pa_PK:2000";LC_TELEPHONE
-category  "pa_PK: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_CTYPE
diff --git a/localedata/locales/pap_AW b/localedata/locales/pap_AW
index 81db2e9a47..24504fc378 100644
--- a/localedata/locales/pap_AW
+++ b/localedata/locales/pap_AW
@@ -28,22 +28,17 @@ territory "Aruba"
 revision "1.0"
 date "2013-09-27"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/pap_CW b/localedata/locales/pap_CW
index 11f0ed159f..d5cf9934a9 100644
--- a/localedata/locales/pap_CW
+++ b/localedata/locales/pap_CW
@@ -28,22 +28,17 @@ territory "Curaçao"
 revision "1.0"
 date "2013-09-27"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE, LC_ADDRESS
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index 829d93032b..a1746203ec 100644
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -36,19 +36,19 @@ language   "Polish"
 territory  "Poland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "pl_PL:2000";LC_IDENTIFICATION
-category  "pl_PL:2000";LC_CTYPE
-category  "pl_PL:2000";LC_COLLATE
-category  "pl_PL:2000";LC_TIME
-category  "pl_PL:2000";LC_NUMERIC
-category  "pl_PL:2000";LC_MONETARY
-category  "pl_PL:2000";LC_MESSAGES
-category  "pl_PL:2000";LC_PAPER
-category  "pl_PL:2000";LC_NAME
-category  "pl_PL:2000";LC_ADDRESS
-category  "pl_PL:2000";LC_TELEPHONE
-category  "pl_PL: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
diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
index 64686eeb7a..5f1a050b96 100644
--- a/localedata/locales/ps_AF
+++ b/localedata/locales/ps_AF
@@ -36,18 +36,18 @@ territory  "Afghanistan"
 revision   "0.2"
 date       "2009-01-16"
 
-category  "ps_AF:2007";LC_IDENTIFICATION
-category  "ps_AF:2007";LC_CTYPE
-category  "ps_AF:2007";LC_COLLATE
-category  "ps_AF:2007";LC_TIME
-category  "ps_AF:2007";LC_NUMERIC
-category  "ps_AF:2007";LC_MONETARY
-category  "ps_AF:2007";LC_MESSAGES
-category  "ps_AF:2007";LC_MEASUREMENT
-category  "ps_AF:2007";LC_PAPER
-category  "ps_AF:2007";LC_NAME
-category  "ps_AF:2007";LC_ADDRESS
-category  "ps_AF:2007";LC_TELEPHONE
+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_MEASUREMENT
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index 482cefde9a..19400e5f67 100644
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -35,19 +35,19 @@ language   "Brazilian Portuguese"
 territory  "Brazil"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "pt_BR:2000";LC_IDENTIFICATION
-category  "pt_BR:2000";LC_CTYPE
-category  "pt_BR:2000";LC_COLLATE
-category  "pt_BR:2000";LC_TIME
-category  "pt_BR:2000";LC_NUMERIC
-category  "pt_BR:2000";LC_MONETARY
-category  "pt_BR:2000";LC_MESSAGES
-category  "pt_BR:2000";LC_PAPER
-category  "pt_BR:2000";LC_NAME
-category  "pt_BR:2000";LC_ADDRESS
-category  "pt_BR:2000";LC_TELEPHONE
-category  "pt_BR: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
diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
index 2ab92b0016..56f6a6088b 100644
--- a/localedata/locales/pt_PT
+++ b/localedata/locales/pt_PT
@@ -35,19 +35,19 @@ language   "European Portuguese"
 territory  "Portugal"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "pt_PT:2000";LC_IDENTIFICATION
-category  "pt_PT:2000";LC_CTYPE
-category  "pt_PT:2000";LC_COLLATE
-category  "pt_PT:2000";LC_TIME
-category  "pt_PT:2000";LC_NUMERIC
-category  "pt_PT:2000";LC_MONETARY
-category  "pt_PT:2000";LC_MESSAGES
-category  "pt_PT:2000";LC_PAPER
-category  "pt_PT:2000";LC_NAME
-category  "pt_PT:2000";LC_ADDRESS
-category  "pt_PT:2000";LC_TELEPHONE
-category  "pt_PT: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
diff --git a/localedata/locales/pt_PT@euro b/localedata/locales/pt_PT@euro
index c4cfd633ce..b29561bc35 100644
--- a/localedata/locales/pt_PT@euro
+++ b/localedata/locales/pt_PT@euro
@@ -28,19 +28,19 @@ language   "Portuguese"
 territory  "Portugal"
 revision   "1.0"
 date       "2000-08-20"
-%
-category  "pt_PT@euro:2000";LC_IDENTIFICATION
-category  "pt_PT@euro:2000";LC_CTYPE
-category  "pt_PT@euro:2000";LC_COLLATE
-category  "pt_PT@euro:2000";LC_TIME
-category  "pt_PT@euro:2000";LC_NUMERIC
-category  "pt_PT@euro:2000";LC_MONETARY
-category  "pt_PT@euro:2000";LC_MESSAGES
-category  "pt_PT@euro:2000";LC_PAPER
-category  "pt_PT@euro:2000";LC_NAME
-category  "pt_PT@euro:2000";LC_ADDRESS
-category  "pt_PT@euro:2000";LC_TELEPHONE
-category  "pt_PT@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
diff --git a/localedata/locales/quz_PE b/localedata/locales/quz_PE
index 00be483bb7..24f8a68ffa 100644
--- a/localedata/locales/quz_PE
+++ b/localedata/locales/quz_PE
@@ -38,19 +38,19 @@ language     "Quechua (Cusco-Collao)"
 territory    "Peru"
 revision     "1.0"
 date         "2013-08-24"
-%
-category  "quz_PE:2013";LC_IDENTIFICATION
-category  "quz_PE:2013";LC_CTYPE
-category  "quz_PE:2013";LC_COLLATE
-category  "quz_PE:2013";LC_TIME
-category  "quz_PE:2013";LC_NUMERIC
-category  "quz_PE:2013";LC_MONETARY
-category  "quz_PE:2013";LC_PAPER
-category  "quz_PE:2013";LC_MEASUREMENT
-category  "quz_PE:2013";LC_MESSAGES
-category  "quz_PE:2013";LC_NAME
-category  "quz_PE:2013";LC_ADDRESS
-category  "quz_PE:2013";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/raj_IN b/localedata/locales/raj_IN
index 2d633bd18f..a69b32f61e 100644
--- a/localedata/locales/raj_IN
+++ b/localedata/locales/raj_IN
@@ -24,19 +24,19 @@ language   "Rajasthani"
 territory  "India"
 revision   "1.0"
 date       "2014-06-13"
-%
-category  "raj_IN:2014";LC_IDENTIFICATION
-category  "raj_IN:2014";LC_CTYPE
-category  "raj_IN:2014";LC_COLLATE
-category  "raj_IN:2014";LC_TIME
-category  "raj_IN:2014";LC_NUMERIC
-category  "raj_IN:2014";LC_MONETARY
-category  "raj_IN:2014";LC_MESSAGES
-category  "raj_IN:2014";LC_PAPER
-category  "raj_IN:2014";LC_NAME
-category  "raj_IN:2014";LC_ADDRESS
-category  "raj_IN:2014";LC_TELEPHONE
-category  "raj_IN:2014";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_CTYPE
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 4e4375aa94..cba194c9ca 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -40,19 +40,19 @@ language   "Romanian"
 territory  "Romania"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "ro_RO:2000";LC_IDENTIFICATION
-category  "ro_RO:2000";LC_CTYPE
-category  "ro_RO:2000";LC_COLLATE
-category  "ro_RO:2000";LC_TIME
-category  "ro_RO:2000";LC_NUMERIC
-category  "ro_RO:2000";LC_MONETARY
-category  "ro_RO:2000";LC_MESSAGES
-category  "ro_RO:2000";LC_PAPER
-category  "ro_RO:2000";LC_NAME
-category  "ro_RO:2000";LC_ADDRESS
-category  "ro_RO:2000";LC_TELEPHONE
-category  "ro_RO: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
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index fc58c5131d..c9bc496819 100644
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -36,19 +36,19 @@ language   "Russian"
 territory  "Russia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "ru_RU:2000";LC_IDENTIFICATION
-category  "ru_RU:2000";LC_CTYPE
-category  "ru_RU:2000";LC_COLLATE
-category  "ru_RU:2000";LC_TIME
-category  "ru_RU:2000";LC_NUMERIC
-category  "ru_RU:2000";LC_MONETARY
-category  "ru_RU:2000";LC_MESSAGES
-category  "ru_RU:2000";LC_PAPER
-category  "ru_RU:2000";LC_NAME
-category  "ru_RU:2000";LC_ADDRESS
-category  "ru_RU:2000";LC_TELEPHONE
-category  "ru_RU: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
diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA
index 58636b46b5..9d1c2675a2 100644
--- a/localedata/locales/ru_UA
+++ b/localedata/locales/ru_UA
@@ -32,19 +32,19 @@ language   "Russian"
 territory  "Ukraine"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "ru_UA:2000";LC_IDENTIFICATION
-category  "ru_UA:2000";LC_CTYPE
-category  "ru_UA:2000";LC_COLLATE
-category  "ru_UA:2000";LC_TIME
-category  "ru_UA:2000";LC_NUMERIC
-category  "ru_UA:2000";LC_MONETARY
-category  "ru_UA:2000";LC_MESSAGES
-category  "ru_UA:2000";LC_PAPER
-category  "ru_UA:2000";LC_NAME
-category  "ru_UA:2000";LC_ADDRESS
-category  "ru_UA:2000";LC_TELEPHONE
-category  "ru_UA: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_CTYPE
diff --git a/localedata/locales/rw_RW b/localedata/locales/rw_RW
index 16841fae98..3065ee2af5 100644
--- a/localedata/locales/rw_RW
+++ b/localedata/locales/rw_RW
@@ -25,20 +25,19 @@ language   "Kinyarwanda"
 territory  "Rwanda"
 revision   "1.0"
 date       "2004-02-24"
-%
-category  "i18n:1997";LC_IDENTIFICATION
-category  "i18n:1997";LC_CTYPE
-category  "i18n:1997";LC_COLLATE
-category  "i18n:1997";LC_TIME
-category  "i18n:1997";LC_NUMERIC
-category  "i18n:1997";LC_MONETARY
-category  "i18n:1997";LC_MESSAGES
-category  "i18n:1997";LC_PAPER
-category  "i18n:1997";LC_MEASUREMENT
-category  "i18n:1997";LC_NAME
-category  "i18n:1997";LC_ADDRESS
-category  "i18n:1997";LC_TELEPHONE
 
+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_MEASUREMENT
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN
index d166fc2e85..7fedee6174 100644
--- a/localedata/locales/sa_IN
+++ b/localedata/locales/sa_IN
@@ -24,19 +24,19 @@ language   "Sanskrit"
 territory  "India"
 revision   "1.0"
 date       "2005-09-25"
-%
-category  "sa_IN:2000";LC_IDENTIFICATION
-category  "sa_IN:2000";LC_CTYPE
-category  "sa_IN:2000";LC_COLLATE
-category  "sa_IN:2000";LC_TIME
-category  "sa_IN:2000";LC_NUMERIC
-category  "sa_IN:2000";LC_MONETARY
-category  "sa_IN:2000";LC_MESSAGES
-category  "sa_IN:2000";LC_PAPER
-category  "sa_IN:2000";LC_NAME
-category  "sa_IN:2000";LC_ADDRESS
-category  "sa_IN:2000";LC_TELEPHONE
-category  "sa_IN: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_CTYPE
diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN
index 2c11a3578e..73ba5a2e14 100644
--- a/localedata/locales/sat_IN
+++ b/localedata/locales/sat_IN
@@ -23,19 +23,19 @@ language   "Santali"
 territory  "India"
 revision   "1.0"
 date       "2012-01-17"
-%
-category  "sat_IN:2012";LC_IDENTIFICATION
-category  "sat_IN:2012";LC_CTYPE
-category  "sat_IN:2012";LC_COLLATE
-category  "sat_IN:2012";LC_TIME
-category  "sat_IN:2012";LC_NUMERIC
-category  "sat_IN:2012";LC_MONETARY
-category  "sat_IN:2012";LC_MESSAGES
-category  "sat_IN:2012";LC_PAPER
-category  "sat_IN:2012";LC_NAME
-category  "sat_IN:2012";LC_ADDRESS
-category  "sat_IN:2012";LC_TELEPHONE
-category  "sat_IN:2012";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_CTYPE
diff --git a/localedata/locales/sc_IT b/localedata/locales/sc_IT
index 0901a38320..0a1f34edd1 100644
--- a/localedata/locales/sc_IT
+++ b/localedata/locales/sc_IT
@@ -28,19 +28,19 @@ language   "Sardinian"
 territory  "Italy"
 revision   "0.1"
 date       "2004-05-26"
-%
-category  "sc_IT:2000";LC_IDENTIFICATION
-category  "sc_IT:2000";LC_CTYPE
-category  "sc_IT:2000";LC_COLLATE
-category  "sc_IT:2000";LC_TIME
-category  "sc_IT:2000";LC_NUMERIC
-category  "sc_IT:2000";LC_MONETARY
-category  "sc_IT:2000";LC_MESSAGES
-category  "sc_IT:2000";LC_PAPER
-category  "sc_IT:2000";LC_NAME
-category  "sc_IT:2000";LC_ADDRESS
-category  "sc_IT:2000";LC_TELEPHONE
-category  "sc_IT: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_CTYPE
diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN
index ccf4e56def..7b8f29a8df 100644
--- a/localedata/locales/sd_IN
+++ b/localedata/locales/sd_IN
@@ -25,19 +25,19 @@ language    "Sindhi"
 territory   "India"
 revision    "1.0"
 date        "2008,September,09"
-%
-category  "sd_IN:2008";LC_IDENTIFICATION
-category  "sd_IN:2008";LC_CTYPE
-category  "sd_IN:2008";LC_COLLATE
-category  "sd_IN:2008";LC_TIME
-category  "sd_IN:2008";LC_NUMERIC
-category  "sd_IN:2008";LC_MONETARY
-category  "sd_IN:2008";LC_MESSAGES
-category  "sd_IN:2008";LC_PAPER
-category  "sd_IN:2008";LC_NAME
-category  "sd_IN:2008";LC_ADDRESS
-category  "sd_IN:2008";LC_TELEPHONE
-category  "sd_IN:2008";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
 
 
diff --git a/localedata/locales/sd_IN@devanagari b/localedata/locales/sd_IN@devanagari
index 4c1a7e5374..d9630668d4 100644
--- a/localedata/locales/sd_IN@devanagari
+++ b/localedata/locales/sd_IN@devanagari
@@ -24,19 +24,19 @@ language   "Sindhi"
 territory  "India"
 revision   "1.0"
 date       "2008-08-26"
-%
-category  "sd_IN@devanagari:2008";LC_IDENTIFICATION
-category  "sd_IN@devanagari:2008";LC_CTYPE
-category  "sd_IN@devanagari:2008";LC_COLLATE
-category  "sd_IN@devanagari:2008";LC_TIME
-category  "sd_IN@devanagari:2008";LC_NUMERIC
-category  "sd_IN@devanagari:2008";LC_MONETARY
-category  "sd_IN@devanagari:2008";LC_MESSAGES
-category  "sd_IN@devanagari:2008";LC_PAPER
-category  "sd_IN@devanagari:2008";LC_NAME
-category  "sd_IN@devanagari:2008";LC_ADDRESS
-category  "sd_IN@devanagari:2008";LC_TELEPHONE
-category  "sd_IN@devanagari:2008";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_CTYPE
diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO
index a8541a579b..0b20ba6b3e 100644
--- a/localedata/locales/se_NO
+++ b/localedata/locales/se_NO
@@ -33,18 +33,17 @@ territory "Norway"
 revision "0.1"
 date "2001-11-09"
 
-category se_NO:2000;LC_IDENTIFICATION
-category se_NO:2000;LC_CTYPE
-category se_NO:2000;LC_COLLATE
-category se_NO:2000;LC_TIME
-category se_NO:2000;LC_NUMERIC
-category se_NO:2000;LC_PAPER
-category se_NO:2000;LC_TELEPHONE
-category se_NO:2000;LC_MEASUREMENT
-category se_NO:2000;LC_ADDRESS
-category se_NO:2000;LC_MONETARY
-category se_NO:2000;LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/shs_CA b/localedata/locales/shs_CA
index a899075799..e6037de53c 100644
--- a/localedata/locales/shs_CA
+++ b/localedata/locales/shs_CA
@@ -36,19 +36,19 @@ language   "Secwepemctsin"
 territory  "Canada"
 revision   "1.0"
 date       "2008-01-15"
-%
-category  "shs_CA:2000";LC_IDENTIFICATION
-category  "shs_CA:2000";LC_CTYPE
-category  "shs_CA:2000";LC_COLLATE
-category  "shs_CA:2000";LC_TIME
-category  "shs_CA:2000";LC_NUMERIC
-category  "shs_CA:2000";LC_MONETARY
-category  "shs_CA:2000";LC_MESSAGES
-category  "shs_CA:2000";LC_PAPER
-category  "shs_CA:2000";LC_NAME
-category  "shs_CA:2000";LC_ADDRESS
-category  "shs_CA:2000";LC_TELEPHONE
-category  "shs_CA: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
diff --git a/localedata/locales/si_LK b/localedata/locales/si_LK
index 0883fb1f31..32a7ef1828 100644
--- a/localedata/locales/si_LK
+++ b/localedata/locales/si_LK
@@ -25,19 +25,19 @@ language   "Sinhala"
 territory  "Sri Lanka"
 revision   "0.9"
 date       "2004.10.01"
-%
-category  "i18n:2002";LC_IDENTIFICATION
-category  "i18n:2002";LC_CTYPE
-category  "i18n:2002";LC_COLLATE
-category  "i18n:2002";LC_TIME
-category  "i18n:2002";LC_NUMERIC
-category  "i18n:2002";LC_MONETARY
-category  "i18n:2002";LC_MESSAGES
-category  "i18n:2002";LC_PAPER
-category  "i18n:2002";LC_NAME
-category  "i18n:2002";LC_ADDRESS
-category  "i18n:2002";LC_TELEPHONE
-category  "i18n:2002";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_CTYPE
diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
index b63fc82cbf..0b2d84ecfc 100644
--- a/localedata/locales/sid_ET
+++ b/localedata/locales/sid_ET
@@ -40,20 +40,19 @@ language   "Sidamo"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index 96ea705972..1ec122a1b9 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -48,19 +48,19 @@ language   "Slovak"
 territory  "Slovakia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "sk_SK:2000";LC_IDENTIFICATION
-category  "sk_SK:2000";LC_CTYPE
-category  "sk_SK:2000";LC_COLLATE
-category  "sk_SK:2000";LC_TIME
-category  "sk_SK:2000";LC_NUMERIC
-category  "sk_SK:2000";LC_MONETARY
-category  "sk_SK:2000";LC_MESSAGES
-category  "sk_SK:2000";LC_PAPER
-category  "sk_SK:2000";LC_NAME
-category  "sk_SK:2000";LC_ADDRESS
-category  "sk_SK:2000";LC_TELEPHONE
-category  "sk_SK: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_CTYPE
diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI
index 37c60b159c..18edc03c0f 100644
--- a/localedata/locales/sl_SI
+++ b/localedata/locales/sl_SI
@@ -36,19 +36,19 @@ language   "Slovenian"
 territory  "Slovenia"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "sl_SI:2000";LC_IDENTIFICATION
-category  "sl_SI:2000";LC_CTYPE
-category  "sl_SI:2000";LC_COLLATE
-category  "sl_SI:2000";LC_TIME
-category  "sl_SI:2000";LC_NUMERIC
-category  "sl_SI:2000";LC_MONETARY
-category  "sl_SI:2000";LC_MESSAGES
-category  "sl_SI:2000";LC_PAPER
-category  "sl_SI:2000";LC_NAME
-category  "sl_SI:2000";LC_ADDRESS
-category  "sl_SI:2000";LC_TELEPHONE
-category  "sl_SI: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
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index 50b3cbf67d..9d3bc900dc 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -39,20 +39,19 @@ language   "Somali"
 territory  "Djibouti"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index f6d64f5392..8953f469f5 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -39,20 +39,19 @@ language   "Somali"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index a2b96834f3..45fd2fc6b9 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -39,19 +39,19 @@ language   "Somali"
 territory  "Kenya"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_TIME
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index dbd3989ac5..06a2b1d10b 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -39,20 +39,19 @@ language   "Somali"
 territory  "Somalia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/sq_AL b/localedata/locales/sq_AL
index fbad03e42d..6f8c586b50 100644
--- a/localedata/locales/sq_AL
+++ b/localedata/locales/sq_AL
@@ -25,19 +25,19 @@ language   "Albanian"
 territory  "Albania"
 revision   "1.1"
 date       "2004-07-01"
-%
-category  "sq_AL:2000";LC_IDENTIFICATION
-category  "sq_AL:2000";LC_CTYPE
-category  "sq_AL:2000";LC_COLLATE
-category  "sq_AL:2000";LC_TIME
-category  "sq_AL:2000";LC_NUMERIC
-category  "sq_AL:2000";LC_MONETARY
-category  "sq_AL:2000";LC_MESSAGES
-category  "sq_AL:2000";LC_PAPER
-category  "sq_AL:2000";LC_NAME
-category  "sq_AL:2000";LC_ADDRESS
-category  "sq_AL:2000";LC_TELEPHONE
-category  "sq_AL: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_CTYPE
diff --git a/localedata/locales/sq_MK b/localedata/locales/sq_MK
index f8520ced59..4c4559470e 100644
--- a/localedata/locales/sq_MK
+++ b/localedata/locales/sq_MK
@@ -23,19 +23,19 @@ language   "Albanian"
 territory  "Macedonia"
 revision   "0.01"
 date       "2010-04-06"
-%
-category  "sq_MK:2000";LC_IDENTIFICATION
-category  "sq_MK:2000";LC_CTYPE
-category  "sq_MK:2000";LC_COLLATE
-category  "sq_MK:2000";LC_TIME
-category  "sq_MK:2000";LC_NUMERIC
-category  "sq_MK:2000";LC_MONETARY
-category  "sq_MK:2000";LC_MESSAGES
-category  "sq_MK:2000";LC_PAPER
-category  "sq_MK:2000";LC_NAME
-category  "sq_MK:2000";LC_ADDRESS
-category  "sq_MK:2000";LC_TELEPHONE
-category  "sq_MK: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_CTYPE
diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME
index 2d10f4afd1..c8b008b16a 100644
--- a/localedata/locales/sr_ME
+++ b/localedata/locales/sr_ME
@@ -39,19 +39,19 @@ date       "2006-10-11"
 audience   "general"
 application   "GNU locale"
 abbreviation  ""
-%
-category  i18n:1997;LC_IDENTIFICATION
-category  i18n:1997;LC_CTYPE
-category  i18n:1997;LC_COLLATE
-category  i18n:1997;LC_MONETARY
-category  i18n:1997;LC_NUMERIC
-category  i18n:1997;LC_TIME
-category  i18n:1997;LC_MESSAGES
-category  i18n:1997;LC_PAPER
-category  i18n:1997;LC_NAME
-category  i18n:1997;LC_ADDRESS
-category  i18n:1997;LC_TELEPHONE
-category  i18n:1997;LC_MEASUREMENT
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+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_CTYPE
diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index bca822dde8..20d3eb6a6c 100644
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -39,19 +39,19 @@ date       "2006-10-09"
 audience   "general"
 application   "GNU locale"
 abbreviation  ""
-%
-category  "i18n:1997";LC_IDENTIFICATION
-category  "i18n:1997";LC_CTYPE
-category  "i18n:1997";LC_COLLATE
-category  "i18n:1997";LC_MONETARY
-category  "i18n:1997";LC_NUMERIC
-category  "i18n:1997";LC_TIME
-category  "i18n:1997";LC_MESSAGES
-category  "i18n:1997";LC_PAPER
-category  "i18n:1997";LC_NAME
-category  "i18n:1997";LC_ADDRESS
-category  "i18n:1997";LC_TELEPHONE
-category  "i18n:1997";LC_MEASUREMENT
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+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_CTYPE
diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
index fcd34703a3..e8298ad6fa 100644
--- a/localedata/locales/sr_RS@latin
+++ b/localedata/locales/sr_RS@latin
@@ -39,19 +39,19 @@ date       "2006-10-09"
 audience   "general"
 application   "GNU locale"
 abbreviation  ""
-%
-category  "i18n:1997";LC_IDENTIFICATION
-category  "i18n:1997";LC_CTYPE
-category  "i18n:1997";LC_COLLATE
-category  "i18n:1997";LC_MONETARY
-category  "i18n:1997";LC_NUMERIC
-category  "i18n:1997";LC_TIME
-category  "i18n:1997";LC_MESSAGES
-category  "i18n:1997";LC_PAPER
-category  "i18n:1997";LC_NAME
-category  "i18n:1997";LC_ADDRESS
-category  "i18n:1997";LC_TELEPHONE
-category  "i18n:1997";LC_MEASUREMENT
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+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_CTYPE
diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA
index 8086705244..6b075e261d 100644
--- a/localedata/locales/ss_ZA
+++ b/localedata/locales/ss_ZA
@@ -47,20 +47,19 @@ language   "Swati"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
-%
-category  "ss_ZA:2004";LC_IDENTIFICATION
-category  "ss_ZA:2004";LC_CTYPE
-category  "ss_ZA:2004";LC_COLLATE
-category  "ss_ZA:2004";LC_TIME
-category  "ss_ZA:2004";LC_NUMERIC
-category  "ss_ZA:2004";LC_MONETARY
-category  "ss_ZA:2004";LC_MESSAGES
-category  "ss_ZA:2004";LC_PAPER
-category  "ss_ZA:2004";LC_NAME
-category  "ss_ZA:2004";LC_ADDRESS
-category  "ss_ZA:2004";LC_TELEPHONE
-category  "ss_ZA:2004";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_CTYPE
diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index 2190dbaeb9..cb352089b0 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -43,20 +43,19 @@ language   "Southern Sotho"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
-%
-category  "st_ZA:2003";LC_IDENTIFICATION
-category  "st_ZA:2003";LC_CTYPE
-category  "st_ZA:2003";LC_COLLATE
-category  "st_ZA:2003";LC_TIME
-category  "st_ZA:2003";LC_NUMERIC
-category  "st_ZA:2003";LC_MONETARY
-category  "st_ZA:2003";LC_MESSAGES
-category  "st_ZA:2003";LC_PAPER
-category  "st_ZA:2003";LC_NAME
-category  "st_ZA:2003";LC_ADDRESS
-category  "st_ZA:2003";LC_TELEPHONE
-category  "st_ZA:2003";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_CTYPE
diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI
index aa22c80873..86eab3d347 100644
--- a/localedata/locales/sv_FI
+++ b/localedata/locales/sv_FI
@@ -35,20 +35,19 @@ language   "Swedish"
 territory  "Finland"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "sv_FI:2000";LC_IDENTIFICATION
-category  "sv_FI:2000";LC_CTYPE
-category  "sv_FI:2000";LC_COLLATE
-category  "sv_FI:2000";LC_TIME
-category  "sv_FI:2000";LC_NUMERIC
-category  "sv_FI:2000";LC_MONETARY
-category  "sv_FI:2000";LC_MESSAGES
-category  "sv_FI:2000";LC_PAPER
-category  "sv_FI:2000";LC_MEASUREMENT
-category  "sv_FI:2000";LC_NAME
-category  "sv_FI:2000";LC_ADDRESS
-category  "sv_FI:2000";LC_TELEPHONE
 
+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_MEASUREMENT
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/sv_FI@euro b/localedata/locales/sv_FI@euro
index aaf69dc29d..ae6dff5e36 100644
--- a/localedata/locales/sv_FI@euro
+++ b/localedata/locales/sv_FI@euro
@@ -28,20 +28,19 @@ language   "Swedish"
 territory  "Finland"
 revision   "1.0"
 date       "2000-08-21"
-%
-category  "sv_FI@euro:2000";LC_IDENTIFICATION
-category  "sv_FI@euro:2000";LC_CTYPE
-category  "sv_FI@euro:2000";LC_COLLATE
-category  "sv_FI@euro:2000";LC_TIME
-category  "sv_FI@euro:2000";LC_NUMERIC
-category  "sv_FI@euro:2000";LC_MONETARY
-category  "sv_FI@euro:2000";LC_MESSAGES
-category  "sv_FI@euro:2000";LC_PAPER
-category  "sv_FI@euro:2000";LC_MEASUREMENT
-category  "sv_FI@euro:2000";LC_NAME
-category  "sv_FI@euro:2000";LC_ADDRESS
-category  "sv_FI@euro:2000";LC_TELEPHONE
 
+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_MEASUREMENT
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index 0a3893232b..25186aa674 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -43,19 +43,19 @@ language   "Swedish"
 territory  "Sweden"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "sv_SE:2000";LC_IDENTIFICATION
-category  "sv_SE:2000";LC_CTYPE
-category  "sv_SE:2000";LC_COLLATE
-category  "sv_SE:2000";LC_TIME
-category  "sv_SE:2000";LC_NUMERIC
-category  "sv_SE:2000";LC_MONETARY
-category  "sv_SE:2000";LC_MESSAGES
-category  "sv_SE:2000";LC_PAPER
-category  "sv_SE:2000";LC_NAME
-category  "sv_SE:2000";LC_ADDRESS
-category  "sv_SE:2000";LC_TELEPHONE
-category  "sv_SE: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
diff --git a/localedata/locales/sw_KE b/localedata/locales/sw_KE
index b6ae3896a5..71ece91089 100644
--- a/localedata/locales/sw_KE
+++ b/localedata/locales/sw_KE
@@ -24,19 +24,19 @@ language   "Swahili"
 territory  "Kenya"
 revision   "1.0"
 date       "2011-03-07"
-%
-category  "sw_KE:2000";LC_IDENTIFICATION
-category  "sw_KE:2000";LC_CTYPE
-category  "sw_KE:2000";LC_COLLATE
-category  "sw_KE:2000";LC_TIME
-category  "sw_KE:2000";LC_NUMERIC
-category  "sw_KE:2000";LC_MONETARY
-category  "sw_KE:2000";LC_PAPER
-category  "sw_KE:2000";LC_MEASUREMENT
-category  "sw_KE:2000";LC_MESSAGES
-category  "sw_KE:2000";LC_NAME
-category  "sw_KE:2000";LC_ADDRESS
-category  "sw_KE:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/sw_TZ b/localedata/locales/sw_TZ
index 1cc1115049..db453e1022 100644
--- a/localedata/locales/sw_TZ
+++ b/localedata/locales/sw_TZ
@@ -24,19 +24,19 @@ language   "Swahili"
 territory  "Tanzania"
 revision   "1.0"
 date       "2011-03-07"
-%
-category  "sw_TZ:2000";LC_IDENTIFICATION
-category  "sw_TZ:2000";LC_CTYPE
-category  "sw_TZ:2000";LC_COLLATE
-category  "sw_TZ:2000";LC_TIME
-category  "sw_TZ:2000";LC_NUMERIC
-category  "sw_TZ:2000";LC_MONETARY
-category  "sw_TZ:2000";LC_PAPER
-category  "sw_TZ:2000";LC_MEASUREMENT
-category  "sw_TZ:2000";LC_MESSAGES
-category  "sw_TZ:2000";LC_NAME
-category  "sw_TZ:2000";LC_ADDRESS
-category  "sw_TZ:2000";LC_TELEPHONE
+
+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_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/szl_PL b/localedata/locales/szl_PL
index 9bf3413512..2cda73bf46 100644
--- a/localedata/locales/szl_PL
+++ b/localedata/locales/szl_PL
@@ -37,20 +37,19 @@ date       "2012-07-17"
 audience   "general"
 application   "GNU locale"
 abbreviation  ""
-%
-category  "szl_PL:2000";LC_IDENTIFICATION
-category  "szl_PL:2000";LC_CTYPE
-category  "szl_PL:2000";LC_COLLATE
-category  "szl_PL:2000";LC_TIME
-category  "szl_PL:2000";LC_NUMERIC
-category  "szl_PL:2000";LC_MONETARY
-category  "szl_PL:2000";LC_MEASUREMENT
-category  "szl_PL:2000";LC_MESSAGES
-category  "szl_PL:2000";LC_PAPER
-category  "szl_PL:2000";LC_NAME
-category  "szl_PL:2000";LC_ADDRESS
-category  "szl_PL:2000";LC_TELEPHONE
 
+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_MEASUREMENT
+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
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
index d5a94124e5..4fa4d54078 100644
--- a/localedata/locales/ta_IN
+++ b/localedata/locales/ta_IN
@@ -26,20 +26,19 @@ language    "Tamil"
 territory   "India"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
-%
-category  "ta_IN:2000";LC_IDENTIFICATION
-category  "ta_IN:2000";LC_CTYPE
-category  "ta_IN:2000";LC_COLLATE
-category  "ta_IN:2000";LC_MONETARY
-category  "ta_IN:2000";LC_NUMERIC
-category  "ta_IN:2000";LC_TIME
-category  "ta_IN:2000";LC_MESSAGES
-category  "ta_IN:2000";LC_PAPER
-category  "ta_IN:2000";LC_NAME
-category  "ta_IN:2000";LC_ADDRESS
-category  "ta_IN:2000";LC_TELEPHONE
-category  "ta_IN:2000";LC_MEASUREMENT
 
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+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_CTYPE
diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK
index 37d687311a..49c72de5c5 100644
--- a/localedata/locales/ta_LK
+++ b/localedata/locales/ta_LK
@@ -30,19 +30,19 @@ language   "Tamil"
 territory  "Sri Lanka"
 revision   "1.0"
 date       "2011,August,11"
-%
-category  "ta_LK:2000";LC_IDENTIFICATION
-category  "ta_LK:2000";LC_CTYPE
-category  "ta_LK:2000";LC_COLLATE
-category  "ta_LK:2000";LC_TIME
-category  "ta_LK:2000";LC_NUMERIC
-category  "ta_LK:2000";LC_MONETARY
-category  "ta_LK:2000";LC_MESSAGES
-category  "ta_LK:2000";LC_PAPER
-category  "ta_LK:2000";LC_NAME
-category  "ta_LK:2000";LC_ADDRESS
-category  "ta_LK:2000";LC_TELEPHONE
-category  "ta_LK: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
diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN
index 9962e6cbc2..4bbd27fa04 100644
--- a/localedata/locales/tcy_IN
+++ b/localedata/locales/tcy_IN
@@ -25,20 +25,19 @@ language   "Tulu"
 territory  "India"
 revision   "0.1"
 date       "2014-09-30"
-%
-category  "tcy_IN:2014";LC_IDENTIFICATION
-category  "tcy_IN:2014";LC_CTYPE
-category  "tcy_IN:2014";LC_COLLATE
-category  "tcy_IN:2014";LC_TIME
-category  "tcy_IN:2014";LC_NUMERIC
-category  "tcy_IN:2014";LC_MONETARY
-category  "tcy_IN:2014";LC_MESSAGES
-category  "tcy_IN:2014";LC_PAPER
-category  "tcy_IN:2014";LC_NAME
-category  "tcy_IN:2014";LC_ADDRESS
-category  "tcy_IN:2014";LC_TELEPHONE
-category  "tcy_IN:2014";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_CTYPE
diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN
index d01a62f269..bfae0164b7 100644
--- a/localedata/locales/te_IN
+++ b/localedata/locales/te_IN
@@ -26,19 +26,19 @@ language    "Telugu"
 territory   "India"
 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
-category  "i18n:2003";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_CTYPE
diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ
index 20bc823db5..3e21abd091 100644
--- a/localedata/locales/tg_TJ
+++ b/localedata/locales/tg_TJ
@@ -39,18 +39,17 @@ territory "Tajikistan"
 revision "0.4"
 date "2004-01-09"
 
-category "tg_TJ:2000";LC_IDENTIFICATION
-category "tg_TJ:2000";LC_CTYPE
-category "tg_TJ:2000";LC_COLLATE
-category "tg_TJ:2000";LC_TIME
-category "tg_TJ:2000";LC_NUMERIC
-category "tg_TJ:2000";LC_PAPER
-category "tg_TJ:2000";LC_TELEPHONE
-category "tg_TJ:2000";LC_MEASUREMENT
-category "tg_TJ:2000";LC_ADDRESS
-category "tg_TJ:2000";LC_MONETARY
-category "tg_TJ:2000";LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
index c72f457d95..33c0218b0f 100644
--- a/localedata/locales/th_TH
+++ b/localedata/locales/th_TH
@@ -38,19 +38,19 @@ language   "Thai"
 territory  "Thailand"
 revision   "1.0"
 date       "2000-06-29"
-%
-category  "th_TH:2000";LC_IDENTIFICATION
-category  "th_TH:2000";LC_CTYPE
-category  "th_TH:2000";LC_COLLATE
-category  "th_TH:2000";LC_TIME
-category  "th_TH:2000";LC_NUMERIC
-category  "th_TH:2000";LC_MONETARY
-category  "th_TH:2000";LC_MESSAGES
-category  "th_TH:2000";LC_PAPER
-category  "th_TH:2000";LC_NAME
-category  "th_TH:2000";LC_ADDRESS
-category  "th_TH:2000";LC_TELEPHONE
-category  "th_TH: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_CTYPE
diff --git a/localedata/locales/the_NP b/localedata/locales/the_NP
index db6ebc415a..0088fe21d3 100644
--- a/localedata/locales/the_NP
+++ b/localedata/locales/the_NP
@@ -23,20 +23,19 @@ language   "Chitwania Tharu"
 territory  "Nepal"
 revision   "1.1"
 date       "2013-11-15"
-%
-category  "the_NP:2013";LC_IDENTIFICATION
-category  "the_NP:2013";LC_CTYPE
-category  "the_NP:2013";LC_COLLATE
-category  "the_NP:2013";LC_TIME
-category  "the_NP:2013";LC_NUMERIC
-category  "the_NP:2013";LC_MONETARY
-category  "the_NP:2013";LC_MESSAGES
-category  "the_NP:2013";LC_PAPER
-category  "the_NP:2013";LC_NAME
-category  "the_NP:2013";LC_ADDRESS
-category  "the_NP:2013";LC_TELEPHONE
-category  "the_NP:2013";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_CTYPE
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index 1d9b8d2d8c..d40a0b180b 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -37,20 +37,19 @@ language   "Tigrinya"
 territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index 8379249950..2b051c19dc 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -37,20 +37,19 @@ language   "Tigrinya"
 territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
index 15aace0b5a..cfae5e5f76 100644
--- a/localedata/locales/tig_ER
+++ b/localedata/locales/tig_ER
@@ -35,20 +35,19 @@ language   "Tigre"
 territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM
index 315f206221..292db91ceb 100644
--- a/localedata/locales/tk_TM
+++ b/localedata/locales/tk_TM
@@ -37,19 +37,18 @@ territory "Turkmenistan"
 revision  "0.5"
 date      "2011-04-09"
 
-category "tk_TM:2011";LC_IDENTIFICATION
-category "tk_TM:2011";LC_CTYPE
-category "tk_TM:2011";LC_COLLATE
-category "tk_TM:2011";LC_TIME
-category "tk_TM:2011";LC_NUMERIC
-category "tk_TM:2011";LC_MONETARY
-category "tk_TM:2011";LC_MEASUREMENT
-category "tk_TM:2011";LC_MESSAGES
-category "tk_TM:2011";LC_PAPER
-category "tk_TM:2011";LC_NAME
-category "tk_TM:2011";LC_ADDRESS
-category "tk_TM:2011";LC_TELEPHONE
-
+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_MEASUREMENT
+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
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH
index 12da7425b8..e9158b4613 100644
--- a/localedata/locales/tl_PH
+++ b/localedata/locales/tl_PH
@@ -32,18 +32,17 @@ territory "Philippines"
 revision "0.2"
 date "2001-01-28"
 
-category "tl_PH:2000";LC_IDENTIFICATION
-category "tl_PH:2000";LC_CTYPE
-category "tl_PH:2000";LC_COLLATE
-category "tl_PH:2000";LC_TIME
-category "tl_PH:2000";LC_NUMERIC
-category "tl_PH:2000";LC_PAPER
-category "tl_PH:2000";LC_TELEPHONE
-category "tl_PH:2000";LC_MEASUREMENT
-category "tl_PH:2000";LC_ADDRESS
-category "tl_PH:2000";LC_MESSAGES
-category "tl_PH:2000";LC_MONETARY
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA
index a21452a2ae..9693cabeaa 100644
--- a/localedata/locales/tn_ZA
+++ b/localedata/locales/tn_ZA
@@ -48,20 +48,19 @@ language   "Tswana"
 territory  "South Africa"
 revision   "0.4"
 date       "2005-10-13"
-%
-category  "tn_ZA:2004";LC_IDENTIFICATION
-category  "tn_ZA:2004";LC_CTYPE
-category  "tn_ZA:2004";LC_COLLATE
-category  "tn_ZA:2004";LC_TIME
-category  "tn_ZA:2004";LC_NUMERIC
-category  "tn_ZA:2004";LC_MONETARY
-category  "tn_ZA:2004";LC_MESSAGES
-category  "tn_ZA:2004";LC_PAPER
-category  "tn_ZA:2004";LC_NAME
-category  "tn_ZA:2004";LC_ADDRESS
-category  "tn_ZA:2004";LC_TELEPHONE
-category  "tn_ZA:2004";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_CTYPE
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
index efa1f9ec50..c60a613338 100644
--- a/localedata/locales/tr_CY
+++ b/localedata/locales/tr_CY
@@ -33,20 +33,19 @@ date       "2004-10-23"
 audience   ""
 application ""
 abbreviation ""
-%
-category  "tr_CY:2000";LC_IDENTIFICATION
-category  "tr_CY:2000";LC_CTYPE
-category  "tr_CY:2000";LC_COLLATE
-category  "tr_CY:2000";LC_TIME
-category  "tr_CY:2000";LC_NUMERIC
-category  "tr_CY:2000";LC_MONETARY
-category  "tr_CY:2000";LC_MESSAGES
-category  "tr_CY:2000";LC_PAPER
-category  "tr_CY:2000";LC_NAME
-category  "tr_CY:2000";LC_ADDRESS
-category  "tr_CY:2000";LC_TELEPHONE
-category  "tr_CY: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
diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index 98d427971b..e1bfea985a 100644
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -48,20 +48,19 @@ date       "2015-12-10"
 audience   ""
 application ""
 abbreviation ""
-%
-category  "tr_TR:2000";LC_IDENTIFICATION
-category  "tr_TR:2000";LC_CTYPE
-category  "tr_TR:2000";LC_COLLATE
-category  "tr_TR:2000";LC_TIME
-category  "tr_TR:2000";LC_NUMERIC
-category  "tr_TR:2000";LC_MONETARY
-category  "tr_TR:2000";LC_MESSAGES
-category  "tr_TR:2000";LC_PAPER
-category  "tr_TR:2000";LC_NAME
-category  "tr_TR:2000";LC_ADDRESS
-category  "tr_TR:2000";LC_TELEPHONE
-category  "tr_TR: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
diff --git a/localedata/locales/ts_ZA b/localedata/locales/ts_ZA
index 6e52f7f2cd..c252863d2c 100644
--- a/localedata/locales/ts_ZA
+++ b/localedata/locales/ts_ZA
@@ -43,20 +43,19 @@ language   "Tsonga"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-12"
-%
-category  "ts_ZA:2004";LC_IDENTIFICATION
-category  "ts_ZA:2004";LC_CTYPE
-category  "ts_ZA:2004";LC_COLLATE
-category  "ts_ZA:2004";LC_TIME
-category  "ts_ZA:2004";LC_NUMERIC
-category  "ts_ZA:2004";LC_MONETARY
-category  "ts_ZA:2004";LC_MESSAGES
-category  "ts_ZA:2004";LC_PAPER
-category  "ts_ZA:2004";LC_NAME
-category  "ts_ZA:2004";LC_ADDRESS
-category  "ts_ZA:2004";LC_TELEPHONE
-category  "ts_ZA:2004";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_CTYPE
diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU
index 30ce4bebe4..8cd219cd0d 100644
--- a/localedata/locales/tt_RU
+++ b/localedata/locales/tt_RU
@@ -41,18 +41,17 @@ territory "Russia"
 revision "0.4"
 date "2001-01-28"
 
-category tt_RU:2000;LC_IDENTIFICATION
-category tt_RU:2000;LC_CTYPE
-category tt_RU:2000;LC_COLLATE
-category tt_RU:2000;LC_TIME
-category tt_RU:2000;LC_NUMERIC
-category tt_RU:2000;LC_PAPER
-category tt_RU:2000;LC_TELEPHONE
-category tt_RU:2000;LC_MEASUREMENT
-category tt_RU:2000;LC_ADDRESS
-category tt_RU:2000;LC_MONETARY
-category tt_RU:2000;LC_MESSAGES
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif
index c27b433f69..4e5c40fcab 100644
--- a/localedata/locales/tt_RU@iqtelif
+++ b/localedata/locales/tt_RU@iqtelif
@@ -33,19 +33,18 @@ territory	"Russia"
 revision	"0.1"
 date		"2006-10-12"
 
-category "tt_RU@iqtelif:2000";LC_IDENTIFICATION
-category "tt_RU@iqtelif:2000";LC_CTYPE
-category "tt_RU@iqtelif:2000";LC_COLLATE
-category "tt_RU@iqtelif:2000";LC_TIME
-category "tt_RU@iqtelif:2000";LC_NUMERIC
-category "tt_RU@iqtelif:2000";LC_PAPER
-category "tt_RU@iqtelif:2000";LC_TELEPHONE
-category "tt_RU@iqtelif:2000";LC_MEASUREMENT
-category "tt_RU@iqtelif:2000";LC_ADDRESS
-category "tt_RU@iqtelif:2000";LC_MONETARY
-category "tt_RU@iqtelif:2000";LC_MESSAGES
-category "tt_RU@iqtelif:2000";LC_NAME
-
+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_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
 END LC_IDENTIFICATION
 
 % TODO: further test LC_COLLATE
diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index 8f583d7368..85fab0692c 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -31,20 +31,19 @@ language   "Uyghur"
 territory  "China"
 revision   "2.00"
 date       "2011-02-26"
-%
-category  "ug_CN:2000";LC_IDENTIFICATION
-category  "ug_CN:2000";LC_CTYPE
-category  "ug_CN:2000";LC_COLLATE
-category  "ug_CN:2000";LC_TIME
-category  "ug_CN:2000";LC_NUMERIC
-category  "ug_CN:2000";LC_MONETARY
-category  "ug_CN:2000";LC_MEASUREMENT
-category  "ug_CN:2000";LC_MESSAGES
-category  "ug_CN:2000";LC_PAPER
-category  "ug_CN:2000";LC_NAME
-category  "ug_CN:2000";LC_ADDRESS
-category  "ug_CN:2000";LC_TELEPHONE
 
+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_MEASUREMENT
+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
 END LC_IDENTIFICATION
 
 LC_COLLATE
diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 85f6baa4c3..92ebee1367 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -73,19 +73,18 @@ revision   "2.1.12"
 % Revision date
 date       "2006-05-20"
 
-category  "i18n:2002";LC_IDENTIFICATION
-category  "i18n:2002";LC_CTYPE
-category  "i18n:2002";LC_COLLATE
-category  "i18n:2000";LC_TIME
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2002";LC_MONETARY
-category  "i18n:2002";LC_MESSAGES
-category  "i18n:2002";LC_PAPER
-category  "i18n:2002";LC_NAME
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2002";LC_TELEPHONE
-category  "posix:1993";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
 
 
diff --git a/localedata/locales/unm_US b/localedata/locales/unm_US
index 63e8ee7855..0908006b80 100644
--- a/localedata/locales/unm_US
+++ b/localedata/locales/unm_US
@@ -28,20 +28,19 @@ language   "Unami Delaware"
 territory  "United States"
 revision   "1.0"
 date       "2011-10-27"
-%
-category  "unm_US:2011";LC_IDENTIFICATION
-category  "unm_US:2011";LC_CTYPE
-category  "unm_US:2011";LC_COLLATE
-category  "unm_US:2011";LC_TIME
-category  "unm_US:2011";LC_NUMERIC
-category  "unm_US:2011";LC_MONETARY
-category  "unm_US:2011";LC_MESSAGES
-category  "unm_US:2011";LC_PAPER
-category  "unm_US:2011";LC_NAME
-category  "unm_US:2011";LC_ADDRESS
-category  "unm_US:2011";LC_TELEPHONE
-category  "unm_US:2011";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_CTYPE
diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN
index 58c033602e..368a251769 100644
--- a/localedata/locales/ur_IN
+++ b/localedata/locales/ur_IN
@@ -25,20 +25,19 @@ language    "Urdu"
 territory   "India"
 revision    "1.0"
 date        "2009,June,09"
-%
-category  "ur_IN:2009";LC_IDENTIFICATION
-category  "ur_IN:2009";LC_CTYPE
-category  "ur_IN:2009";LC_COLLATE
-category  "ur_IN:2009";LC_TIME
-category  "ur_IN:2009";LC_NUMERIC
-category  "ur_IN:2009";LC_MONETARY
-category  "ur_IN:2009";LC_MESSAGES
-category  "ur_IN:2009";LC_PAPER
-category  "ur_IN:2009";LC_NAME
-category  "ur_IN:2009";LC_ADDRESS
-category  "ur_IN:2009";LC_TELEPHONE
-category  "ur_IN:2009";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
 
 
diff --git a/localedata/locales/ur_PK b/localedata/locales/ur_PK
index b5c1feaa82..7bbf66a7d1 100644
--- a/localedata/locales/ur_PK
+++ b/localedata/locales/ur_PK
@@ -31,19 +31,19 @@ language   "Urdu"
 territory  "Pakistan"
 revision   "0.3"
 date       "2000-07-11"
-%
-category  "ur_PK:2000";LC_IDENTIFICATION
-category  "ur_PK:2000";LC_CTYPE
-category  "ur_PK:2000";LC_COLLATE
-category  "ur_PK:2000";LC_TIME
-category  "ur_PK:2000";LC_NUMERIC
-category  "ur_PK:2000";LC_MONETARY
-category  "ur_PK:2000";LC_MESSAGES
-category  "ur_PK:2000";LC_PAPER
-category  "ur_PK:2000";LC_NAME
-category  "ur_PK:2000";LC_ADDRESS
-category  "ur_PK:2000";LC_TELEPHONE
-category  "ur_PK: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_CTYPE
diff --git a/localedata/locales/uz_UZ b/localedata/locales/uz_UZ
index 1e30530768..a3a6824cfd 100644
--- a/localedata/locales/uz_UZ
+++ b/localedata/locales/uz_UZ
@@ -46,20 +46,19 @@ language   "Uzbek"
 territory  "Uzbekistan"
 revision   "0.5"
 date       "2003-06-27"
-%
-category  "uz_UZ:2000";LC_IDENTIFICATION
-category  "uz_UZ:2000";LC_CTYPE
-category  "uz_UZ:2000";LC_COLLATE
-category  "uz_UZ:2000";LC_TIME
-category  "uz_UZ:2000";LC_NUMERIC
-category  "uz_UZ:2000";LC_MONETARY
-category  "uz_UZ:2000";LC_MESSAGES
-category  "uz_UZ:2000";LC_PAPER
-category  "uz_UZ:2000";LC_NAME
-category  "uz_UZ:2000";LC_ADDRESS
-category  "uz_UZ:2000";LC_TELEPHONE
-category  "uz_UZ: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_CTYPE
diff --git a/localedata/locales/uz_UZ@cyrillic b/localedata/locales/uz_UZ@cyrillic
index a7d70ab800..697c65a22e 100644
--- a/localedata/locales/uz_UZ@cyrillic
+++ b/localedata/locales/uz_UZ@cyrillic
@@ -42,20 +42,19 @@ language   "Uzbek"
 territory  "Uzbekistan"
 revision   "0.1"
 date       "2003-05-30"
-%
-category  "uz_UZ:2000";LC_IDENTIFICATION
-category  "uz_UZ:2000";LC_CTYPE
-category  "uz_UZ:2000";LC_COLLATE
-category  "uz_UZ:2000";LC_TIME
-category  "uz_UZ:2000";LC_NUMERIC
-category  "uz_UZ:2000";LC_MONETARY
-category  "uz_UZ:2000";LC_MESSAGES
-category  "uz_UZ:2000";LC_PAPER
-category  "uz_UZ:2000";LC_NAME
-category  "uz_UZ:2000";LC_ADDRESS
-category  "uz_UZ:2000";LC_TELEPHONE
-category  "uz_UZ: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_CTYPE
diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
index 61c608a8a7..9a467912a9 100644
--- a/localedata/locales/ve_ZA
+++ b/localedata/locales/ve_ZA
@@ -46,20 +46,19 @@ language   "Venda"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
-%
-category  "ve_ZA:2004";LC_IDENTIFICATION
-category  "ve_ZA:2004";LC_CTYPE
-category  "ve_ZA:2004";LC_COLLATE
-category  "ve_ZA:2004";LC_TIME
-category  "ve_ZA:2004";LC_NUMERIC
-category  "ve_ZA:2004";LC_MONETARY
-category  "ve_ZA:2004";LC_MESSAGES
-category  "ve_ZA:2004";LC_PAPER
-category  "ve_ZA:2004";LC_NAME
-category  "ve_ZA:2004";LC_ADDRESS
-category  "ve_ZA:2004";LC_TELEPHONE
-category  "ve_ZA:2004";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_CTYPE
diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN
index 1238477574..16444076e0 100644
--- a/localedata/locales/vi_VN
+++ b/localedata/locales/vi_VN
@@ -34,20 +34,19 @@ language   "Vietnamese"
 territory  "Vietnam"
 revision   "1.1"
 date       "2004-01-09"
-%
-category  "vi_VN:2000";LC_IDENTIFICATION
-category  "vi_VN:2000";LC_CTYPE
-category  "vi_VN:2000";LC_COLLATE
-category  "vi_VN:2000";LC_TIME
-category  "vi_VN:2000";LC_NUMERIC
-category  "vi_VN:2000";LC_MONETARY
-category  "vi_VN:2000";LC_MESSAGES
-category  "vi_VN:2000";LC_PAPER
-category  "vi_VN:2000";LC_NAME
-category  "vi_VN:2000";LC_ADDRESS
-category  "vi_VN:2000";LC_TELEPHONE
-category  "vi_VN: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_CTYPE
diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE
index 826b7d8656..50aa15d522 100644
--- a/localedata/locales/wa_BE
+++ b/localedata/locales/wa_BE
@@ -23,19 +23,18 @@ territory "Belgium"
 revision "0.9"
 date "2003-08-25"
 
-category i18n:2000;LC_IDENTIFICATION
-category i18n:2000;LC_COLLATE
-category i18n:2000;LC_CTYPE
-category i18n:2000;LC_MESSAGES
-category i18n:2000;LC_MONETARY
-category i18n:2000;LC_NUMERIC
-category i18n:2000;LC_TIME
-category i18n:2000;LC_PAPER
-category i18n:2000;LC_MEASUREMENT
-category i18n:2000;LC_TELEPHONE
-category i18n:2000;LC_ADDRESS
-category i18n:2000;LC_NAME
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_NAME
 END LC_IDENTIFICATION
 
 LC_ADDRESS
diff --git a/localedata/locales/wa_BE@euro b/localedata/locales/wa_BE@euro
index 201fd85519..cc1c4f5049 100644
--- a/localedata/locales/wa_BE@euro
+++ b/localedata/locales/wa_BE@euro
@@ -28,19 +28,19 @@ language   "Walloon"
 territory  "Belgium"
 revision   "1.0"
 date       "2002-02-23"
-%
-category  "wa_BE@euro:2000";LC_IDENTIFICATION
-category  "wa_BE@euro:2000";LC_CTYPE
-category  "wa_BE@euro:2000";LC_COLLATE
-category  "wa_BE@euro:2000";LC_TIME
-category  "wa_BE@euro:2000";LC_NUMERIC
-category  "wa_BE@euro:2000";LC_MONETARY
-category  "wa_BE@euro:2000";LC_MESSAGES
-category  "wa_BE@euro:2000";LC_PAPER
-category  "wa_BE@euro:2000";LC_NAME
-category  "wa_BE@euro:2000";LC_ADDRESS
-category  "wa_BE@euro:2000";LC_TELEPHONE
-category  "wa_BE@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_CTYPE
diff --git a/localedata/locales/wae_CH b/localedata/locales/wae_CH
index 068ae85630..0ef86496de 100644
--- a/localedata/locales/wae_CH
+++ b/localedata/locales/wae_CH
@@ -28,20 +28,19 @@ language   "Walser"
 territory  "Switzerland"
 revision   "0.1"
 date       "2010-10-25"
-%
-category  "wae_CH:2000";LC_IDENTIFICATION
-category  "wae_CH:2000";LC_CTYPE
-category  "wae_CH:2000";LC_COLLATE
-category  "wae_CH:2000";LC_TIME
-category  "wae_CH:2000";LC_NUMERIC
-category  "wae_CH:2000";LC_MONETARY
-category  "wae_CH:2000";LC_MESSAGES
-category  "wae_CH:2000";LC_MEASUREMENT
-category  "wae_CH:2000";LC_PAPER
-category  "wae_CH:2000";LC_NAME
-category  "wae_CH:2000";LC_ADDRESS
-category  "wae_CH:2000";LC_TELEPHONE
-%
+
+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_MEASUREMENT
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
index 0a0c69c9fa..e2b992b677 100644
--- a/localedata/locales/wal_ET
+++ b/localedata/locales/wal_ET
@@ -37,20 +37,19 @@ language   "Wolaytta"
 territory  "Ethiopia"
 revision   "0.10"
 date       "2004-04-25"
-%
-category  "i18n:2000";LC_IDENTIFICATION
-category  "i18n:2000";LC_COLLATE
-category  "i18n:2000";LC_CTYPE
-category  "i18n:2000";LC_MEASUREMENT
-category  "i18n:2000";LC_MONETARY
-category  "posix:1993";LC_NUMERIC
-category  "i18n:2000";LC_PAPER
-category  "i18n:2000";LC_TELEPHONE
-category  "i18n:2000";LC_ADDRESS
-category  "i18n:2000";LC_MESSAGES
-category  "i18n:2000";LC_NAME
-category  "i18n:2000";LC_TIME
-%
+
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_NAME
+category "i18n:2012";LC_TIME
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN
index 2f0bcc1949..1838dd2aa2 100644
--- a/localedata/locales/wo_SN
+++ b/localedata/locales/wo_SN
@@ -32,19 +32,19 @@ language   "Wolof"
 territory  "Senegal"
 revision   "1.0"
 date       "2004-09-08"
-%
-category  "mg_MG:2000";LC_IDENTIFICATION
-category  "mg_MG:2000";LC_CTYPE
-category  "mg_MG:2000";LC_COLLATE
-category  "mg_MG:2000";LC_TIME
-category  "mg_MG:2000";LC_NUMERIC
-category  "mg_MG:2000";LC_MONETARY
-category  "mg_MG:2000";LC_MESSAGES
-category  "mg_MG:2000";LC_PAPER
-category  "mg_MG:2000";LC_NAME
-category  "mg_MG:2000";LC_ADDRESS
-category  "mg_MG:2000";LC_TELEPHONE
-category  "mg_MG: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_CTYPE
diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA
index e1a8daaab1..e9e6b8dfdb 100644
--- a/localedata/locales/xh_ZA
+++ b/localedata/locales/xh_ZA
@@ -45,20 +45,19 @@ language   "Xhosa"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
-%
-category  "xh_ZA:2003";LC_IDENTIFICATION
-category  "xh_ZA:2003";LC_CTYPE
-category  "xh_ZA:2003";LC_COLLATE
-category  "xh_ZA:2003";LC_TIME
-category  "xh_ZA:2003";LC_NUMERIC
-category  "xh_ZA:2003";LC_MONETARY
-category  "xh_ZA:2003";LC_MESSAGES
-category  "xh_ZA:2003";LC_PAPER
-category  "xh_ZA:2003";LC_NAME
-category  "xh_ZA:2003";LC_ADDRESS
-category  "xh_ZA:2003";LC_TELEPHONE
-category  "xh_ZA:2003";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_CTYPE
diff --git a/localedata/locales/yi_US b/localedata/locales/yi_US
index 44bb720c68..31bb6b9691 100644
--- a/localedata/locales/yi_US
+++ b/localedata/locales/yi_US
@@ -26,22 +26,17 @@ territory "United States"
 revision "0.4"
 date "2003-08-16"
 
-category "yi_US:2000";LC_IDENTIFICATION
-category "yi_US:2000";LC_COLLATE
-category "yi_US:2000";LC_CTYPE
-category "yi_US:2000";LC_MESSAGES
-category "yi_US:2000";LC_MONETARY
-category "yi_US:2000";LC_NUMERIC
-category "yi_US:2000";LC_TIME
-category "yi_US:2000";LC_PAPER
-category "yi_US:2000";LC_MEASUREMENT
-category "yi_US:2000";LC_TELEPHONE
-category "yi_US:2000";LC_ADDRESS
-
-% ISO/IEC 14652: Converted comments to LC_IDENTIFICATION
-%  added LC_PAPER, LC_MEASUREMENT, LC_IDENTIFICATION, LC_ADDRESS
-% -- mckinstry@computer.org, 2000-07-03
-
+category "i18n:2012";LC_IDENTIFICATION
+category "i18n:2012";LC_COLLATE
+category "i18n:2012";LC_CTYPE
+category "i18n:2012";LC_MESSAGES
+category "i18n:2012";LC_MONETARY
+category "i18n:2012";LC_NUMERIC
+category "i18n:2012";LC_TIME
+category "i18n:2012";LC_PAPER
+category "i18n:2012";LC_MEASUREMENT
+category "i18n:2012";LC_TELEPHONE
+category "i18n:2012";LC_ADDRESS
 END LC_IDENTIFICATION
 
 
diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
index 119ac7ef79..d8acf4bf0a 100644
--- a/localedata/locales/yo_NG
+++ b/localedata/locales/yo_NG
@@ -31,19 +31,19 @@ language   "Yoruba"
 territory  "Nigeria"
 revision   "0.2"
 date       "2005-11-20"
-%
-category  "yo_NG:2000";LC_IDENTIFICATION
-category  "yo_NG:2000";LC_CTYPE
-category  "yo_NG:2000";LC_COLLATE
-category  "yo_NG:2000";LC_TIME
-category  "yo_NG:2000";LC_NUMERIC
-category  "yo_NG:2000";LC_MONETARY
-category  "yo_NG:2000";LC_MESSAGES
-category  "yo_NG:2000";LC_PAPER
-category  "yo_NG:2000";LC_NAME
-category  "yo_NG:2000";LC_ADDRESS
-category  "yo_NG:2000";LC_TELEPHONE
-category  "yo_NG: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
diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK
index 29d73fb999..46f627b3e8 100644
--- a/localedata/locales/yue_HK
+++ b/localedata/locales/yue_HK
@@ -25,19 +25,19 @@ language   "Cantonese"
 territory  "Hong Kong SAR China"
 revision   "1.0"
 date       "2010-11-07"
-%
-category  "yue_HK:2010";LC_IDENTIFICATION
-category  "yue_HK:2010";LC_CTYPE
-category  "yue_HK:2010";LC_COLLATE
-category  "yue_HK:2010";LC_TIME
-category  "yue_HK:2010";LC_NUMERIC
-category  "yue_HK:2010";LC_MONETARY
-category  "yue_HK:2010";LC_MESSAGES
-category  "yue_HK:2010";LC_PAPER
-category  "yue_HK:2010";LC_NAME
-category  "yue_HK:2010";LC_ADDRESS
-category  "yue_HK:2010";LC_TELEPHONE
-category  "yue_HK:2010";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
 
 
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index b2087a6e9c..e772c2aadf 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -34,19 +34,19 @@ language   "Chinese"
 territory  "China"
 revision   "0.1"
 date       "2000-07-25"
-%
-category  "zh_CN:2000";LC_IDENTIFICATION
-category  "zh_CN:2000";LC_CTYPE
-category  "zh_CN:2000";LC_COLLATE
-category  "zh_CN:2000";LC_TIME
-category  "zh_CN:2000";LC_NUMERIC
-category  "zh_CN:2000";LC_MONETARY
-category  "zh_CN:2000";LC_MESSAGES
-category  "zh_CN:2000";LC_PAPER
-category  "zh_CN:2000";LC_NAME
-category  "zh_CN:2000";LC_ADDRESS
-category  "zh_CN:2000";LC_TELEPHONE
-category  "zh_CN: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
 
 
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index 59b292fd25..7cf8fa3e24 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -24,19 +24,19 @@ language   "Chinese"
 territory  "Hong Kong SAR China"
 revision   "1.0"
 date       "2000-07-20"
-%
-category  "zh_HK:2000";LC_IDENTIFICATION
-category  "zh_HK:2000";LC_CTYPE
-category  "zh_HK:2000";LC_COLLATE
-category  "zh_HK:2000";LC_TIME
-category  "zh_HK:2000";LC_NUMERIC
-category  "zh_HK:2000";LC_MONETARY
-category  "zh_HK:2000";LC_MESSAGES
-category  "zh_HK:2000";LC_PAPER
-category  "zh_HK:2000";LC_NAME
-category  "zh_HK:2000";LC_ADDRESS
-category  "zh_HK:2000";LC_TELEPHONE
-category  "zh_HK: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_CTYPE
diff --git a/localedata/locales/zh_SG b/localedata/locales/zh_SG
index 0c6d59229c..48930be627 100644
--- a/localedata/locales/zh_SG
+++ b/localedata/locales/zh_SG
@@ -24,19 +24,19 @@ language    "Chinese"
 territory   "Singapore"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
-%
-category  "zh_SG:2000";LC_IDENTIFICATION
-category  "zh_SG:2000";LC_CTYPE
-category  "zh_SG:2000";LC_COLLATE
-category  "zh_SG:2000";LC_TIME
-category  "zh_SG:2000";LC_NUMERIC
-category  "zh_SG:2000";LC_MONETARY
-category  "zh_SG:2000";LC_MESSAGES
-category  "zh_SG:2000";LC_PAPER
-category  "zh_SG:2000";LC_NAME
-category  "zh_SG:2000";LC_ADDRESS
-category  "zh_SG:2000";LC_TELEPHONE
-category  "zh_SG: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_CTYPE
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index f5edc302eb..4dc58d604f 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -35,19 +35,19 @@ language   "Chinese"
 territory  "Taiwan"
 revision   "0.2"
 date       "2000-08-02"
-%
-category  "zh_TW:2000";LC_IDENTIFICATION
-category  "zh_TW:2000";LC_CTYPE
-category  "zh_TW:2000";LC_COLLATE
-category  "zh_TW:2000";LC_TIME
-category  "zh_TW:2000";LC_NUMERIC
-category  "zh_TW:2000";LC_MONETARY
-category  "zh_TW:2000";LC_MESSAGES
-category  "zh_TW:2000";LC_PAPER
-category  "zh_TW:2000";LC_NAME
-category  "zh_TW:2000";LC_ADDRESS
-category  "zh_TW:2000";LC_TELEPHONE
-category  "zh_TW: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_CTYPE
diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA
index cc810fdc82..cc3ce98573 100644
--- a/localedata/locales/zu_ZA
+++ b/localedata/locales/zu_ZA
@@ -48,20 +48,19 @@ language   "Zulu"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
-%
-category  "zu_ZA:2003";LC_IDENTIFICATION
-category  "zu_ZA:2003";LC_CTYPE
-category  "zu_ZA:2003";LC_COLLATE
-category  "zu_ZA:2003";LC_TIME
-category  "zu_ZA:2003";LC_NUMERIC
-category  "zu_ZA:2003";LC_MONETARY
-category  "zu_ZA:2003";LC_MESSAGES
-category  "zu_ZA:2003";LC_PAPER
-category  "zu_ZA:2003";LC_NAME
-category  "zu_ZA:2003";LC_ADDRESS
-category  "zu_ZA:2003";LC_TELEPHONE
-category  "zu_ZA:2003";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_CTYPE