Adjust language-code fields of LC_ADDRESS.

72 files changed, 408 insertions, 63 deletions

diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN
index 534625634c..b7288b72ca 100644
--- a/localedata/locales/as_IN
+++ b/localedata/locales/as_IN
@@ -159,6 +159,12 @@ postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 % IND
 country_car  "<U0049><U004E><U0044>"
+% as
+lang_ab      "<U0061><U0073>"
+% asm
+lang_term    "<U0061><U0073><U006D>"
+% asm
+lang_lib    "<U0061><U0073><U006D>"
 END LC_ADDRESS
 
 %%%%%%%%%%%%%
diff --git a/localedata/locales/ast_ES b/localedata/locales/ast_ES
index c0c81306e1..967f5471d4 100644
--- a/localedata/locales/ast_ES
+++ b/localedata/locales/ast_ES
@@ -140,4 +140,8 @@ country_ab3   "<U0045><U0053><U0050>"
 country_num   724
 % E
 country_car    "<U0045>"
+% ast
+lang_term    "<U0061><U0073><U0074>"
+% ast
+lang_lib    "<U0061><U0073><U0074>"
 END LC_ADDRESS
diff --git a/localedata/locales/ayc_PE b/localedata/locales/ayc_PE
index d7b6c599c8..a65dff0570 100644
--- a/localedata/locales/ayc_PE
+++ b/localedata/locales/ayc_PE
@@ -202,6 +202,12 @@ country_ab3   "<U0050><U0045><U0052>"
 country_num   604
 % PE
 country_car    "<U0050><U0045>"
+% ay
+lang_ab    "<U0061><U0079>"
+% ayc
+lang_term    "<U0061><U0079><U0063>"
+% ayc
+lang_lib    "<U0061><U0079><U0063>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
index 0df07b931f..0dd3de14e2 100644
--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@@ -294,7 +294,12 @@ country_ab3 "<U0041><U005A><U0045>"
 country_num 031
 % AZ
 country_car    "<U0041><U005A>"
-
+% az
+lang_ab      "<U0061><U007A>"
+% aze
+lang_term    "<U0061><U007A><U0065>"
+% aze
+lang_lib    "<U0061><U007A><U0065>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY
index f5672ab29e..e64867980c 100644
--- a/localedata/locales/be_BY
+++ b/localedata/locales/be_BY
@@ -182,5 +182,10 @@ country_ab3 "<U0042><U004C><U0052>"
 country_num 112
 % BY
 country_car    "<U0042><U0059>"
-
+% be
+lang_ab      "<U0062><U0065>"
+% bel
+lang_term    "<U0062><U0065><U006C>"
+% bel
+lang_lib    "<U0062><U0065><U006C>"
 END LC_ADDRESS
diff --git a/localedata/locales/bem_ZM b/localedata/locales/bem_ZM
index 70f03977f4..ddf36a6848 100644
--- a/localedata/locales/bem_ZM
+++ b/localedata/locales/bem_ZM
@@ -182,7 +182,10 @@ country_num   894
 % Z
 country_car  "<U005A>"
 lang_name     "<U0069><U0063><U0069><U0042><U0065><U006D><U0062><U0061>"
-lang_term     "<U0062><U0065><U006D>"
+% bem
+lang_term    "<U0062><U0065><U006D>"
+% bem
+lang_lib    "<U0062><U0065><U006D>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG
index 14e8fb97aa..9316d10625 100644
--- a/localedata/locales/bg_BG
+++ b/localedata/locales/bg_BG
@@ -269,6 +269,7 @@ country_isbn  954
 lang_name    "<U0042><U0075><U006C><U0067><U0061><U0072><U0069><U0061><U006E>"
 lang_ab      "<U0062><U0067>"
 lang_term    "<U0062><U0075><U006C>"
+lang_lib    "<U0062><U0075><U006C>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN
index ce76740e23..54028b9628 100644
--- a/localedata/locales/bho_IN
+++ b/localedata/locales/bho_IN
@@ -157,6 +157,10 @@ country_ab3 "<U0049><U004E><U0044>"
 country_num 356
 % IND
 country_car    "<U0049><U004E><U0044>"
