localedata: fix LC_ADDRESS.country_car entries

These entries have been checked mostly against Wikipedia, but also using
the sources it cites (like the UN and other treaty sources).

Fix incorrect values:
  en_BW:  changing RB to BW
  kl_GL:  changing GRO to KN
  km_KH:  changing LAO to KH
  my_MM:  changing BA to MYA
  oc_FR:  changing F to F
  tr_CY:  changing TR to CY
  wae_CH: changing DH to CH

Add missing entries:
  aa_DJ:  changing to DJI
  ak_GH:  changing to GH
  ar_OM:  changing to OM
  ar_SS:  changing to SUD
  ar_YE:  changing to YAR
  bo_CN:  changing to CHN
  cmn_TW: changing to RC
  dv_MV:  changing to MV
  dz_BT:  changing to BHT
  en_AG:  changing to AG
  es_HN:  changing to HN
  es_PR:  changing to PR
  hak_TW: changing to RC
  lzh_TW: changing to RC
  nan_TW: changing to RC
  nan_TW@latin: changing to RC
  nl_AW:  changing to AUA
  pap_AW: changing to AUA
  so_DJ:  changing to DJI
  the_NP: changing to NEP
  ug_CN:  changing to CHN
  yue_HK: changing to HK
  zh_CN:  changing to CHN
  zh_HK:  changing to HK
  zh_TW:  changing to RC

33 files changed, 67 insertions, 19 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 04e85ce085..f1c7e8f39a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,40 @@
 2016-04-15  Mike Frysinger  <vapier@gentoo.org>
 
+	* locales/aa_DJ (country_car): Define.
+	* locales/ak_GH: Likewise.
+	* locales/ar_OM: Likewise.
+	* locales/ar_SS: Likewise.
+	* locales/ar_YE: Likewise.
+	* locales/bo_CN: Likewise.
+	* locales/cmn_TW: Likewise.
+	* locales/dv_MV: Likewise.
+	* locales/dz_BT: Likewise.
+	* locales/en_AG: Likewise.
+	* locales/en_BW (country_car): Change to BW.
+	* locales/es_HN (country_car): Define.
+	* locales/es_PR: Likewise.
+	* locales/hak_TW: Likewise.
+	* locales/kl_GL (country_car): Change to KN.
+	* locales/km_KH (country_car): Change to KH.
+	* locales/lzh_TW (country_car): Define.
+	* locales/my_MM (country_car): Change to MYA.
+	* locales/nan_TW (country_car): Define.
+	* locales/nan_TW@latin: Likewise.
+	* locales/nl_AW: Likewise.
+	* locales/oc_FR (country_car): Change encoding.
+	* locales/pap_AW (country_car): Define.
+	* locales/so_DJ: Likewise.
+	* locales/the_NP: Likewise.
+	* locales/tr_CY (country_car): Change to CY.
+	* locales/ug_CN (country_car): Define.
+	* locales/wae_CH (country_car): Change to CH.
+	* locales/yue_HK (country_car): Define.
+	* locales/zh_CN: Likewise.
+	* locales/zh_HK: Likewise.
+	* locales/zh_TW: Likewise.
+
+2016-04-15  Mike Frysinger  <vapier@gentoo.org>
+
 	* locales/as_IN (country_num): Define.
 	* locales/ber_DZ (country_num): Add leading 0 prefix.
 	* locales/ca_AD (country_num): Likewise.
diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index c50834a6c4..84e3470e18 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -153,7 +153,7 @@ country_post  "<U0044><U004A><U0049>"
 country_ab2   "<U0044><U004A>"
 country_ab3   "<U0044><U004A><U0049>"
 country_num   262
-% country_car   unknown
+country_car "<U0044><U004A><U0049>"
 % country_isbn  unknown, Need ISO 2108
 lang_name     "<U0051><U0061><U0066><U0061><U0072>"
 % aa
diff --git a/localedata/locales/ak_GH b/localedata/locales/ak_GH
index a5ede75031..c41788894f 100644
--- a/localedata/locales/ak_GH
+++ b/localedata/locales/ak_GH
@@ -191,6 +191,7 @@ country_ab2  "<U0047><U0048>"
 % GHA
 country_ab3  "<U0047><U0048><U0041>"
 country_num  288
+country_car "<U0047><U0048>"
 country_isbn 9964
 % Akan
 lang_name    "<U0041><U006B><U0061><U006E>"
diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM
index 94d15f15a6..96c573acc8 100644
--- a/localedata/locales/ar_OM
+++ b/localedata/locales/ar_OM
@@ -184,6 +184,7 @@ postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 country_ab2 "<U004F><U004D>"
 country_ab3 "<U004F><U004D><U004E>"
 country_num 512
