localedata: CLDRv29: update LC_IDENTIFICATION language/territory fields

This updates all the territory fields based on CLDR v29 data.  Many of
them were obviously incorrect where people used a two letter code and
not the English name.
  aa_DJ: changing DJ to Djibouti
  aa_ER@saaho: changing ER to Eritrea
  aa_ER: changing ER to Eritrea
  aa_ET: changing ET to Ethiopia
  am_ET: changing ET to Ethiopia
  ar_LY: changing Libyan Arab Jamahiriya to Libya
  ar_SY: changing Syrian Arab Republic to Syria
  bo_CN: changing P.R. of China to China
  bs_BA: changing Bosnia and Herzegowina to Bosnia & Herzegovina
  byn_ER: changing ER to Eritrea
  ca_IT: changing Italy (L'Alguer) to Italy
  ce_RU: changing RUSSIAN FEDERATION to Russia
  cmn_TW: changing Republic of China to Taiwan
  cy_GB: changing Great Britain to United Kingdom
  de_LU@euro: changing Luxemburg to Luxembourg
  de_LU: changing Luxemburg to Luxembourg
  en_AG: changing Antigua and Barbuda to Antigua & Barbuda
  en_GB: changing Great Britain to United Kingdom
  en_HK: changing Hong Kong to Hong Kong SAR China
  en_US: changing USA to United States
  es_US: changing USA to United States
  fr_LU@euro: changing Luxemburg to Luxembourg
  fr_LU: changing Luxemburg to Luxembourg
  fy_DE: changing DE to Germany
  gd_GB: changing Great Britain to United Kingdom
  gez_ER@abegede: changing ER to Eritrea
  gez_ER: changing ER to Eritrea
  gez_ET@abegede: changing ET to Ethiopia
  gez_ET: changing ET to Ethiopia
  gv_GB: changing Britain to United Kingdom
  hak_TW: changing Republic of China to Taiwan
  iu_CA: changing CA to Canada
  ko_KR: changing Republic of Korea to South Korea
  kw_GB: changing Britain to United Kingdom
  li_BE: changing BE to Belgium
  li_NL: changing NL to Netherlands
  lzh_TW: changing Republic of China to Taiwan
  my_MM: changing Myanmar to Myanmar (Burma)
  nan_TW: changing Republic of China to Taiwan
  nds_DE: changing DE to Germany
  nds_NL: changing NL to Netherlands
  om_ET: changing ET to Ethiopia
  om_KE: changing KE to Kenya
  pap_AW: changing AW to Aruba
  pap_CW: changing CW to Curaçao
  pt_BR: changing Brasil to Brazil
  sid_ET: changing ET to Ethiopia
  sk_SK: changing Slovak to Slovakia
  so_DJ: changing DJ to Djibouti
  so_ET: changing ET to Ethiopia
  so_KE: changing KE to Kenya
  so_SO: changing SO to Somalia
  ti_ER: changing ER to Eritrea
  ti_ET: changing ET to Ethiopia
  tig_ER: changing ER to Eritrea
  tt_RU@iqtelif: changing Tatarstan, Russian Federation to Russia
  uk_UA: changing UA to Ukraine
  unm_US: changing USA to United States
  wal_ET: changing ET to Ethiopia
  yi_US: changing USA to United States
  yue_HK: changing Hong Kong to Hong Kong SAR China
  zh_CN: changing P.R. of China to China
  zh_HK: changing Hong Kong to Hong Kong SAR China
  zh_TW: changing Taiwan R.O.C. to Taiwan

This updates all the language fields based on CLDR v29 data.  Many of
them were obviously incorrect where people used a two letter code and
not the English name.
  aa_DJ: changing aa to Afar
  aa_ER: changing aa to Afar
  aa_ER@saaho: changing aa to Afar
  aa_ET: changing aa to Afar
  am_ET: changing am to Amharic
  az_AZ: changing Azeri to Azerbaijani
  bn_BD: changing Bengali/Bangla to Bengali
  byn_ER: changing byn to Blin
  de_AT: changing German to Austrian German
  de_CH: changing German to Swiss High German
  en_AU: changing English to Australian English
  en_CA: changing English to Canadian English
  en_GB: changing English to British English
  en_US: changing English to American English
  es_ES: changing Spanish to European Spanish
  es_MX: changing Spanish to Mexican Spanish
  ff_SN: changing ff to Fulah
  fr_CA: changing French to Canadian French
  fr_CH: changing French to Swiss French
  fur_IT: changing Furlan to Friulian
  fy_DE: changing fy to Western Frisian
  fy_NL: changing Frisian to Western Frisian
  gd_GB: changing Scots Gaelic to Scottish Gaelic
  gez_ER@abegede: changing gez to Geez
  gez_ER: changing gez to Geez
  gez_ET@abegede: changing gez to Geez
  gez_ET: changing gez to Geez
  gv_GB: changing Manx Gaelic to Manx
  ht_HT: changing Kreyol to Haitian Creole
  kl_GL: changing Greenlandic to Kalaallisut
  lg_UG: changing Luganda to Ganda
  li_BE: changing li to Limburgish
  li_NL: changing li to Limburgish
  nan_TW@latin: changing Minnan to Min Nan Chinese
  nb_NO: changing Norwegian, Bokmål to Norwegian Bokmål
  nds_DE: changing nds to Low German
  nds_NL: changing nds to Low Saxon
  niu_NU: changing Vagahau Niue (Niuean) to Niuean
  niu_NZ: changing Vagahau Niue (Niuean) to Niuean
  nl_BE: changing Dutch to Flemish
  nn_NO: changing Norwegian, Nynorsk to Norwegian Nynorsk
  nr_ZA: changing Southern Ndebele to South Ndebele
  om_ET: changing om to Oromo
  om_KE: changing om to Oromo
  or_IN: changing Odia to Oriya
  os_RU: changing Ossetian to Ossetic
  pap_AW: changing pap to Papiamento
  pap_CW: changing pap to Papiamento
  pa_PK: changing Punjabi (Shahmukhi) to Punjabi
  pt_BR: changing Portuguese to Brazilian Portuguese
  pt_PT: changing Portuguese to European Portuguese
  se_NO: changing Northern Saami to Northern Sami
  sid_ET: changing sid to Sidamo
  so_DJ: changing so to Somali
  so_ET: changing so to Somali
  so_KE: changing so to Somali
  so_SO: changing so to Somali
  st_ZA: changing Sotho to Southern Sotho
  sw_KE: changing sw to Swahili
  sw_TZ: changing sw to Swahili
  ti_ER: changing ti to Tigrinya
  ti_ET: changing ti to Tigrinya
  tig_ER: changing tig to Tigre
  uk_UA: changing uk to Ukrainian
  wal_ET: changing wal to Wolaytta
  yue_HK: changing Yue Chinese to Cantonese

96 files changed, 230 insertions, 132 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8fd81fa8ed..1ad39dece7 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,103 @@
 2016-04-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* locales/aa_DJ (language, territory): Update.
+	* locales/aa_ER: Likewise.
+	* locales/aa_ER@saaho: Likewise.
+	* locales/aa_ET: Likewise.
+	* locales/am_ET: Likewise.
+	* locales/ar_LY: Likewise.
+	* locales/ar_SY: Likewise.
+	* locales/az_AZ: Likewise.
+	* locales/bn_BD: Likewise.
+	* locales/bo_CN: Likewise.
+	* locales/bs_BA: Likewise.
+	* locales/byn_ER: Likewise.
+	* locales/ca_IT: Likewise.
+	* locales/ce_RU: Likewise.
+	* locales/cmn_TW: Likewise.
+	* locales/cy_GB: Likewise.
+	* locales/de_AT: Likewise.
+	* locales/de_CH: Likewise.
+	* locales/de_LU: Likewise.
+	* locales/de_LU@euro: Likewise.
+	* locales/en_AG: Likewise.
+	* locales/en_AU: Likewise.
+	* locales/en_CA: Likewise.
+	* locales/en_GB: Likewise.
+	* locales/en_HK: Likewise.
+	* locales/en_US: Likewise.
+	* locales/es_ES: Likewise.
+	* locales/es_MX: Likewise.
+	* locales/es_US: Likewise.
+	* locales/ff_SN: Likewise.
+	* locales/fr_CA: Likewise.
+	* locales/fr_CH: Likewise.
+	* locales/fr_LU: Likewise.
+	* locales/fr_LU@euro: Likewise.
+	* locales/fur_IT: Likewise.
+	* locales/fy_DE: Likewise.
+	* locales/fy_NL: Likewise.
+	* locales/gd_GB: Likewise.
+	* locales/gez_ER: Likewise.
+	* locales/gez_ER@abegede: Likewise.
+	* locales/gez_ET: Likewise.
+	* locales/gez_ET@abegede: Likewise.
+	* locales/gv_GB: Likewise.
+	* locales/hak_TW: Likewise.
+	* locales/ht_HT: Likewise.
+	* locales/iu_CA: Likewise.
+	* locales/kl_GL: Likewise.
+	* locales/ko_KR: Likewise.
+	* locales/kw_GB: Likewise.
+	* locales/lg_UG: Likewise.
+	* locales/li_BE: Likewise.
+	* locales/li_NL: Likewise.
+	* locales/lzh_TW: Likewise.
+	* locales/my_MM: Likewise.
+	* locales/nan_TW: Likewise.
+	* locales/nan_TW@latin: Likewise.
+	* locales/nb_NO: Likewise.
+	* locales/nds_DE: Likewise.
+	* locales/nds_NL: Likewise.
+	* locales/niu_NU: Likewise.
+	* locales/niu_NZ: Likewise.
+	* locales/nl_BE: Likewise.
+	* locales/nn_NO: Likewise.
+	* locales/nr_ZA: Likewise.
+	* locales/om_ET: Likewise.
+	* locales/om_KE: Likewise.
+	* locales/or_IN: Likewise.
+	* locales/os_RU: Likewise.
+	* locales/pa_PK: Likewise.
+	* locales/pap_AW: Likewise.
+	* locales/pap_CW: Likewise.
+	* locales/pt_BR: Likewise.
+	* locales/pt_PT: Likewise.
+	* locales/se_NO: Likewise.
+	* locales/sid_ET: Likewise.
+	* locales/sk_SK: Likewise.
+	* locales/so_DJ: Likewise.
+	* locales/so_ET: Likewise.
+	* locales/so_KE: Likewise.
+	* locales/so_SO: Likewise.
+	* locales/st_ZA: Likewise.
+	* locales/sw_KE: Likewise.
+	* locales/sw_TZ: Likewise.
+	* locales/ti_ER: Likewise.
+	* locales/ti_ET: Likewise.
+	* locales/tig_ER: Likewise.
+	* locales/tt_RU@iqtelif: Likewise.
+	* locales/uk_UA: Likewise.
+	* locales/unm_US: Likewise.
+	* locales/wal_ET: Likewise.
+	* locales/yi_US: Likewise.
+	* locales/yue_HK: Likewise.
+	* locales/zh_CN: Likewise.
+	* locales/zh_HK: Likewise.
+	* locales/zh_TW: Likewise.
+
+2016-04-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* locales/af_ZA (date_fmt): Delete.
 	* locales/an_ES: Likewise.
 	* locales/anp_IN: Likewise.
@@ -664,7 +762,7 @@
 	* locales/ko_KR: Likewise.
 	* locales/kok_IN: Likewise.
 	* locales/ks_IN: Likewise.
-	* locales/ks_IN@devanagari | 5 +++--
+	* locales/ks_IN@devanagari: Likewise.
 	* locales/ku_TR: Likewise.
 	* locales/kw_GB: Likewise.
 	* locales/ky_KG: Likewise.
@@ -730,7 +828,7 @@
 	* locales/sat_IN: Likewise.
 	* locales/sc_IT: Likewise.
 	* locales/sd_IN: Likewise.
-	* locales/sd_IN@devanagari | 5 +++--
+	* locales/sd_IN@devanagari: Likewise.
 	* locales/se_NO: Likewise.
 	* locales/shs_CA: Likewise.
 	* locales/si_LK: Likewise.
diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index 4a7e1a1b63..701368e26b 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "aa"
-territory  "DJ"
+language   "Afar"
+territory  "Djibouti"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index b7f84e4f47..a355d35e96 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "aa"
-territory  "ER"
+language   "Afar"
+territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
index a04a7f0dc9..ae2b3ade3b 100644
--- a/localedata/locales/aa_ER@saaho
+++ b/localedata/locales/aa_ER@saaho
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "aa"
-territory  "ER"
+language   "Afar"
+territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index 4aa28caafb..7a97d69ab4 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "aa"
-territory  "ET"
+language   "Afar"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index a8d746e779..768d1e78c4 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "am"
-territory  "ET"
+language   "Amharic"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY
index b6d1b68401..758251f83a 100644
--- a/localedata/locales/ar_LY
+++ b/localedata/locales/ar_LY
@@ -21,7 +21,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Arabic"
-territory  "Libyan Arab Jamahiriya"
+territory  "Libya"
 revision   "1.0"
 date       "2000-07-20"
 %
diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY
index 241b0cfd04..8dc6b93790 100644
--- a/localedata/locales/ar_SY
+++ b/localedata/locales/ar_SY
@@ -21,7 +21,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Arabic"
-territory  "Syrian Arab Republic"
+territory  "Syria"
 revision   "1.0"
 date       "2000-07-20"
 %
diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
index f0ab1b2066..614915ab6b 100644
--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@@ -28,7 +28,7 @@ contact "Pablo Saratxaga"
 email "pablo@mandrakesoft.com"
 tel ""
 fax ""
-language "Azeri"
+language "Azerbaijani"
 territory "Azerbaijan"
 revision "0.4"
 date "2001-01-26"
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index 147da60ca0..f147b898aa 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -18,7 +18,7 @@ contact    "Taneem Ahmed, Jamil Ahmed"
 email      "taneem@bengalinux.org, jamil@bengalinux.org"
 tel        ""
 fax        ""
-language   "Bengali/Bangla"
+language   "Bengali"
 territory  "Bangladesh"
 revision   "0.5"
 date       "2007-01-10"
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
index 3a4c42ecab..c2546481b7 100644
--- a/localedata/locales/bo_CN
+++ b/localedata/locales/bo_CN
@@ -21,7 +21,7 @@ email      "bug-glibc@gnu.org"
 tel        ""
 fax        ""
 language   "Tibetan"
-territory  "P.R. of China"
+territory  "China"
 revision   "0.1"
 date       "2007-11-06"
 %
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index 763ff6e879..7e4c3d62a1 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -32,7 +32,7 @@ email "tvujec@carnet.hr"
 tel ""
 fax ""
 language "Bosnian"
-territory "Bosnia and Herzegowina"
+territory "Bosnia & Herzegovina"
 revision "0.4"
 date "2004-01-09"
 
diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
index 888db84cf2..e8fe000a1a 100644
--- a/localedata/locales/byn_ER
+++ b/localedata/locales/byn_ER
@@ -31,8 +31,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "byn"
-territory  "ER"
+language   "Blin"
+territory  "Eritrea"
 revision   "0.21"
 date       "2003-11-01"
 %
diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT
index 1f0bab88e8..0561860436 100644
--- a/localedata/locales/ca_IT
+++ b/localedata/locales/ca_IT
@@ -27,7 +27,7 @@ email      ""
 tel        ""
 fax        ""
 language   "Catalan"
-territory  "Italy (L'Alguer)"
+territory  "Italy"
 revision   "1.0"
 date       "2006-01-16"
 %
diff --git a/localedata/locales/ce_RU b/localedata/locales/ce_RU
index 66746c77c4..651f08f067 100644
--- a/localedata/locales/ce_RU
+++ b/localedata/locales/ce_RU
@@ -16,7 +16,7 @@ title      "Chechen locale for RUSSIAN FEDERATION"
 source       "ANCHR"
 address      "364024, ChR, Grozny, pr-kt of M. Esambayev, 13"
 language  "Chechen"
-territory "RUSSIAN FEDERATION"
+territory "Russia"
 revision  "1.0"
 date      "2014-08-25"
 %
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index 5d2d92b09c..780225ffd7 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -29,7 +29,7 @@ email        "bug-glibc-locales@gnu.org"
 tel          ""
 fax          ""
 language     "Mandarin Chinese"
-territory    "Republic of China"
+territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
 %
diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 36d314039d..28ffc70228 100644
--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@@ -19,7 +19,7 @@ email "pablo@mandrakesoft.com"
 tel ""
 fax ""
 language "Welsh"
-territory "Great Britain"
+territory "United Kingdom"
 revision "0.9"
 date "2004-09-27"
 
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index 2a953b32af..f066373328 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -30,7 +30,7 @@ contact    "Gerhard Budin"
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "German"
+language   "Austrian German"
 territory  "Austria"
 revision   "1.0"
 date       "2000-06-28"
diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH
index 3a7562f6e7..aa2c5143bd 100644
--- a/localedata/locales/de_CH
+++ b/localedata/locales/de_CH
@@ -30,7 +30,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "German"
+language   "Swiss High German"
 territory  "Switzerland"
 revision   "1.0"
 date       "2007-09-23"
diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index c7a71f3abf..a55bab4372 100644
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -32,7 +32,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "German"
-territory  "Luxemburg"
+territory  "Luxembourg"
 revision   "1.0"
 date       "2000-06-29"
 %
diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro
index 39c79b5cb6..39a0e0ba4f 100644
--- a/localedata/locales/de_LU@euro
+++ b/localedata/locales/de_LU@euro
@@ -25,7 +25,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "German"
-territory  "Luxemburg"
+territory  "Luxembourg"
 revision   "1.0"
 date       "2000-08-20"
 %
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index 750d2ca876..73577a2a1c 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -20,7 +20,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "English"
-territory  "Antigua and Barbuda"
+territory  "Antigua & Barbuda"
 revision   "1.0"
 date       "2008-09-16"
 %
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index 4e7d554719..58dbcc14ca 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -31,7 +31,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "English"
+language   "Australian English"
 territory  "Australia"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index 24f068646c..c5fcea871e 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -33,7 +33,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "English"
+language   "Canadian English"
 territory  "Canada"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index 66ea5bd197..b15ca41c75 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -31,8 +31,8 @@ contact    "Keld Simonsen"
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "English"
-territory  "Great Britain"
+language   "British English"
+territory  "United Kingdom"
 revision   "1.0"
 date       "2000-06-28"
 %
diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
index 68f0206e82..e102f2de0d 100644
--- a/localedata/locales/en_HK
+++ b/localedata/locales/en_HK
@@ -24,7 +24,7 @@ email      "bug-glibc-locales@gnu.org"
 tel         ""
 fax         ""
 language    "English"
-territory   "Hong Kong"
+territory   "Hong Kong SAR China"
 revision    "1.0"
 date        "2000,October,27 (XML source:2000,July,20)"
 %
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index 5cad83863f..c22202df79 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -19,8 +19,8 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "English"
-territory  "USA"
+language   "American English"
+territory  "United States"
 revision   "1.0"
 date       "2000-06-24"
 %
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index 0307a171dc..75411f3099 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -32,7 +32,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Spanish"
+language   "European Spanish"
 territory  "Spain"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 8d331ee075..5b2eab7022 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -32,7 +32,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Spanish"
+language   "Mexican Spanish"
 territory  "Mexico"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index b3d4633aed..50d9f2d93f 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -33,7 +33,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Spanish"
-territory  "USA"
+territory  "United States"
 revision   "1.0"
 date       "2000-06-29"
 %
diff --git a/localedata/locales/ff_SN b/localedata/locales/ff_SN
index 2a0af8bf73..711b43cd76 100644
--- a/localedata/locales/ff_SN
+++ b/localedata/locales/ff_SN
@@ -18,7 +18,7 @@ title      "Fulah locale for Senegal"
 source     "Pular-Fulfulde.org"
 contact    "Ibrahima Sarr"
 email      "admin@pulaar-fulfulde.org"
-language   "ff"
+language   "Fulah"
 territory  "Senegal"
 revision   "1.0"
 date       "2011-03-28"
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 7226c6570d..ad9cc1074e 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -31,7 +31,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "French"
+language   "Canadian French"
 territory  "Canada"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
index 8604d649f6..9fa6d9e6b8 100644
--- a/localedata/locales/fr_CH
+++ b/localedata/locales/fr_CH
@@ -31,7 +31,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "French"
+language   "Swiss French"
 territory  "Switzerland"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
index 2e35246e40..d6f1e1df4b 100644
--- a/localedata/locales/fr_LU
+++ b/localedata/locales/fr_LU
@@ -32,7 +32,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "French"
-territory  "Luxemburg"
+territory  "Luxembourg"
 revision   "1.0"
 date       "2000-06-29"
 %
diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro
index f5bbaf762a..bab1ea4282 100644
--- a/localedata/locales/fr_LU@euro
+++ b/localedata/locales/fr_LU@euro
@@ -25,7 +25,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "French"
-territory  "Luxemburg"
+territory  "Luxembourg"
 revision   "1.0"
 date       "2000-08-20"
 %
diff --git a/localedata/locales/fur_IT b/localedata/locales/fur_IT
index 7d9da754a5..94c75d7d45 100644
--- a/localedata/locales/fur_IT
+++ b/localedata/locales/fur_IT
@@ -24,7 +24,7 @@ contact    "Pablo Saratxaga"
 email      "pablo@mandrakesoft.com"
 tel        ""
 fax        ""
-language   "Furlan"
+language   "Friulian"
 territory  "Italy"
 revision   "0.3"
 date       "2004-04-26"
diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE
index 6a3b6f35b8..4c0f6b3b03 100644
--- a/localedata/locales/fy_DE
+++ b/localedata/locales/fy_DE
@@ -18,8 +18,8 @@ contact "Kenneth Christiansen, Pablo Saratxaga"
 email "kenneth@gnu.org, pablo@mandriva.com"
 tel ""
 % Fax
-language "fy"
-territory "DE"
+language "Western Frisian"
+territory "Germany"
 revision "0.1"
 date "2003-11-30"
 
diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
index 9cf142df3d..094295880f 100644
--- a/localedata/locales/fy_NL
+++ b/localedata/locales/fy_NL
@@ -23,7 +23,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Frisian"
+language   "Western Frisian"
 territory  "Netherlands"
 revision   "1.0"
 date       "2006-08-13"
diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
index 2af55191d1..fc5b23a8a0 100644
--- a/localedata/locales/gd_GB
+++ b/localedata/locales/gd_GB
@@ -24,8 +24,8 @@ address      "1/2, 47 Wilton Street, Glasgow G20 6RT, UK"
 contact      "Michael Bauer"
 email        "fios@akerbeltz.org"
 tel          ""
-language     "Scots Gaelic"
-territory    "Great Britain"
+language     "Scottish Gaelic"
+territory    "United Kingdom"
 revision     "1.2"
 date         "2013-04-25"
 %
diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
index 7e04a2fdeb..1e524e6d02 100644
--- a/localedata/locales/gez_ER
+++ b/localedata/locales/gez_ER
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "gez"
-territory  "ER"
+language   "Geez"
+territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/gez_ER@abegede b/localedata/locales/gez_ER@abegede
index 15020783b7..187282bede 100644
--- a/localedata/locales/gez_ER@abegede
+++ b/localedata/locales/gez_ER@abegede
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "gez"
-territory  "ER"
+language   "Geez"
+territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
index 5759979704..b9db1d80bb 100644
--- a/localedata/locales/gez_ET
+++ b/localedata/locales/gez_ET
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "gez"
-territory  "ET"
+language   "Geez"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/gez_ET@abegede b/localedata/locales/gez_ET@abegede
index e7c4f9bd43..2712255397 100644
--- a/localedata/locales/gez_ET@abegede
+++ b/localedata/locales/gez_ET@abegede
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "gez"
-territory  "ET"
+language   "Geez"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB
index 8076fb5656..424581678f 100644
--- a/localedata/locales/gv_GB
+++ b/localedata/locales/gv_GB
@@ -33,8 +33,8 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Manx Gaelic"
-territory  "Britain"
+language   "Manx"
+territory  "United Kingdom"
 revision   "1.0"
 date       "2000-06-29"
 %
diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
index b272535985..fcc00cddf5 100644
--- a/localedata/locales/hak_TW
+++ b/localedata/locales/hak_TW
@@ -29,7 +29,7 @@ email        "bug-glibc-locales@gnu.org"
 tel          ""
 fax          ""
 language     "Hakka Chinese"
-territory    "Republic of China"
+territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
 %
diff --git a/localedata/locales/ht_HT b/localedata/locales/ht_HT
index 6f14c755d3..c65d97d07c 100644
--- a/localedata/locales/ht_HT
+++ b/localedata/locales/ht_HT
@@ -35,7 +35,7 @@ contact      "sugarlabs.org"
 email        "libc-alpha@sourceware.org"
 tel          ""
 fax          ""
-language     "Kreyol"
+language     "Haitian Creole"
 territory    "Haiti"
 revision     "1.1"
 date         "2013-08-09"
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index 9cdedba2cc..3823898e2a 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -19,7 +19,7 @@ email "pablo@mandriva.com"
 tel ""
 fax ""
 language "Inuktitut"
-territory "CA"
+territory "Canada"
 revision "0.1"
 date "2001-05-04"
 
diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
index e757a96f7c..b5fcb826d9 100644
--- a/localedata/locales/kl_GL
+++ b/localedata/locales/kl_GL
@@ -35,7 +35,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Greenlandic"
+language   "Kalaallisut"
 territory  "Greenland"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR
index 783cc71b52..5524afda26 100644
--- a/localedata/locales/ko_KR
+++ b/localedata/locales/ko_KR
@@ -53,7 +53,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Korean"
-territory  "Republic of Korea"
+territory  "South Korea"
 revision   "1.1"
 date       "2000-11-09"
 %
diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB
index a154c84508..471f07ae86 100644
--- a/localedata/locales/kw_GB
+++ b/localedata/locales/kw_GB
@@ -35,7 +35,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Cornish"
-territory  "Britain"
+territory  "United Kingdom"
 revision   "1.0"
 date       "2000-06-29"
 %
diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG
index f60336834f..96cd9b3692 100644
--- a/localedata/locales/lg_UG
+++ b/localedata/locales/lg_UG
@@ -31,7 +31,7 @@ contact    "Kizito Birabwa"
 email      "kompyuta@kizito.uklinux.net"
 tel        ""
 fax        ""
-language   "Luganda"
+language   "Ganda"
 territory  "Uganda"
 revision   "1.0"
 date       "2001-11-04"
diff --git a/localedata/locales/li_BE b/localedata/locales/li_BE
index eeb07e0ba0..647bc8fea4 100644
--- a/localedata/locales/li_BE
+++ b/localedata/locales/li_BE
@@ -16,8 +16,8 @@ contact "Kenneth Christiansen, Pablo Saratxaga"
 email "kenneth@gnu.org, pablo@mandriva.com"
 tel ""
 % Fax
-language "li"
-territory "BE"
+language "Limburgish"
+territory "Belgium"
 revision "0.1"
 date "2003-11-30"
 
diff --git a/localedata/locales/li_NL b/localedata/locales/li_NL
index 436f133159..f1d5d4a451 100644
--- a/localedata/locales/li_NL
+++ b/localedata/locales/li_NL
@@ -16,8 +16,8 @@ contact "Kenneth Christiansen, Pablo Saratxaga"
 email "kenneth@gnu.org, pablo@mandriva.com"
 tel ""
 % Fax
-language "li"
-territory "NL"
+language "Limburgish"
+territory "Netherlands"
 revision "0.1"
 date "2003-11-30"
 
diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
index 4eb604b3a3..a998d392ab 100644
--- a/localedata/locales/lzh_TW
+++ b/localedata/locales/lzh_TW
@@ -29,7 +29,7 @@ email        "bug-glibc-locales@gnu.org"
 tel          ""
 fax          ""
 language     "Literary Chinese"
-territory    "Republic of China"
+territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
 %
diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
index 582f53f5d1..df987c4728 100644
--- a/localedata/locales/my_MM
+++ b/localedata/locales/my_MM
@@ -23,7 +23,7 @@ email       "devel@thanlwinsoft.org"
 tel        ""
 fax        ""
 language   "Burmese"
-territory  "Myanmar"
+territory  "Myanmar (Burma)"
 revision "1.3"
 date       "2009-10-02"
 
diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
index e447975bfa..052fa533d4 100644
--- a/localedata/locales/nan_TW
+++ b/localedata/locales/nan_TW
@@ -29,7 +29,7 @@ email        "bug-glibc-locales@gnu.org"
 tel          ""
 fax          ""
 language     "Min Nan Chinese"
-territory    "Republic of China"
+territory    "Taiwan"
 revision     "0.1"
 date         "2013-06-02"
 %
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index c0a0abeda1..c11342de80 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -27,7 +27,7 @@ contact "Arne Goetje"
 email "arne@canonical.com"
 tel ""
 fax ""
-language "Minnan"
+language "Min Nan Chinese"
 territory "Taiwan"
 revision "0.1"
 date "2008-06-16"
diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO
index a2e117fcbd..c10e380928 100644
--- a/localedata/locales/nb_NO
+++ b/localedata/locales/nb_NO
@@ -31,7 +31,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Norwegian, Bokm<U00E5>l"
+language   "Norwegian Bokmål"
 territory  "Norway"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/nds_DE b/localedata/locales/nds_DE
index 8642b340c8..d72a522ce8 100644
--- a/localedata/locales/nds_DE
+++ b/localedata/locales/nds_DE
@@ -16,8 +16,8 @@ contact "Kenneth Christiansen, Pablo Saratxaga"
 email "kenneth@gnu.org, pablo@mandrakesoft.com"
 tel ""
 % Fax
-language "nds"
-territory "DE"
+language "Low German"
+territory "Germany"
 revision "0.1"
 date "2003-11-30"
 
diff --git a/localedata/locales/nds_NL b/localedata/locales/nds_NL
index 1c38843086..cb47e48e42 100644
--- a/localedata/locales/nds_NL
+++ b/localedata/locales/nds_NL
@@ -16,8 +16,8 @@ contact "Kenneth Christiansen, Pablo Saratxaga"
 email "kenneth@gnu.org, pablo@mandrakesoft.com"
 tel ""
 % Fax
-language "nds"
-territory "NL"
+language "Low Saxon"
+territory "Netherlands"
 revision "0.1"
 date "2003-11-30"
 
diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU
index e3a5261360..86ef315dc3 100644
--- a/localedata/locales/niu_NU
+++ b/localedata/locales/niu_NU
@@ -17,7 +17,7 @@ contact      "Emani Fakaotimanava-Lui"
 email        "emani@niue.nu"
 tel          ""
 fax          ""
-language     "Vagahau Niue (Niuean)"
+language     "Niuean"
 territory    "Niue"
 revision     "1.0"
 date         "2012-07-18"
diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ
index 29849f5054..e26b3540c1 100644
--- a/localedata/locales/niu_NZ
+++ b/localedata/locales/niu_NZ
@@ -17,7 +17,7 @@ contact      "Emani Fakaotimanava-Lui"
 email        "emani@niue.nu"
 tel          ""
 fax          ""
-language     "Vagahau Niue (Niuean)"
+language     "Niuean"
 territory    "New Zealand"
 revision     "1.0"
 date         "2012-07-18"
diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index fafd7df24f..d8b961c082 100644
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -31,7 +31,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Dutch"
+language   "Flemish"
 territory  "Belgium"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO
index aa5b817a93..4661d331c4 100644
--- a/localedata/locales/nn_NO
+++ b/localedata/locales/nn_NO
@@ -20,7 +20,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Norwegian, Nynorsk"
+language   "Norwegian Nynorsk"
 territory  "Norway"
 revision   "1.0"
 date       "2000-08-31"
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index a91eebf271..6885e795d3 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -41,7 +41,7 @@ contact    "Dwayne Bailey"
 email      "dwayne@translate.org.za"
 tel        ""
 fax        ""
-language   "Southern Ndebele"
+language   "South Ndebele"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
index 9d137a092c..0ef0c6578b 100644
--- a/localedata/locales/om_ET
+++ b/localedata/locales/om_ET
@@ -39,8 +39,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "om"
-territory  "ET"
+language   "Oromo"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE
index 6b841de5cf..57e2028b84 100644
--- a/localedata/locales/om_KE
+++ b/localedata/locales/om_KE
@@ -39,8 +39,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "om"
-territory  "KE"
+language   "Oromo"
+territory  "Kenya"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
index 48d5fc3ae5..43f96de586 100644
--- a/localedata/locales/or_IN
+++ b/localedata/locales/or_IN
@@ -20,7 +20,7 @@ contact     ""
 email       "bug-glibc@gnu.org"
 tel         ""
 fax         ""
-language    "Odia"
+language    "Oriya"
 territory   "India"
 revision    "1.0"
 date        "2006-05-25"
diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU
index 60ff72200e..886cb164bb 100644
--- a/localedata/locales/os_RU
+++ b/localedata/locales/os_RU
@@ -30,7 +30,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Ossetian"
+language   "Ossetic"
 territory  "Russia"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK
index af5ed97540..885d4713d8 100644
--- a/localedata/locales/pa_PK
+++ b/localedata/locales/pa_PK
@@ -27,7 +27,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Punjabi (Shahmukhi)"
+language   "Punjabi"
 territory  "Pakistan"
 revision   "0.3"
 date       "2000-07-11"
diff --git a/localedata/locales/pap_AW b/localedata/locales/pap_AW
index ca49218403..b4d5f602f0 100644
--- a/localedata/locales/pap_AW
+++ b/localedata/locales/pap_AW
@@ -23,8 +23,8 @@ contact "Pablo Saratxaga"
 email "pablo@mandrakesoft.com"
 tel ""
 fax ""
-language "pap"
-territory "AW"
+language "Papiamento"
+territory "Aruba"
 revision "1.0"
 date "2013-09-27"
 
diff --git a/localedata/locales/pap_CW b/localedata/locales/pap_CW
index 17f171fd81..cefbbdddf1 100644
--- a/localedata/locales/pap_CW
+++ b/localedata/locales/pap_CW
@@ -23,8 +23,8 @@ contact "Pablo Saratxaga"
 email "pablo@mandrakesoft.com"
 tel ""
 fax ""
-language "pap"
-territory "CW"
+language "Papiamento"
+territory "Curaçao"
 revision "1.0"
 date "2013-09-27"
 
diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index b380b576f3..6cb1998cfa 100644
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -31,8 +31,8 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Portuguese"
-territory  "Brasil"
+language   "Brazilian Portuguese"
+territory  "Brazil"
 revision   "1.0"
 date       "2000-06-29"
 %
diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
index 251a9ad82a..21b8647df5 100644
--- a/localedata/locales/pt_PT
+++ b/localedata/locales/pt_PT
@@ -31,7 +31,7 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Portuguese"
+language   "European Portuguese"
 territory  "Portugal"
 revision   "1.0"
 date       "2000-06-29"
diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO
index 0a5ef3496f..e5a781bf69 100644
--- a/localedata/locales/se_NO
+++ b/localedata/locales/se_NO
@@ -28,7 +28,7 @@ contact "Børre Gaup"
 email "boerre.gaup@pc.nu"
 tel ""
 fax ""
-language "Northern Saami"
+language "Northern Sami"
 territory "Norway"
 revision "0.1"
 date "2001-11-09"
diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
index 4e259903d9..49546eee7c 100644
--- a/localedata/locales/sid_ET
+++ b/localedata/locales/sid_ET
@@ -36,8 +36,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "sid"
-territory  "ET"
+language   "Sidamo"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index 55f6cda2dc..0cae82d398 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -45,7 +45,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Slovak"
-territory  "Slovak"
+territory  "Slovakia"
 revision   "1.0"
 date       "2000-06-29"
 %
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index 7e110b2026..c0a69d3838 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "so"
-territory  "DJ"
+language   "Somali"
+territory  "Djibouti"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index 2a77c43c41..c995ca96b9 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "so"
-territory  "ET"
+language   "Somali"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index 2957724644..875b905fb5 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "so"
-territory  "KE"
+language   "Somali"
+territory  "Kenya"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index f8b492e1e5..f443874090 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -35,8 +35,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "so"
-territory  "SO"
+language   "Somali"
+territory  "Somalia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index 700492a9bd..ae6163317b 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -39,7 +39,7 @@ contact    "Dwayne Bailey"
 email      "dwayne@translate.org.za"
 tel        ""
 fax        ""
-language   "Sotho"
+language   "Southern Sotho"
 territory  "South Africa"
 revision   "0.3"
 date       "2005-10-13"
diff --git a/localedata/locales/sw_KE b/localedata/locales/sw_KE
index fdbcf388dc..4c21de643b 100644
--- a/localedata/locales/sw_KE
+++ b/localedata/locales/sw_KE
@@ -20,7 +20,7 @@ contact    "Martin Benjamin"
 email      "locales@kamusi.org"
 tel        ""
 fax        ""
-language   "sw"
+language   "Swahili"
 territory  "Kenya"
 revision   "1.0"
 date       "2011-03-07"
diff --git a/localedata/locales/sw_TZ b/localedata/locales/sw_TZ
index 7fa4a78e78..35ccba8ad6 100644
--- a/localedata/locales/sw_TZ
+++ b/localedata/locales/sw_TZ
@@ -20,7 +20,7 @@ contact    "Martin Benjamin"
 email      "locales@kamusi.org"
 tel        ""
 fax        ""
-language   "sw"
+language   "Swahili"
 territory  "Tanzania"
 revision   "1.0"
 date       "2011-03-07"
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index df10459476..cbf4ed2ba9 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "ti"
-territory  "ER"
+language   "Tigrinya"
+territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index 2f158a48fa..0692b294db 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "ti"
-territory  "ET"
+language   "Tigrinya"
+territory  "Ethiopia"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
index 5271bd22e2..26c9ab4510 100644
--- a/localedata/locales/tig_ER
+++ b/localedata/locales/tig_ER
@@ -31,8 +31,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "tig"
-territory  "ER"
+language   "Tigre"
+territory  "Eritrea"
 revision   "0.20"
 date       "2003-07-05"
 %
diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif
index cae56b208b..3395c09347 100644
--- a/localedata/locales/tt_RU@iqtelif
+++ b/localedata/locales/tt_RU@iqtelif
@@ -29,7 +29,7 @@ email		"tatar.iqtelif.i18n@gmail.com"
 tel		""
 fax		""
 language	"Tatar"
-territory	"Tatarstan, Russian Federation"
+territory	"Russia"
 revision	"0.1"
 date		"2006-10-12"
 
diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index c60daea0ef..5fd023e144 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -53,10 +53,10 @@ tel        ""
 fax        ""
 
 % Code of language, to which this document applies.
-language   "uk"
+language   "Ukrainian"
 
 % Code of country/geographic extent (ISO 3166), to which this document applies.
-territory  "UA"
+territory  "Ukraine"
 
 % Intended user audience.
 audience   "general"
diff --git a/localedata/locales/unm_US b/localedata/locales/unm_US
index 8bb4bc3d70..6aa6427c8d 100644
--- a/localedata/locales/unm_US
+++ b/localedata/locales/unm_US
@@ -25,7 +25,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Unami Delaware"
-territory  "USA"
+territory  "United States"
 revision   "1.0"
 date       "2011-10-27"
 %
diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
index 4a1991da7b..1d332de723 100644
--- a/localedata/locales/wal_ET
+++ b/localedata/locales/wal_ET
@@ -33,8 +33,8 @@ contact    ""
 email      "locales@geez.org"
 tel        ""
 fax        ""
-language   "wal"
-territory  "ET"
+language   "Wolaytta"
+territory  "Ethiopia"
 revision   "0.10"
 date       "2004-04-25"
 %
diff --git a/localedata/locales/yi_US b/localedata/locales/yi_US
index 377ba430b5..6694de02a8 100644
--- a/localedata/locales/yi_US
+++ b/localedata/locales/yi_US
@@ -22,7 +22,7 @@ email "pablo@mandrakesoft.com"
 tel ""
 fax ""
 language "Yiddish"
-territory "USA"
+territory "United States"
 revision "0.4"
 date "2003-08-16"
 
diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK
index 4a91bd873b..9993496e3a 100644
--- a/localedata/locales/yue_HK
+++ b/localedata/locales/yue_HK
@@ -21,8 +21,8 @@ contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
-language   "Yue Chinese"
-territory  "Hong Kong"
+language   "Cantonese"
+territory  "Hong Kong SAR China"
 revision   "1.0"
 date       "2010-11-07"
 %
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index 2a66c34d37..a5597d781a 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -31,7 +31,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Chinese"
-territory  "P.R. of China"
+territory  "China"
 revision   "0.1"
 date       "2000-07-25"
 %
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index efae3019ee..65a2ca9ece 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -21,7 +21,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Chinese"
-territory  "Hong Kong"
+territory  "Hong Kong SAR China"
 revision   "1.0"
 date       "2000-07-20"
 %
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index f10788c4dc..73604f3aac 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -32,7 +32,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Chinese"
-territory  "Taiwan R.O.C."
+territory  "Taiwan"
 revision   "0.2"
 date       "2000-08-02"
 %