+% bho
+lang_term    "<U0062><U0068><U006F>"
+% bho
+lang_lib    "<U0062><U0068><U006F>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index b226578668..58842d6bd4 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -180,7 +180,12 @@ postal_fmt      "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E><U0025>
 country_name    "<U09AC><U09BE><U0982><U09B2><U09BE><U09A6><U09C7><U09B6>"
 country_ab2     "<U0042><U0044>"
 country_ab3     "<U0042><U0047><U0044>"
-lang_ab         "<U0062><U006E>"
+% bn
+lang_ab      "<U0062><U006E>"
+% ben
+lang_term    "<U0062><U0065><U006E>"
+% ben
+lang_lib       "<U0062><U0065><U006E>"
 %lang_ab3_term   "ben"
 lang_name       "<U09ac><U09be><U0982><U09b2><U09be>"
 % todo
diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
index fbff935d36..ddf3cf2513 100644
--- a/localedata/locales/bn_IN
+++ b/localedata/locales/bn_IN
@@ -183,7 +183,12 @@ country_ab3 "<U0049><U004E><U0044>"
 country_num 356
 % IND
 country_car    "<U0049><U004E><U0044>"
-
+% bn
+lang_ab      "<U0062><U006E>"
+% ben
+lang_term    "<U0062><U0065><U006E>"
+% ben
+lang_lib       "<U0062><U0065><U006E>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
index aa8ff07715..fab02ae0a3 100644
--- a/localedata/locales/bo_CN
+++ b/localedata/locales/bo_CN
@@ -164,9 +164,11 @@ country_ab3	"<U0043><U0048><U004E>"
 country_num	156
 %country_car	"FIXME"
 country_isbn	"<U0037>"
-
 lang_name     "<U0F54><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
+% bo
 lang_ab       "<U0062><U006F>"
+% bod
 lang_term     "<U0062><U006F><U0064>"
+% tib
 lang_lib      "<U0074><U0069><U0062>"
 END LC_ADDRESS
diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN
index ba1756eb09..73a9084ddb 100644
--- a/localedata/locales/bo_IN
+++ b/localedata/locales/bo_IN
@@ -90,7 +90,10 @@ country_num 356
 % IND
 country_car    "<U0049><U004E><U0044>"
 lang_name     "<U0F54><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
+% bo
 lang_ab       "<U0062><U006F>"
+% bod
 lang_term     "<U0062><U006F><U0064>"
+% tib
 lang_lib      "<U0074><U0069><U0062>"
 END LC_ADDRESS
diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
index eaba116e0c..564212de6e 100644
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@@ -170,6 +170,12 @@ country_ab3 "<U0046><U0052><U0041>"
 country_num 250
 % F
 country_car    "<U0046>"
+% br
+lang_ab      "<U0062><U0072>"
+% bre
+lang_term    "<U0062><U0072><U0065>"
+% bre
+lang_lib    "<U0062><U0072><U0065>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN
index a24d4436d2..ed79fe4f46 100644
--- a/localedata/locales/brx_IN
+++ b/localedata/locales/brx_IN
@@ -179,6 +179,10 @@ country_ab3 "<U0049><U004E><U0044>"
 country_num 356
 % IND
 country_car    "<U0049><U004E><U0044>"
+% brx
+lang_term    "<U0062><U0072><U0078>"
+% brx
+lang_lib    "<U0062><U0072><U0078>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index cf59ccb2fb..c4d37d7dc7 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -236,7 +236,12 @@ country_ab3 "<U0042><U0049><U0048>"
 country_num 070
 % BIH
 country_car    "<U0042><U0049><U0048>"
-
+% bs
+lang_ab      "<U0062><U0073>"
+% bos
+lang_term    "<U0062><U006F><U0073>"
+% bos
+lang_lib    "<U0062><U006F><U0073>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD
index 39287ec6d9..4edb85a8bd 100644
--- a/localedata/locales/ca_AD
+++ b/localedata/locales/ca_AD
@@ -93,4 +93,10 @@ country_ab3 "<U0041><U004E><U0044>"
 country_num 20
 % AND
 country_car  "<U0041><U004E><U0044>"