+country_car "<U004F><U004D>"
 lang_name    "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 % ar
 lang_ab      "<U0061><U0072>"
diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS
index 8ce14be3e3..bab3e3bfa4 100644
--- a/localedata/locales/ar_SS
+++ b/localedata/locales/ar_SS
@@ -192,6 +192,7 @@ country_ab2 "<U0053><U0053>"
 % SSD
 country_ab3 "<U0053><U0053><U0044>"
 country_num 728
+country_car "<U0053><U0055><U0044>"
 lang_name    "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 % ar
 lang_ab      "<U0061><U0072>"
diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE
index 5b60356b78..0298e9ac6d 100644
--- a/localedata/locales/ar_YE
+++ b/localedata/locales/ar_YE
@@ -184,6 +184,7 @@ postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 country_ab2 "<U0059><U0045>"
 country_ab3 "<U0059><U0045><U004D>"
 country_num 887
+country_car "<U0059><U0041><U0052>"
 lang_name    "<U0627><U0644><U0639><U0631><U0628><U064A><U0629>"
 % ar
 lang_ab      "<U0061><U0072>"
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
index 56b6cfc6f7..d7e2c0734a 100644
--- a/localedata/locales/bo_CN
+++ b/localedata/locales/bo_CN
@@ -169,7 +169,7 @@ country_name "<U0F40><U0FB2><U0F74><U0F44><U0F0B><U0F67><U0FAD><U0F0B><U0F58><U0
 country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
-%country_car	"FIXME"
+country_car "<U0043><U0048><U004E>"
 country_isbn	"<U0037>"
 lang_name     "<U0F54><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
 % bo
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index 648791fc94..ae74e99a64 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -199,6 +199,7 @@ country_ab2  "<U0054><U0057>"
 % TWN
 country_ab3  "<U0054><U0057><U004E>"
 country_num  158
+country_car "<U0052><U0043>"
 country_isbn 957
 % 漢語官話
 lang_name    "<U6F22><U8A9E><U5B98><U8A71>"
diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV
index 22f68b1bf6..40ce6849ce 100644
--- a/localedata/locales/dv_MV
+++ b/localedata/locales/dv_MV
@@ -182,6 +182,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_num 462
+country_car "<U004D><U0056>"
 % lang_name FIXME
 % Cannot represent Dhivehi in Thaana script
 % http://en.wikipedia.org/wiki/Maldivian_language
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index 755ae74ceb..678b4bd440 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -664,6 +664,7 @@ country_name "<U0F60><U0F56><U0FB2><U0F74><U0F42><U0F0D>"
 country_ab2 "<U0042><U0054>"
 country_ab3 "<U0042><U0054><U004E>"
 country_num 064
+country_car "<U0042><U0048><U0054>"
 %FIXME
 %country_isbn  ""
 % རྫོང་ཁ
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index 3135c43c0a..af7e0ab90b 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -93,6 +93,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0041><U0047>"
 country_ab3   "<U0041><U0054><U0047>"
 country_num 028
+country_car "<U0041><U0047>"
 % English
 lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
 % en
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
index bc482e0594..c67e1eccb5 100644
--- a/localedata/locales/en_BW
+++ b/localedata/locales/en_BW
@@ -114,8 +114,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2 "<U0042><U0057>"
 country_ab3 "<U0042><U0057><U0041>"
 country_num 072
-% RB
-country_car    "<U0052><U0042>"
+country_car "<U0042><U0057>"
 % English
 lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
 % en
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 487d515898..98ee473200 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -153,6 +153,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0048><U004E>"
 country_ab3   "<U0048><U004E><U0044>"
 country_num   340
+country_car "<U0048><U004E>"
 % es
 lang_ab      "<U0065><U0073>"
 % Español
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index 8fd51cfdc2..b0b600c400 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -144,6 +144,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0050><U0052>"
 country_ab3   "<U0050><U0052><U0049>"
 country_num   630
+country_car "<U0050><U0052>"
 % Español
 lang_name     "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
 % es
diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
index 67fb12dfe7..0de8550dbb 100644
--- a/localedata/locales/hak_TW
+++ b/localedata/locales/hak_TW
@@ -198,6 +198,7 @@ country_ab2  "<U0054><U0057>"
 % TWN
 country_ab3  "<U0054><U0057><U004E>"
 country_num  158
+country_car "<U0052><U0043>"
 country_isbn 957
 % 漢語客家語
 lang_name    "<U6F22><U8A9E><U5BA2><U5BB6><U8A9E>"
diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
index 032d87354c..64321de4d2 100644
--- a/localedata/locales/kl_GL
+++ b/localedata/locales/kl_GL
@@ -140,8 +140,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2 "<U0047><U004C>"
 country_ab3 "<U0047><U0052><U004C>"
 country_num 304
-% GRO
-country_car  "<U0047><U0052><U004F>"
+country_car "<U004B><U004E>"
 % Kalaallisut
 lang_name    "<U004B><U0061><U006C><U0061><U0061><U006C><U006C><U0069><U0073><U0075><U0074>"
 % kl
diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index 0baf31fe20..d21efc0859 100644
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -1872,7 +1872,7 @@ country_name "<U1780><U1798><U17D2><U1796><U17BB><U1787><U17B6>"
 country_ab2 "<U004B><U0048>"
 country_ab3 "<U004B><U0048><U004D>"
 country_num 116
-country_car   "<U004C><U0041><U004F>"
+country_car "<U004B><U0048>"
 %FIXME
 %country_isbn  ""
 % ភាសាខ្មែរ (Khmer)
diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
index eac6b88c40..4293b44c38 100644
--- a/localedata/locales/lzh_TW
+++ b/localedata/locales/lzh_TW
@@ -233,6 +233,7 @@ country_ab2  "<U0054><U0057>"
 % TWN
 country_ab3  "<U0054><U0057><U004E>"
 country_num  158
+country_car "<U0052><U0043>"
 country_isbn 957
 % 漢語文言
 lang_name    "<U6F22><U8A9E><U6587><U8A00>"
diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
index 331d50f7f6..d889668a08 100644
--- a/localedata/locales/my_MM
+++ b/localedata/locales/my_MM
@@ -315,8 +315,7 @@ country_name   "<U1019><U103C><U1014><U103A><U1019><U102C>"
 country_post    "<U004D><U0079><U0061><U006E><U006D><U0061><U0072>"
 country_ab2     "<U004D><U004D>"
 country_num 104
-% BA
-country_car  "<U0042><U0041>"
+country_car "<U004D><U0059><U0041>"
 lang_ab         "<U006D><U0079>"
 lang_name       "<U1017><U1019><U102C>"
 % mya
diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
index b5f2f247c6..a8d2ef9a5f 100644
--- a/localedata/locales/nan_TW
+++ b/localedata/locales/nan_TW
@@ -199,6 +199,7 @@ country_ab2  "<U0054><U0057>"
 % TWN
 country_ab3  "<U0054><U0057><U004E>"
 country_num  158
+country_car "<U0052><U0043>"
 country_isbn 957
 % 漢語閩南語
 lang_name    "<U6F22><U8A9E><U95A9><U5357><U8A9E>"
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index 3c0b93874f..83e7723496 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -195,7 +195,7 @@ country_name	"<U0054><U00E2><U0069><U002D><U006F><U00E2><U006E>"
 country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158
-%country_car    "FIXME"
+country_car "<U0052><U0043>"
 country_isbn	"<U0039><U0035><U0037>"
 %lang_name "Bân-lâm-gú, Hō-ló-oē"
 lang_name "<U0042><U00E2><U006E><U002D><U006C><U00E2><U006D><U002D><U0067><U00FA><U002C><U0020><U0048><U014D><U002D><U006C><U00F3><U002D><U006F><U0113>"
diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
index 4358846fcc..09524228c4 100644
--- a/localedata/locales/nl_AW
+++ b/localedata/locales/nl_AW
@@ -93,6 +93,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U0041><U0057>"
 country_ab3   "<U0041><U0042><U0057>"
 country_num   533
+country_car "<U0041><U0055><U0041>"
 % Nederlands
 lang_name    "<U004E><U0065><U0064><U0065><U0072><U006C><U0061><U006E><U0064><U0073>"
 lang_ab "<U006E><U006C>"
diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR
index a61b68f593..f7e2aa8e77 100644
--- a/localedata/locales/oc_FR
+++ b/localedata/locales/oc_FR
@@ -52,7 +52,7 @@ country_ab2 "FR"
 country_ab3 "FRA"
 country_num 250
 country_isbn "2"
-country_car "F"
+country_car "<U0046>"
 % Occitan
 lang_name    "<U004F><U0063><U0063><U0069><U0074><U0061><U006E>"
 % oc
diff --git a/localedata/locales/pap_AW b/localedata/locales/pap_AW
index d68ee37cb4..81db2e9a47 100644
--- a/localedata/locales/pap_AW
+++ b/localedata/locales/pap_AW
@@ -58,7 +58,7 @@ country_ab2  "<U0041><U0057>"
 country_ab3  "<U0041><U0042><U0057>"
 country_num  533
 country_isbn ""
