Adjust language-code fields of LC_ADDRESS.

23 files changed, 129 insertions, 22 deletions

diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index 184b8c474a..369caf24cc 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -159,8 +159,11 @@ country_num   262
 % country_car   unknown
 % country_isbn  unknown, Need ISO 2108
 lang_name     "<U0051><U0061><U0066><U0061><U0072>"
+% aa
 lang_ab       "<U0061><U0061>"
+% aar
 lang_term     "<U0061><U0061><U0072>"
+% aar
 lang_lib      "<U0061><U0061><U0072>"
 %
 END LC_ADDRESS
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index 59f01542c4..5f8a60e915 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -113,8 +113,11 @@ country_num   232
 country_car  "<U0045><U0052>"
 % country_isbn  unknown, Need ISO 2108
 lang_name     "<U0051><U0061><U0066><U0061><U0072>"
+% aa
 lang_ab       "<U0061><U0061>"
+% aar
 lang_term     "<U0061><U0061><U0072>"
+% aar
 lang_lib      "<U0061><U0061><U0072>"
 %
 END LC_ADDRESS
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index 8bf7c375ea..bc64388b97 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -113,8 +113,11 @@ country_num   231   % 210 found in at least one ISO 3166 doc
 country_car   "<U0045><U0054><U0048>"
 % country_isbn  unknown, Need ISO 2108
 lang_name     "<U0051><U0061><U0066><U0061><U0072>"
+% aa
 lang_ab       "<U0061><U0061>"
+% aar
 lang_term     "<U0061><U0061><U0072>"
+% aar
 lang_lib      "<U0061><U0061><U0072>"
 %
 END LC_ADDRESS
diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA
index ec588605eb..e7df1c3c14 100644
--- a/localedata/locales/af_ZA
+++ b/localedata/locales/af_ZA
@@ -279,10 +279,12 @@ country_isbn  0
 % ISO 639 language abbreviations:
 % 639-1 2 letter, 639-2 3 letter terminology
 % http://www.loc.gov/standards/iso639-2/englangn.html
-% "af", "afr", "afr"
-lang_ab       "<U0061><U0066>"
-lang_term     "<U0061><U0066><U0072>"
-lang_lib      "<U0061><U0066><U0072>"
+% af
+lang_ab      "<U0061><U0066>"
+% afr
+lang_term    "<U0061><U0066><U0072>"
+% afr
+lang_lib     "<U0061><U0066><U0072>"
 
 % ISO 3166 country number and 2 and 3 letter abbreviations
 % http://www.unicode.org/onlinedat/countries.html
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index 7179622427..ed66cf6e1f 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -1448,9 +1448,12 @@ country_num   231   % 210 found in at least one ISO 3166 doc
 country_car   "<U0045><U0054><U0048>"
 % country_isbn  unknown, Need ISO 2108
 lang_name     "<U12A0><U121B><U122D><U129B>"
-lang_ab       "<U0061><U006D>"
-lang_term     "<U0061><U006D><U0068>"
-lang_lib      "<U0061><U006D><U0068>"
+% am
+lang_ab      "<U0061><U006D>"
+% amh
+lang_term    "<U0061><U006D><U0068>"
+% amh
+lang_lib     "<U0061><U006D><U0068>"
 %
 END LC_ADDRESS
 
diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE
index 368f8803f8..c7f249bb4a 100644
--- a/localedata/locales/ar_AE
+++ b/localedata/locales/ar_AE
@@ -183,6 +183,12 @@ country_ab3 "<U0041><U0052><U0045>"
 country_num 784
 % UAE
 country_car    "<U0055><U0041><U0045>"
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH
index 41e92655b6..39e5e0d94f 100644
--- a/localedata/locales/ar_BH
+++ b/localedata/locales/ar_BH
@@ -187,6 +187,12 @@ country_ab3 "<U0042><U0048><U0052>"
 country_num 048
 % BRN
 country_car    "<U0042><U0052><U004E>"
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ
index 311dd21f68..cda64af0c7 100644
--- a/localedata/locales/ar_DZ
+++ b/localedata/locales/ar_DZ
@@ -186,6 +186,12 @@ country_ab3 "<U0044><U005A><U0041>"
 country_num 012
 % DZ
 country_car    "<U0044><U005A>"
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG
index 844254d5fb..3916ed7bac 100644
--- a/localedata/locales/ar_EG
+++ b/localedata/locales/ar_EG
@@ -194,7 +194,12 @@ country_ab3 "<U0045><U0047><U0059>"
 country_num 818
 % ET
 country_car    "<U0045><U0054>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN
index 1c4cdfb3e1..819925f070 100644
--- a/localedata/locales/ar_IN
+++ b/localedata/locales/ar_IN
@@ -164,7 +164,12 @@ country_ab3 "<U0049><U004E><U0044>"
 country_num 356
 % IND
 country_car    "<U0049><U004E><U0044>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ
index 8eea49b067..a398234d07 100644
--- a/localedata/locales/ar_IQ
+++ b/localedata/locales/ar_IQ
@@ -186,7 +186,12 @@ country_ab3 "<U0049><U0052><U0051>"
 country_num 368
 % IRQ
 country_car    "<U0049><U0052><U0051>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO
index 7d094efed5..8f65c74d4e 100644
--- a/localedata/locales/ar_JO
+++ b/localedata/locales/ar_JO
@@ -204,7 +204,12 @@ country_ab3 "<U004A><U004F><U0052>"
 country_num 400
 % HKJ
 country_car    "<U0048><U004B><U004A>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW
index 05a4c7daa6..8bd66ada00 100644
--- a/localedata/locales/ar_KW
+++ b/localedata/locales/ar_KW
@@ -186,7 +186,12 @@ country_ab3 "<U004B><U0057><U0054>"
 country_num 414
 % KWT
 country_car    "<U004B><U0057><U0054>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB
index 9144b72618..c946022ef2 100644
--- a/localedata/locales/ar_LB
+++ b/localedata/locales/ar_LB
@@ -203,7 +203,12 @@ country_ab3 "<U004C><U0042><U004E>"
 country_num 422
 % RL
 country_car    "<U0052><U004C>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY
index 7199179483..d95255d6ab 100644
--- a/localedata/locales/ar_LY
+++ b/localedata/locales/ar_LY
@@ -186,7 +186,12 @@ country_ab3 "<U004C><U0042><U0059>"
 country_num 434
 % LAR
 country_car    "<U004C><U0041><U0052>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA
index f389eba55b..d13dd61109 100644
--- a/localedata/locales/ar_MA
+++ b/localedata/locales/ar_MA
@@ -186,7 +186,12 @@ country_ab3 "<U004D><U0041><U0052>"
 country_num 504
 % MA
 country_car    "<U004D><U0041>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM
index b43475ef64..ea546bdd2f 100644
--- a/localedata/locales/ar_OM
+++ b/localedata/locales/ar_OM
@@ -184,7 +184,12 @@ postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 country_ab2 "<U004F><U004D>"
 country_ab3 "<U004F><U004D><U004E>"
 country_num 512
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA
index e01dbcc233..4764f696e2 100644
--- a/localedata/locales/ar_QA
+++ b/localedata/locales/ar_QA
@@ -186,7 +186,12 @@ country_ab3 "<U0051><U0041><U0054>"
 country_num 634
 % Q
 country_car    "<U0051>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
index 8660758c9f..538449e53e 100644
--- a/localedata/locales/ar_SA
+++ b/localedata/locales/ar_SA
@@ -388,5 +388,10 @@ country_ab3 "<U0053><U0041><U0055>"
 country_num 682
 % KSA
 country_car    "<U004B><U0053><U0041>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD
index f68033d101..c588518b8c 100644
--- a/localedata/locales/ar_SD
+++ b/localedata/locales/ar_SD
@@ -187,7 +187,12 @@ country_ab3 "<U0053><U0044><U004E>"
 country_num 736
 % SUD
 country_car    "<U0053><U0055><U0044>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY
index 9530f18427..9290de5954 100644
--- a/localedata/locales/ar_SY
+++ b/localedata/locales/ar_SY
@@ -203,7 +203,12 @@ country_ab3 "<U0053><U0059><U0052>"
 country_num 760
 % SYR
 country_car    "<U0053><U0059><U0052>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN
index 7103272f92..9714e4e337 100644
--- a/localedata/locales/ar_TN
+++ b/localedata/locales/ar_TN
@@ -186,7 +186,12 @@ country_ab3 "<U0054><U0055><U004E>"
 country_num 788
 % TN
 country_car    "<U0054><U004E>"
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE
index 91da9e92b9..0413752eb2 100644
--- a/localedata/locales/ar_YE
+++ b/localedata/locales/ar_YE
@@ -184,7 +184,12 @@ postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 country_ab2 "<U0059><U0045>"
 country_ab3 "<U0059><U0045><U004D>"
 country_num 887
-
+% ar
+lang_ab      "<U0061><U0072>"
+% ara
+lang_term    "<U0061><U0072><U0061>"
+% ara
+lang_lib    "<U0061><U0072><U0061>"
 END LC_ADDRESS