+% ca
+lang_ab      "<U0063><U0061>"
+% cat
+lang_term    "<U0063><U0061><U0074>"
+% cat
+lang_lib    "<U0063><U0061><U0074>"
 END LC_ADDRESS
diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index 0086b42228..68ffd47766 100644
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -176,5 +176,10 @@ country_ab3 "<U0045><U0053><U0050>"
 country_num 724
 % E
 country_car    "<U0045>"
-
+% ca
+lang_ab      "<U0063><U0061>"
+% cat
+lang_term    "<U0063><U0061><U0074>"
+% cat
+lang_lib    "<U0063><U0061><U0074>"
 END LC_ADDRESS
diff --git a/localedata/locales/ca_FR b/localedata/locales/ca_FR
index fda292b821..aac4eacbb7 100644
--- a/localedata/locales/ca_FR
+++ b/localedata/locales/ca_FR
@@ -91,4 +91,10 @@ country_ab3 "<U0046><U0052><U0041>"
 country_num 250
 % F
 country_car    "<U0046>"
+% ca
+lang_ab      "<U0063><U0061>"
+% cat
+lang_term    "<U0063><U0061><U0074>"
+% cat
+lang_lib    "<U0063><U0061><U0074>"
 END LC_ADDRESS
diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT
index c2bdf473be..3865b8809f 100644
--- a/localedata/locales/ca_IT
+++ b/localedata/locales/ca_IT
@@ -91,4 +91,10 @@ country_ab3 "<U0049><U0054><U0041>"
 country_num 380
 % I
 country_car    "<U0049>"
+% ca
+lang_ab      "<U0063><U0061>"
+% cat
+lang_term    "<U0063><U0061><U0074>"
+% cat
+lang_lib    "<U0063><U0061><U0074>"
 END LC_ADDRESS
diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA
index 9e1bf50cf8..7bf156d56d 100644
--- a/localedata/locales/crh_UA
+++ b/localedata/locales/crh_UA
@@ -227,6 +227,10 @@ country_ab3 "<U0055><U004B><U0052>"
 country_num 804
 % UA
 country_car  "<U0055><U0041>"
+% crh
+lang_term    "<U0063><U0072><U0068>"
+% crh
+lang_lib    "<U0063><U0072><U0068>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/csb_PL b/localedata/locales/csb_PL
index 70daf3a883..1ee9494d88 100644
--- a/localedata/locales/csb_PL
+++ b/localedata/locales/csb_PL
@@ -216,4 +216,8 @@ country_ab3 "<U0050><U004F><U004C>"
 country_num 616
 % PL
 country_car    "<U0050><U004C>"
+% csb
+lang_term    "<U0063><U0073><U0062>"
+% csb
+lang_lib    "<U0063><U0073><U0062>"
 END LC_ADDRESS
diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU
index a29d07262c..0d04cfb39e 100644
--- a/localedata/locales/cv_RU
+++ b/localedata/locales/cv_RU
@@ -244,4 +244,10 @@ country_ab3 "<U0052><U0055><U0053>"
 country_num 643
 % RUS
 country_car    "<U0052><U0055><U0053>"
+% cv
+lang_ab      "<U0063><U0076>"
+% chv
+lang_term    "<U0063><U0068><U0076>"
+% chv
+lang_lib     "<U0063><U0068><U0076>"
 END LC_ADDRESS
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index 211abcd853..2694a91e16 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -254,5 +254,10 @@ country_ab3 "<U0044><U004E><U004B>"
 country_num 208
 % DK
 country_car    "<U0044><U004B>"
-
+% da
+lang_ab      "<U0064><U0061>"
+% dan
+lang_term    "<U0064><U0061><U006E>"
+% dan
+lang_lib    "<U0064><U0061><U006E>"
 END LC_ADDRESS
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index c450dafc78..185da1aa86 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -157,5 +157,10 @@ country_ab3 "<U0041><U0055><U0054>"
 country_num 040
 % A
 country_car    "<U0041>"
-
+% de
+lang_ab       "<U0064><U0065>"
+% deu
+lang_term     "<U0064><U0065><U0075>"
+% ger
+lang_lib      "<U0067><U0065><U0072>"
 END LC_ADDRESS
diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 5368fd42fa..d7001e0258 100644
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -151,5 +151,10 @@ country_ab3 "<U0042><U0045><U004C>"
 country_num 056
 % B
 country_car    "<U0042>"
-
+% de
+lang_ab       "<U0064><U0065>"
+% deu
+lang_term     "<U0064><U0065><U0075>"
+% ger
+lang_lib      "<U0067><U0065><U0072>"
 END LC_ADDRESS
diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH
index b26d79e28f..0e437674b7 100644
--- a/localedata/locales/de_CH
+++ b/localedata/locales/de_CH
@@ -160,5 +160,10 @@ country_ab3 "<U0043><U0048><U0045>"
 country_num 756
 % CH
 country_car    "<U0043><U0048>"
-
+% de
+lang_ab       "<U0064><U0065>"
+% deu
+lang_term     "<U0064><U0065><U0075>"
+% ger
+lang_lib      "<U0067><U0065><U0072>"
 END LC_ADDRESS
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index 32cbd76dda..bfa7fc07b0 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -195,8 +195,11 @@ country_num   276
 country_car   "<U0044>"
 country_isbn  3
 lang_name     "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
+% de
 lang_ab       "<U0064><U0065>"
+% deu
 lang_term     "<U0064><U0065><U0075>"
+% ger
 lang_lib      "<U0067><U0065><U0072>"
 END LC_ADDRESS
 
diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index e11f6adfc5..5f80739ee1 100644
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -157,5 +157,10 @@ country_ab3 "<U004C><U0055><U0058>"
 country_num 442
 % L
 country_car    "<U004C>"
-
+% de
+lang_ab       "<U0064><U0065>"
+% deu
+lang_term     "<U0064><U0065><U0075>"
+% ger
+lang_lib      "<U0067><U0065><U0072>"
 END LC_ADDRESS
diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
index fc43e973a0..47e90792bd 100644
--- a/localedata/locales/doi_IN
+++ b/localedata/locales/doi_IN
@@ -170,6 +170,10 @@ country_ab3 "<U0049><U004E><U0044>"
 country_num 356
 % IND
 country_car    "<U0049><U004E><U0044>"
+% doi
+lang_term    "<U0064><U006F><U0069>"
+% doi
+lang_lib    "<U0064><U006F><U0069>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV
index 91ca8b12ac..4876d14903 100644
--- a/localedata/locales/dv_MV
+++ b/localedata/locales/dv_MV
@@ -177,4 +177,10 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+% dv
+lang_ab      "<U0064><U0076>"
+% div
+lang_term    "<U0064><U0069><U0076>"
+% div
+lang_lib    "<U0064><U0069><U0076>"
 END LC_ADDRESS
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index 2f8f3ee1ba..84743465ad 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -660,8 +660,12 @@ country_ab3   "<U0042><U0048><U0055>"
 %country_num   "<U0042><U0048><U0055>"
 %FIXME
 %country_isbn  ""
-lang_name     "<U0E44><U0E17><U0E22>"
-lang_ab       "<U0074><U0068>"
-lang_term     "<U0074><U0068><U0061>"
-lang_lib      "<U0074><U0068><U0061>"
+% རྫོང་ཁ
+lang_name    "<U0028><U0F62><U0FAB><U0F7C><U0F44><U0F0B><U0F41>"
+% dz
+lang_ab      "<U0064><U007A>"
+% dzo
+lang_term    "<U0064><U007A><U006F>"
+% dzo
+lang_lib     "<U0064><U007A><U006F>"
 END LC_ADDRESS
diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY
index 4bc5796e32..58cbb14473 100644
--- a/localedata/locales/el_CY
+++ b/localedata/locales/el_CY
@@ -103,4 +103,10 @@ country_ab3 "<U0043><U0059><U0050>"
 country_num 196
 % CY
 country_car  "<U0043><U0059>"