-country_car ""
+country_car "<U0041><U0055><U0041>"
 % Papiamento
 lang_name    "<U0050><U0061><U0070><U0069><U0061><U006D><U0065><U006E><U0074><U006F>"
 % lang_ab
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index daf3706271..50b3cbf67d 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -126,7 +126,7 @@ country_post  "<U0044><U004A><U0049>"
 country_ab2   "<U0044><U004A>"
 country_ab3   "<U0044><U004A><U0049>"
 country_num   262
-% country_car   unknown
+country_car "<U0044><U004A><U0049>"
 % country_isbn  unknown, Need ISO 2108
 lang_name     "<U0053><U006F><U006F><U006D><U0061><U0061><U006C><U0069>"
 lang_ab       "<U0073><U006F>"
diff --git a/localedata/locales/the_NP b/localedata/locales/the_NP
index 99158b7223..db6ebc415a 100644
--- a/localedata/locales/the_NP
+++ b/localedata/locales/the_NP
@@ -201,6 +201,7 @@ lang_lib     "<U0074><U0068><U0065>"
 country_ab2 "<U004E><U0050>"
 country_ab3 "<U004E><U0050><U004C>"
 country_num 524
+country_car "<U004E><U0045><U0050>"
 END LC_ADDRESS
 
 
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
index 7f18841302..2cf2fa5d7d 100644
--- a/localedata/locales/tr_CY
+++ b/localedata/locales/tr_CY
@@ -100,8 +100,7 @@ country_name	"<U004E><U006F><U0072><U0074><U0068><U0065><U0072><U006E>/
 <U0020><U0043><U0079><U0070><U0072><U0075><U0073>"
 % TR
 country_post	"<U0054><U0052>"
-% TR
-country_car	"<U0054><U0052>"
+country_car "<U0043><U0059>"
 country_isbn	975
 country_num 196
 country_ab2 "<U0043><U0059>"
diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index 0d9f1ecaba..efb1b10dad 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -324,7 +324,7 @@ country_name	"<U4E2D><U534E><U4EBA><U6C11><U5171><U548C><U56FD>"
 country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
-%country_car	"FIXME"
+country_car "<U0043><U0048><U004E>"
 country_isbn	"<U0037>"
 % ug
 lang_ab      "<U0075><U0067>"
diff --git a/localedata/locales/wae_CH b/localedata/locales/wae_CH
index 5c32ac08c2..c279b069a8 100644
--- a/localedata/locales/wae_CH
+++ b/localedata/locales/wae_CH
@@ -221,7 +221,7 @@ lang_name "<U0057><U0061><U006C><U0073><U0065><U0072>"
 
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
 % "CH"
-country_car   "<U0044><U0048>"
+country_car "<U0043><U0048>"
 
 % ISO 639 two and three letter language names
 % see http://www.loc.gov/standards/iso639-2/englangn.html
diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK
index d91629ea3c..5f8a3031f6 100644
--- a/localedata/locales/yue_HK
+++ b/localedata/locales/yue_HK
@@ -157,6 +157,7 @@ country_name "<U9999><U6E2F>"
 country_ab2 "<U0048><U004B>"
 country_ab3 "<U0048><U004B><U0047>"
 country_num 344
+country_car "<U0048><U004B>"
 country_isbn "<U0039><U0036><U0032>"
 lang_name "<U7CB5><U8A9E>"
 % yue
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index fbbf4528d3..b2087a6e9c 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -184,7 +184,7 @@ country_name	"<U4E2D><U534E><U4EBA><U6C11><U5171><U548C><U56FD>"
 country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
-%country_car	"FIXME"
+country_car "<U0043><U0048><U004E>"
 country_isbn	"<U0037>"
 lang_name	"<U4E2D><U6587>"
 lang_ab		"<U007A><U0068>"
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index 99b8674b5b..06e9116830 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -183,6 +183,7 @@ postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 country_ab2 "<U0048><U004B>"
 country_ab3 "<U0048><U004B><U0047>"
 country_num 344
+country_car "<U0048><U004B>"
 lang_ab		"<U007A><U0068>"
 lang_term	"<U007A><U0068><U006F>"
 lang_lib	"<U0063><U0068><U0069>"
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index 011d863045..f5edc302eb 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -193,7 +193,7 @@ country_name	"<U4E2D><U83EF><U6C11><U570B>"
 country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158
-%country_car    "FIXME"
+country_car "<U0052><U0043>"
 country_isbn	"<U0039><U0035><U0037>"
 
 % Reference:	http://lcweb.loc.gov/standards/iso639-2/langhome.html