+% el
+lang_ab      "<U0065><U006C>"
+% ell
+lang_term    "<U0065><U006C><U006C>"
+% gre
+lang_lib    "<U0067><U0072><U0065>"
 END LC_ADDRESS
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index edc8a64038..ad18cef7e3 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -178,5 +178,10 @@ country_ab3 "<U0047><U0052><U0043>"
 country_num 300
 % GR
 country_car    "<U0047><U0052>"
-
+% el
+lang_ab      "<U0065><U006C>"
+% ell
+lang_term    "<U0065><U006C><U006C>"
+% gre
+lang_lib    "<U0067><U0072><U0065>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index b724eace81..043d2a2300 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -85,6 +85,12 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0041><U0047>"
 country_ab3   "<U0041><U0054><U0047>"
 country_num   28
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index 96e6fec19f..eeeeef2e79 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -159,5 +159,10 @@ country_ab3 "<U0041><U0055><U0053>"
 country_num 036
 % AUS
 country_car    "<U0041><U0055><U0053>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
index 02b1334abd..f3b0f02b27 100644
--- a/localedata/locales/en_BW
+++ b/localedata/locales/en_BW
@@ -116,5 +116,10 @@ country_ab3 "<U0042><U0057><U0041>"
 country_num 072
 % RB
 country_car    "<U0052><U0042>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index a4c0edaaad..74717c6686 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -182,7 +182,10 @@ country_num 124
 % CDN
 country_car    "<U0043><U0044><U004E>"
 lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
-lang_ab       "<U0065><U006E>"
-lang_term     "<U0065><U006E><U0067>"
-lang_lib      "<U0065><U006E><U0067>"
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index 891331d236..160097445a 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -160,4 +160,10 @@ country_ab3 "<U0044><U004E><U004B>"
 country_num 208
 % DK
 country_car    "<U0044><U004B>"
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index e48aa033a9..88f440a22d 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -163,5 +163,10 @@ country_ab3   "<U0047><U0042><U0052>"
 country_num   826
 % GB
 country_car    "<U0047><U0042>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
index 4065c9c249..653543a33d 100644
--- a/localedata/locales/en_HK
+++ b/localedata/locales/en_HK
@@ -198,7 +198,12 @@ country_ab3   "<U0048><U004B><U0047>"
 country_num   344
 % HK
 country_car    "<U0048><U004B>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE
index a76790733b..568a7e9c40 100644
--- a/localedata/locales/en_IE
+++ b/localedata/locales/en_IE
@@ -157,5 +157,10 @@ country_ab3   "<U0049><U0052><U004C>"
 country_num   372
 % IRL
 country_car    "<U0049><U0052><U004C>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN
index 45ddaf4c19..9205a7b30b 100644
--- a/localedata/locales/en_IN
+++ b/localedata/locales/en_IN
@@ -193,7 +193,12 @@ country_ab3   "<U0049><U004E><U0044>"
 country_num   356
 % IND
 country_car    "<U0049><U004E><U0044>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG
index a418eb9570..f98251e579 100644
--- a/localedata/locales/en_NG
+++ b/localedata/locales/en_NG
@@ -274,10 +274,12 @@ country_isbn  978
 % ISO 639 language abbreviations:
 % 639-1 2 letter, 639-2 3 letter terminology
 % http://www.loc.gov/standards/iso639-2/englagn.html
-% "en", "eng"
-lang_ab       "<U0065><U006E>"
-lang_term     "<U0065><U006E><U0067>"
-lang_lib      "<U0065><U006E><U0067>"
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 
 % ISO 3166 country number and 2 and 3 letter abreviations
 % http://www.unicode.org/onlinedat/countries.html
diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ
index d85042377e..e786f21e0a 100644
--- a/localedata/locales/en_NZ
+++ b/localedata/locales/en_NZ
@@ -158,5 +158,10 @@ country_ab3   "<U004E><U005A><U004C>"
 country_num   554
 % NZ
 country_car    "<U004E><U005A>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH
index 04fb3a0365..d8d87bae3f 100644
--- a/localedata/locales/en_PH
+++ b/localedata/locales/en_PH
@@ -194,7 +194,12 @@ country_ab3   "<U0049><U0044><U004E>"
 country_num   360
 % RP
 country_car    "<U0052><U0050>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/en_SG b/localedata/locales/en_SG
index 15a668a839..467dfa0448 100644
--- a/localedata/locales/en_SG
+++ b/localedata/locales/en_SG
@@ -197,7 +197,12 @@ country_ab3   "<U0053><U0047><U0050>"
 country_num   702
 % SGP
 country_car    "<U0053><U0047><U0050>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index 302c6f6a6d..4c5fa34de9 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -166,9 +166,12 @@ country_num   840
 country_car   "<U0055><U0053><U0041>"
 country_isbn  0
 lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
-lang_ab       "<U0065><U006E>"
-lang_term     "<U0065><U006E><U0067>"
-lang_lib      "<U0065><U006E><U0067>"
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA
index 86201714b3..2a6b2ba67d 100644
--- a/localedata/locales/en_ZA
+++ b/localedata/locales/en_ZA
@@ -231,7 +231,7 @@ LC_TELEPHONE
 tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
 <U006C>"
 
-% Represntation of telephone number for domestic use -
+% Representation of telephone number for domestic use -
 % "(%A) %l", which is
 % %A - area code with national prefix
 % %l - local number".
@@ -342,10 +342,12 @@ country_isbn  0
 % ISO 639 language abbreviations:
 % 639-1 2 letter, 639-2 3 letter terminology
 % http://www.loc.gov/standards/iso639-2/englagn.html
-% "en", "eng"
-lang_ab       "<U0065><U006E>"
-lang_term     "<U0065><U006E><U0067>"
-lang_lib      "<U0065><U006E><U0067>"
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 
 % ISO 3166 country number and 2 and 3 letter abreviations
 % http://www.unicode.org/onlinedat/countries.html
diff --git a/localedata/locales/en_ZM b/localedata/locales/en_ZM
index efdd718027..8277032528 100644
--- a/localedata/locales/en_ZM
+++ b/localedata/locales/en_ZM
@@ -87,6 +87,12 @@ country_ab3   "<U005A><U004D><U0042>"
 country_num   894
 % Z
 country_car  "<U005A>"
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
 
 LC_TELEPHONE
diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW
index 838a55da9a..24558ed884 100644
--- a/localedata/locales/en_ZW
+++ b/localedata/locales/en_ZW
@@ -115,5 +115,10 @@ country_ab3   "<U005A><U0057><U0045>"
 country_num   716
 % ZW
 country_car    "<U005A><U0057>"
-
+% en
+lang_ab      "<U0065><U006E>"
+% eng
+lang_term    "<U0065><U006E><U0067>"
+% eng
+lang_lib    "<U0065><U006E><U0067>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index e995c61f51..3eaabd3f95 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -158,5 +158,10 @@ country_ab3   "<U0041><U0052><U0047>"
 country_num   032
 % RA
 country_car    "<U0052><U0041>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index 1cc15af2b2..b3544d9e0a 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -156,5 +156,10 @@ country_ab3   "<U0042><U004F><U004C>"
 country_num   068
 % BOL
 country_car    "<U0042><U004F><U004C>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index a2ca006533..a40b361b29 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -154,5 +154,10 @@ country_ab3   "<U0043><U0048><U004C>"
 country_num   152
 % RCH
 country_car    "<U0052><U0043><U0048>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index 37599a7a1b..31a28e708a 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -157,5 +157,10 @@ country_ab3   "<U0043><U004F><U004C>"
 country_num   170
 % CO
 country_car    "<U0043><U004F>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index d7be7f8fa1..e42dce27c0 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -155,10 +155,14 @@ country_name  "<U0043><U006F><U0073><U0074><U0061><U0020><U0052><U0069><U0063><U
 country_post  "<U0043><U0052>"
 country_car   "<U0043><U0052>"
 country_isbn  "9930,9977,9968"
-lang_name     "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
-lang_ab       "<U0065><U0073>"
-lang_term     "<U0073><U0070><U0061>"
 country_ab2   "<U0043><U0052>"
 country_ab3   "<U0043><U0052><U0049>"
 country_num   188
+lang_name     "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_CU b/localedata/locales/es_CU
index f50c5879bc..86de054e7d 100644
--- a/localedata/locales/es_CU
+++ b/localedata/locales/es_CU
@@ -121,4 +121,10 @@ country_ab3   "<U0043><U0055><U0042>"
 country_num   192
 % C
 country_car    "<U0043>"
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index 95afeb9ea2..15da7d3d30 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -158,5 +158,10 @@ country_ab3   "<U0044><U004F><U004D>"
 country_num   214
 % DOM
 country_car    "<U0044><U004F><U004D>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index c9cb51e0f8..8292308393 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -156,5 +156,10 @@ country_ab3   "<U0045><U0043><U0055>"
 country_num   218
 % EC
 country_car    "<U0045><U0043>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index b8d4d8825a..a75c01f8f7 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -170,5 +170,10 @@ country_ab3   "<U0045><U0053><U0050>"
 country_num   724
 % E
 country_car    "<U0045>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index 6c3ae10caf..e17e70e7bd 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -155,5 +155,10 @@ country_ab3   "<U0047><U0054><U004D>"
 country_num   320
 % GCA
 country_car    "<U0047><U0043><U0041>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index febab6bbea..6e0def2e30 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -156,4 +156,10 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0048><U004E>"
 country_ab3   "<U0048><U004E><U0044>"
 country_num   340
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 0fa1dc3d2d..faf9626fbb 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -155,5 +155,10 @@ country_ab3   "<U004D><U0045><U0058>"
 country_num   484
 % MEX
 country_car    "<U004D><U0045><U0058>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
index 52845f8fce..7e109b32bf 100644
--- a/localedata/locales/es_NI
+++ b/localedata/locales/es_NI
@@ -149,5 +149,10 @@ country_ab3   "<U004E><U0049><U0043>"
 country_num   558
 % NIC
 country_car    "<U004E><U0049><U0043>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index c8c5d23754..702af0bc95 100644
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -155,5 +155,10 @@ country_ab3   "<U0050><U0041><U004E>"
 country_num   591
 % PA
 country_car    "<U0050><U0041>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index 75c59d1a68..e3ab3d6ed0 100644
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -156,5 +156,10 @@ country_ab3   "<U0050><U0045><U0052>"
 country_num   604
 % PE
 country_car    "<U0050><U0045>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index 93d7d21c25..3f1368456f 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -143,4 +143,10 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0050><U0052>"
 country_ab3   "<U0050><U0052><U0049>"
 country_num   630
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index 7bb5b35d01..11916c4a71 100644
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -155,5 +155,10 @@ country_ab3   "<U0050><U0052><U0059>"
 country_num   600
 % PY
 country_car    "<U0050><U0059>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index 44c31a8eed..8b30284d2d 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -156,5 +156,10 @@ country_ab3   "<U0053><U004C><U0056>"
 country_num   222
 % ES
 country_car    "<U0045><U0053>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index c90f88c04e..5c1b74028e 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -208,4 +208,10 @@ country_ab3   "<U0055><U0053><U0041>"
 country_num   840
 country_car   "<U0055><U0053><U0041>"
 country_isbn  0
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index 357b1dcc35..980ae94ffd 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -155,5 +155,10 @@ country_ab3   "<U0055><U0052><U0059>"
 country_num   858
 % UY
 country_car    "<U0055><U0059>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index f1fe9f5009..2784cb5fff 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -155,5 +155,10 @@ country_ab3   "<U0056><U0045><U004E>"
 country_num   862
 % YV
 country_car    "<U0059><U0056>"
-
+% es
+lang_ab      "<U0065><U0073>"
+% spa
+lang_term    "<U0073><U0070><U0061>"
+% spa
+lang_lib    "<U0073><U0070><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
index 4b8cbddc9b..7c5621024a 100644
--- a/localedata/locales/eu_ES
+++ b/localedata/locales/eu_ES
@@ -169,5 +169,10 @@ country_ab3 "<U0045><U0053><U0050>"
 country_num 724
 % E
 country_car    "<U0045>"
-
+% eu
+lang_ab      "<U0065><U0075>"
+% eus
+lang_term    "<U0065><U0075><U0073>"
+% eus
+lang_lib    "<U0065><U0075><U0073>"
 END LC_ADDRESS