This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] localedata: i18napis: update LC_ADDRESS.country_post


Since CLDR has deleted all postal related information and have no plans
to re-add it, switch to the source they recommend: libaddressinput which
has an RPC API available.
	https://github.com/googlei18n/libaddressinput
	https://i18napis.appspot.com/address

So make sure country_post is set in every single locale, and set to
the right value, and clean up any old/stray comments in the process.

The astute reader might notice that the country_post is set to the same
value as the territory code in all these cases.  That appears to be by
design and WAI.

As such, I'm only listing the locales below that had their value change.

First we update bad values.  I've hand checked these against the Google
site and against other random internet databases (some governmental).
  aa_DJ: changing DJI to DJ
  aa_ER: changing ERI to ER
  aa_ET: changing ETH to ET
  am_ET: changing ETH to ET
  byn_ER: changing ERI to ER
  chr_US: changing USA to US
  de_DE: changing D to DE
  en_IL: changing ISR to IL
  en_US: changing USA to US
  es_US: changing USA to US
  fy_DE: changing D to DE
  gez_ER: changing ERI to ER
  gez_ET: changing ETH to ET
  hsb_DE: changing D to DE
  ia_FR: changing F to FR
  kk_KZ: changing KAZ to KZ
  lb_LU: changing L to LU
  li_BE: changing B to BE
  my_MM: changing Myanmar to MM
  nds_DE: changing D to DE
  oc_FR: changing F to FR
  om_ET: changing ETH to ET
  om_KE: changing KEN to KE
  sid_ET: changing ETH to ET
  so_DJ: changing DJI to DJ
  so_ET: changing ETH to ET
  so_KE: changing KEN to KE
  so_SO: changing SOM to SO
  sr_ME: changing MNE to ME
  sr_RS: changing SRB to RS
  sr_RS@latin: changing SRB to RS
  ti_ER: changing ERI to ER
  ti_ET: changing ETH to ET
  tig_ER: changing ERI to ER
  tr_CY: changing TR to CY
  unm_US: changing USA to US
  wa_BE: changing B to BE
  wae_CH: changing DH to CH
  wal_ET: changing ETH to ET
  yi_US: changing USA to US
---
 localedata/locales/aa_DJ            | 2 +-
 localedata/locales/aa_ER            | 2 +-
 localedata/locales/aa_ET            | 2 +-
 localedata/locales/af_ZA            | 6 +-----
 localedata/locales/ak_GH            | 1 -
 localedata/locales/am_ET            | 2 +-
 localedata/locales/an_ES            | 1 +
 localedata/locales/anp_IN           | 1 +
 localedata/locales/ar_AE            | 1 +
 localedata/locales/ar_BH            | 1 +
 localedata/locales/ar_DZ            | 1 +
 localedata/locales/ar_EG            | 1 +
 localedata/locales/ar_IN            | 1 +
 localedata/locales/ar_IQ            | 1 +
 localedata/locales/ar_JO            | 1 +
 localedata/locales/ar_KW            | 1 +
 localedata/locales/ar_LB            | 1 +
 localedata/locales/ar_LY            | 1 +
 localedata/locales/ar_MA            | 1 +
 localedata/locales/ar_OM            | 1 +
 localedata/locales/ar_QA            | 1 +
 localedata/locales/ar_SA            | 1 +
 localedata/locales/ar_SD            | 1 +
 localedata/locales/ar_SS            | 1 +
 localedata/locales/ar_SY            | 1 +
 localedata/locales/ar_TN            | 1 +
 localedata/locales/ar_YE            | 1 +
 localedata/locales/as_IN            | 1 +
 localedata/locales/ast_ES           | 1 +
 localedata/locales/ayc_PE           | 1 +
 localedata/locales/az_AZ            | 1 +
 localedata/locales/be_BY            | 1 +
 localedata/locales/be_BY@latin      | 1 +
 localedata/locales/bem_ZM           | 3 +--
 localedata/locales/ber_DZ           | 2 +-
 localedata/locales/ber_MA           | 2 +-
 localedata/locales/bhb_IN           | 1 +
 localedata/locales/bho_IN           | 1 +
 localedata/locales/bn_BD            | 3 +--
 localedata/locales/bn_IN            | 1 +
 localedata/locales/bo_CN            | 1 +
 localedata/locales/bo_IN            | 1 +
 localedata/locales/br_FR            | 1 +
 localedata/locales/brx_IN           | 1 +
 localedata/locales/bs_BA            | 1 +
 localedata/locales/byn_ER           | 2 +-
 localedata/locales/ca_AD            | 1 +
 localedata/locales/ca_ES            | 1 +
 localedata/locales/ca_FR            | 1 +
 localedata/locales/ca_IT            | 1 +
 localedata/locales/ce_RU            | 1 +
 localedata/locales/chr_US           | 2 +-
 localedata/locales/cmn_TW           | 1 -
 localedata/locales/crh_UA           | 3 ++-
 localedata/locales/cs_CZ            | 2 +-
 localedata/locales/csb_PL           | 1 +
 localedata/locales/cv_RU            | 1 +
 localedata/locales/cy_GB            | 2 +-
 localedata/locales/da_DK            | 1 +
 localedata/locales/de_AT            | 1 +
 localedata/locales/de_BE            | 1 +
 localedata/locales/de_CH            | 1 +
 localedata/locales/de_DE            | 2 +-
 localedata/locales/de_IT            | 1 +
 localedata/locales/de_LU            | 1 +
 localedata/locales/doi_IN           | 1 +
 localedata/locales/dv_MV            | 1 +
 localedata/locales/dz_BT            | 3 +--
 localedata/locales/el_CY            | 1 +
 localedata/locales/el_GR            | 1 +
 localedata/locales/en_AG            | 1 +
 localedata/locales/en_AU            | 1 +
 localedata/locales/en_BW            | 1 +
 localedata/locales/en_CA            | 1 +
 localedata/locales/en_DK            | 1 +
 localedata/locales/en_GB            | 1 +
 localedata/locales/en_HK            | 1 +
 localedata/locales/en_IE            | 1 +
 localedata/locales/en_IL            | 2 +-
 localedata/locales/en_IN            | 1 +
 localedata/locales/en_NG            | 6 +-----
 localedata/locales/en_NZ            | 1 +
 localedata/locales/en_PH            | 1 +
 localedata/locales/en_SG            | 1 +
 localedata/locales/en_US            | 2 +-
 localedata/locales/en_ZA            | 6 +-----
 localedata/locales/en_ZM            | 3 +--
 localedata/locales/en_ZW            | 1 +
 localedata/locales/es_AR            | 1 +
 localedata/locales/es_BO            | 1 +
 localedata/locales/es_CL            | 1 +
 localedata/locales/es_CO            | 1 +
 localedata/locales/es_CR            | 2 +-
 localedata/locales/es_CU            | 1 +
 localedata/locales/es_DO            | 1 +
 localedata/locales/es_EC            | 1 +
 localedata/locales/es_ES            | 1 +
 localedata/locales/es_GT            | 1 +
 localedata/locales/es_HN            | 1 +
 localedata/locales/es_MX            | 1 +
 localedata/locales/es_NI            | 1 +
 localedata/locales/es_PA            | 1 +
 localedata/locales/es_PE            | 1 +
 localedata/locales/es_PR            | 1 +
 localedata/locales/es_PY            | 1 +
 localedata/locales/es_SV            | 1 +
 localedata/locales/es_US            | 2 +-
 localedata/locales/es_UY            | 1 +
 localedata/locales/es_VE            | 1 +
 localedata/locales/et_EE            | 2 +-
 localedata/locales/eu_ES            | 1 +
 localedata/locales/fa_IR            | 1 +
 localedata/locales/ff_SN            | 3 +--
 localedata/locales/fil_PH           | 1 +
 localedata/locales/fo_FO            | 1 +
 localedata/locales/fr_BE            | 1 +
 localedata/locales/fr_CA            | 1 +
 localedata/locales/fr_CH            | 1 +
 localedata/locales/fr_FR            | 1 +
 localedata/locales/fr_LU            | 1 +
 localedata/locales/fur_IT           | 1 +
 localedata/locales/fy_DE            | 2 +-
 localedata/locales/fy_NL            | 1 +
 localedata/locales/ga_IE            | 1 +
 localedata/locales/gd_GB            | 1 +
 localedata/locales/gez_ER           | 2 +-
 localedata/locales/gez_ET           | 2 +-
 localedata/locales/gl_ES            | 1 +
 localedata/locales/gu_IN            | 1 +
 localedata/locales/gv_GB            | 1 +
 localedata/locales/ha_NG            | 6 +-----
 localedata/locales/hak_TW           | 1 -
 localedata/locales/he_IL            | 1 +
 localedata/locales/hi_IN            | 1 +
 localedata/locales/hne_IN           | 1 +
 localedata/locales/hr_HR            | 1 +
 localedata/locales/hsb_DE           | 2 +-
 localedata/locales/ht_HT            | 1 -
 localedata/locales/hu_HU            | 1 +
 localedata/locales/hy_AM            | 2 +-
 localedata/locales/ia_FR            | 2 +-
 localedata/locales/id_ID            | 1 +
 localedata/locales/ig_NG            | 6 +-----
 localedata/locales/ik_CA            | 1 +
 localedata/locales/is_IS            | 1 +
 localedata/locales/it_CH            | 1 +
 localedata/locales/it_IT            | 1 +
 localedata/locales/iu_CA            | 2 +-
 localedata/locales/ja_JP            | 1 +
 localedata/locales/ka_GE            | 2 +-
 localedata/locales/kk_KZ            | 2 +-
 localedata/locales/kl_GL            | 1 +
 localedata/locales/km_KH            | 3 +--
 localedata/locales/kn_IN            | 1 +
 localedata/locales/ko_KR            | 1 +
 localedata/locales/kok_IN           | 1 +
 localedata/locales/ks_IN            | 1 +
 localedata/locales/ks_IN@devanagari | 1 +
 localedata/locales/ku_TR            | 2 +-
 localedata/locales/kw_GB            | 1 +
 localedata/locales/ky_KG            | 1 +
 localedata/locales/lb_LU            | 2 +-
 localedata/locales/lg_UG            | 2 --
 localedata/locales/li_BE            | 2 +-
 localedata/locales/li_NL            | 2 +-
 localedata/locales/lij_IT           | 1 +
 localedata/locales/lo_LA            | 3 +--
 localedata/locales/lt_LT            | 1 +
 localedata/locales/lv_LV            | 1 +
 localedata/locales/lzh_TW           | 1 -
 localedata/locales/mag_IN           | 1 +
 localedata/locales/mai_IN           | 1 +
 localedata/locales/mg_MG            | 1 +
 localedata/locales/mhr_RU           | 1 +
 localedata/locales/mi_NZ            | 1 +
 localedata/locales/mk_MK            | 2 +-
 localedata/locales/ml_IN            | 1 +
 localedata/locales/mn_MN            | 2 +-
 localedata/locales/mni_IN           | 1 +
 localedata/locales/mr_IN            | 1 +
 localedata/locales/ms_MY            | 1 +
 localedata/locales/mt_MT            | 1 +
 localedata/locales/my_MM            | 2 +-
 localedata/locales/nan_TW           | 1 -
 localedata/locales/nan_TW@latin     | 2 +-
 localedata/locales/nb_NO            | 1 +
 localedata/locales/nds_DE           | 2 +-
 localedata/locales/nds_NL           | 1 +
 localedata/locales/ne_NP            | 1 +
 localedata/locales/nhn_MX           | 1 +
 localedata/locales/niu_NU           | 1 -
 localedata/locales/niu_NZ           | 1 +
 localedata/locales/nl_AW            | 1 +
 localedata/locales/nl_BE            | 1 +
 localedata/locales/nl_NL            | 1 +
 localedata/locales/nn_NO            | 1 +
 localedata/locales/nr_ZA            | 2 --
 localedata/locales/nso_ZA           | 2 --
 localedata/locales/oc_FR            | 2 +-
 localedata/locales/om_ET            | 2 +-
 localedata/locales/om_KE            | 2 +-
 localedata/locales/or_IN            | 1 +
 localedata/locales/os_RU            | 1 +
 localedata/locales/pa_IN            | 1 +
 localedata/locales/pa_PK            | 1 +
 localedata/locales/pap_AW           | 2 +-
 localedata/locales/pap_CW           | 2 +-
 localedata/locales/pl_PL            | 1 +
 localedata/locales/ps_AF            | 2 +-
 localedata/locales/pt_BR            | 1 +
 localedata/locales/pt_PT            | 1 +
 localedata/locales/quz_PE           | 1 +
 localedata/locales/ro_RO            | 3 +--
 localedata/locales/ru_RU            | 1 +
 localedata/locales/ru_UA            | 1 +
 localedata/locales/rw_RW            | 1 +
 localedata/locales/sa_IN            | 1 +
 localedata/locales/sat_IN           | 1 +
 localedata/locales/sc_IT            | 1 +
 localedata/locales/sd_IN            | 1 +
 localedata/locales/sd_IN@devanagari | 1 +
 localedata/locales/se_NO            | 1 +
 localedata/locales/shs_CA           | 1 +
 localedata/locales/si_LK            | 1 +
 localedata/locales/sid_ET           | 2 +-
 localedata/locales/sk_SK            | 1 +
 localedata/locales/sl_SI            | 1 +
 localedata/locales/so_DJ            | 2 +-
 localedata/locales/so_ET            | 2 +-
 localedata/locales/so_KE            | 2 +-
 localedata/locales/so_SO            | 2 +-
 localedata/locales/sq_AL            | 1 +
 localedata/locales/sq_MK            | 2 +-
 localedata/locales/sr_ME            | 2 +-
 localedata/locales/sr_RS            | 3 +--
 localedata/locales/sr_RS@latin      | 2 +-
 localedata/locales/ss_ZA            | 2 --
 localedata/locales/st_ZA            | 2 --
 localedata/locales/sv_SE            | 1 +
 localedata/locales/sw_KE            | 3 +--
 localedata/locales/sw_TZ            | 3 +--
 localedata/locales/szl_PL           | 1 +
 localedata/locales/ta_IN            | 1 +
 localedata/locales/ta_LK            | 1 +
 localedata/locales/tcy_IN           | 1 +
 localedata/locales/te_IN            | 1 +
 localedata/locales/tg_TJ            | 1 +
 localedata/locales/th_TH            | 3 +--
 localedata/locales/the_NP           | 1 +
 localedata/locales/ti_ER            | 2 +-
 localedata/locales/ti_ET            | 2 +-
 localedata/locales/tig_ER           | 2 +-
 localedata/locales/tk_TM            | 1 -
 localedata/locales/tl_PH            | 1 +
 localedata/locales/tn_ZA            | 2 --
 localedata/locales/tr_CY            | 3 +--
 localedata/locales/tr_TR            | 3 +--
 localedata/locales/ts_ZA            | 2 --
 localedata/locales/tt_RU            | 1 +
 localedata/locales/tt_RU@iqtelif    | 1 +
 localedata/locales/ug_CN            | 2 +-
 localedata/locales/uk_UA            | 4 +---
 localedata/locales/unm_US           | 2 +-
 localedata/locales/ur_IN            | 1 +
 localedata/locales/ur_PK            | 1 +
 localedata/locales/uz_UZ            | 2 +-
 localedata/locales/uz_UZ@cyrillic   | 2 +-
 localedata/locales/ve_ZA            | 2 --
 localedata/locales/vi_VN            | 1 +
 localedata/locales/wa_BE            | 2 +-
 localedata/locales/wae_CH           | 4 +---
 localedata/locales/wal_ET           | 2 +-
 localedata/locales/wo_SN            | 1 +
 localedata/locales/xh_ZA            | 2 --
 localedata/locales/yi_US            | 2 +-
 localedata/locales/yo_NG            | 6 +-----
 localedata/locales/yue_HK           | 1 +
 localedata/locales/zh_CN            | 2 +-
 localedata/locales/zh_HK            | 1 +
 localedata/locales/zh_SG            | 1 +
 localedata/locales/zh_TW            | 2 +-
 localedata/locales/zu_ZA            | 2 --
 282 files changed, 265 insertions(+), 153 deletions(-)

diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index edd06948fbdd..5a07053cfd0c 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -148,7 +148,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U0059><U0061><U0062><U0075><U0075><U0074><U0069>"
-country_post  "<U0044><U004A><U0049>"
+country_post "<U0044><U004A>"
 country_ab2   "<U0044><U004A>"
 country_ab3   "<U0044><U004A><U0049>"
 country_num   262
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index 67c9db17c7e7..a33a70eb9af8 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -110,7 +110,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U0045><U0072><U0065><U0074><U0072><U0069><U0061>"
-country_post  "<U0045><U0052><U0049>"
+country_post "<U0045><U0052>"
 country_ab2   "<U0045><U0052>"
 country_ab3   "<U0045><U0052><U0049>"
 country_num   232
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index dd793d409552..de7a1995b68c 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -110,7 +110,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U004F><U0074><U006F><U0062><U0062><U0069><U0061>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA
index 4d9f18d97315..5e039bc4d1d8 100644
--- a/localedata/locales/af_ZA
+++ b/localedata/locales/af_ZA
@@ -247,15 +247,11 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % Country name in Afrikaans - "Suid-Afrika"
 country_name  "<U0053><U0075><U0069><U0064><U002D>/
 <U0041><U0066><U0072><U0069><U006B><U0061>"
+country_post "<U005A><U0041>"
 
 % Language name in Afrikaans - "Afrikaans"
 lang_name     "<U0041><U0066><U0072><U0069><U006B><U0061><U0061><U006E><U0073>"
 
-% CEPT MAILCODES are suggested
-% Alternatively use the code found on your countries postal item tracking number
-% "ZA"
-country_post   "<U005A><U0041>"
-
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
 % http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
 % "ZA"
diff --git a/localedata/locales/ak_GH b/localedata/locales/ak_GH
index a351cc378f93..2386d615158c 100644
--- a/localedata/locales/ak_GH
+++ b/localedata/locales/ak_GH
@@ -179,7 +179,6 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 % Gaana
 country_name "<U0047><U0061><U0061><U006E><U0061>"
-% GH
 country_post "<U0047><U0048>"
 % GH
 country_ab2  "<U0047><U0048>"
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index df16f01289ab..cb68b32ff01e 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -1445,7 +1445,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A2><U1275><U12EE><U1335><U12EB>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
index 0c045c3a47d2..0a258360eeb4 100644
--- a/localedata/locales/an_ES
+++ b/localedata/locales/an_ES
@@ -134,6 +134,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0045><U0053>"
 country_ab2   "<U0045><U0053>"
 country_ab3   "<U0045><U0053><U0050>"
 country_num   724
diff --git a/localedata/locales/anp_IN b/localedata/locales/anp_IN
index 1d954671b2c8..607faa00611c 100644
--- a/localedata/locales/anp_IN
+++ b/localedata/locales/anp_IN
@@ -178,6 +178,7 @@ END LC_NAME
 LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE
index 48a34ed9775b..e26544ec6e2b 100644
--- a/localedata/locales/ar_AE
+++ b/localedata/locales/ar_AE
@@ -181,6 +181,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0625><U0645><U0627><U0631><U0627><U062A><U0020><U0627><U0644><U0639><U0631><U0628><U064A><U0629><U0020><U0627><U0644><U0645><U062A><U062D><U062F><U0629>"
+country_post "<U0041><U0045>"
 country_ab2 "<U0041><U0045>"
 country_ab3 "<U0041><U0052><U0045>"
 country_num 784
diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH
index f89c75da4a74..0a1c59e3b55d 100644
--- a/localedata/locales/ar_BH
+++ b/localedata/locales/ar_BH
@@ -185,6 +185,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0628><U062D><U0631><U064A><U0646>"
+country_post "<U0042><U0048>"
 country_ab2 "<U0042><U0048>"
 country_ab3 "<U0042><U0048><U0052>"
 country_num 048
diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ
index cd7c6c07084c..d47562a9625a 100644
--- a/localedata/locales/ar_DZ
+++ b/localedata/locales/ar_DZ
@@ -184,6 +184,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U062C><U0632><U0627><U0626><U0631>"
+country_post "<U0044><U005A>"
 country_ab2 "<U0044><U005A>"
 country_ab3 "<U0044><U005A><U0041>"
 country_num 012
diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG
index 612b8fa8adb6..a929c9216b29 100644
--- a/localedata/locales/ar_EG
+++ b/localedata/locales/ar_EG
@@ -191,6 +191,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0645><U0635><U0631>"
+country_post "<U0045><U0047>"
 country_ab2 "<U0045><U0047>"
 country_ab3 "<U0045><U0047><U0059>"
 country_num 818
diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN
index 791e63c519e2..f2dc9b9478e7 100644
--- a/localedata/locales/ar_IN
+++ b/localedata/locales/ar_IN
@@ -168,6 +168,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0647><U0646><U062F>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ
index 04ee303acb85..3e8af701fad0 100644
--- a/localedata/locales/ar_IQ
+++ b/localedata/locales/ar_IQ
@@ -184,6 +184,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0639><U0631><U0627><U0642>"
+country_post "<U0049><U0051>"
 country_ab2 "<U0049><U0051>"
 country_ab3 "<U0049><U0052><U0051>"
 country_num 368
diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO
index a3afbf67da9d..5f549e3eb45b 100644
--- a/localedata/locales/ar_JO
+++ b/localedata/locales/ar_JO
@@ -202,6 +202,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0623><U0631><U062F><U0646>"
+country_post "<U004A><U004F>"
 country_ab2 "<U004A><U004F>"
 country_ab3 "<U004A><U004F><U0052>"
 country_num 400
diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW
index 8db77c5f217a..a896693b039a 100644
--- a/localedata/locales/ar_KW
+++ b/localedata/locales/ar_KW
@@ -184,6 +184,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0643><U0648><U064A><U062A>"
+country_post "<U004B><U0057>"
 country_ab2 "<U004B><U0057>"
 country_ab3 "<U004B><U0057><U0054>"
 country_num 414
diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB
index cd3b223b2629..7d58668e3df6 100644
--- a/localedata/locales/ar_LB
+++ b/localedata/locales/ar_LB
@@ -200,6 +200,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0644><U0628><U0646><U0627><U0646>"
+country_post "<U004C><U0042>"
 country_ab2 "<U004C><U0042>"
 country_ab3 "<U004C><U0042><U004E>"
 country_num 422
diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY
index d9b21c468e70..3004cb503a81 100644
--- a/localedata/locales/ar_LY
+++ b/localedata/locales/ar_LY
@@ -184,6 +184,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0644><U064A><U0628><U064A><U0627>"
+country_post "<U004C><U0059>"
 country_ab2 "<U004C><U0059>"
 country_ab3 "<U004C><U0042><U0059>"
 country_num 434
diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA
index d595e0d97927..37cc4543fcdb 100644
--- a/localedata/locales/ar_MA
+++ b/localedata/locales/ar_MA
@@ -184,6 +184,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0645><U063A><U0631><U0628>"
+country_post "<U004D><U0041>"
 country_ab2 "<U004D><U0041>"
 country_ab3 "<U004D><U0041><U0052>"
 country_num 504
diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM
index c6ecf20eae06..054339b45d71 100644
--- a/localedata/locales/ar_OM
+++ b/localedata/locales/ar_OM
@@ -184,6 +184,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0639><U064F><U0645><U0627><U0646>"
+country_post "<U004F><U004D>"
 country_ab2 "<U004F><U004D>"
 country_ab3 "<U004F><U004D><U004E>"
 country_num 512
diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA
index c94bfbbc88fd..a329640001f5 100644
--- a/localedata/locales/ar_QA
+++ b/localedata/locales/ar_QA
@@ -184,6 +184,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0642><U0637><U0631>"
+country_post "<U0051><U0041>"
 country_ab2 "<U0051><U0041>"
 country_ab3 "<U0051><U0041><U0054>"
 country_num 634
diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
index 28f7f50bed3d..629bcab45392 100644
--- a/localedata/locales/ar_SA
+++ b/localedata/locales/ar_SA
@@ -384,6 +384,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0627><U0644><U0645><U0645><U0644><U0643><U0629><U0020><U0627><U0644><U0639><U0631><U0628><U064A><U0629><U0020><U0627><U0644><U0633><U0639><U0648><U062F><U064A><U0629>"
+country_post "<U0053><U0041>"
 country_ab2 "<U0053><U0041>"
 country_ab3 "<U0053><U0041><U0055>"
 country_num 682
diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD
index 91b3ac41626e..10a3fbc4b4d2 100644
--- a/localedata/locales/ar_SD
+++ b/localedata/locales/ar_SD
@@ -190,6 +190,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U0633><U0648><U062F><U0627><U0646>"
+country_post "<U0053><U0044>"
 % SD
 country_ab2 "<U0053><U0044>"
 % SDN
diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS
index 1dbd4d466dd2..2b3fd193b722 100644
--- a/localedata/locales/ar_SS
+++ b/localedata/locales/ar_SS
@@ -188,6 +188,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U062C><U0646><U0648><U0628><U0020><U0627><U0644><U0633><U0648><U062F><U0627><U0646>"
+country_post "<U0053><U0053>"
 % SS
 country_ab2 "<U0053><U0053>"
 % SSD
diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY
index 37edae8eca0c..147a818162d4 100644
--- a/localedata/locales/ar_SY
+++ b/localedata/locales/ar_SY
@@ -201,6 +201,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0633><U0648><U0631><U064A><U0627>"
+country_post "<U0053><U0059>"
 country_ab2 "<U0053><U0059>"
 country_ab3 "<U0053><U0059><U0052>"
 country_num 760
diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN
index 0d288781e2d2..4889fd0dab6c 100644
--- a/localedata/locales/ar_TN
+++ b/localedata/locales/ar_TN
@@ -183,6 +183,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U062A><U0648><U0646><U0633>"
+country_post "<U0054><U004E>"
 country_ab2 "<U0054><U004E>"
 country_ab3 "<U0054><U0055><U004E>"
 country_num 788
diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE
index 1ff05dfabc07..2f91539ecb23 100644
--- a/localedata/locales/ar_YE
+++ b/localedata/locales/ar_YE
@@ -183,6 +183,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0627><U0644><U064A><U0645><U0646>"
+country_post "<U0059><U0045>"
 country_ab2 "<U0059><U0045>"
 country_ab3 "<U0059><U0045><U004D>"
 country_num 887
diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN
index ae2e466eec44..26e3708b75f2 100644
--- a/localedata/locales/as_IN
+++ b/localedata/locales/as_IN
@@ -167,6 +167,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U09AD><U09BE><U09F0><U09A4>"
+country_post "<U0049><U004E>"
 % IND
 country_car  "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ast_ES b/localedata/locales/ast_ES
index 6a20eebafaf4..048ffe359437 100644
--- a/localedata/locales/ast_ES
+++ b/localedata/locales/ast_ES
@@ -143,6 +143,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U0073><U0070><U0061><U00F1><U0061>"
+country_post "<U0045><U0053>"
 country_ab2   "<U0045><U0053>"
 country_ab3   "<U0045><U0053><U0050>"
 country_num   724
diff --git a/localedata/locales/ayc_PE b/localedata/locales/ayc_PE
index 5664b0e33522..88d5a3df62be 100644
--- a/localedata/locales/ayc_PE
+++ b/localedata/locales/ayc_PE
@@ -177,6 +177,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0050><U0045>"
 country_ab2   "<U0050><U0045>"
 country_ab3   "<U0050><U0045><U0052>"
 country_num   604
diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
index 3c12d4813e7f..3465e6a8ff7f 100644
--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@@ -295,6 +295,7 @@ LC_ADDRESS
 % FIXME
 postal_fmt "???"
 country_name "<U0041><U007A><U0259><U0072><U0062><U0061><U0079><U0063><U0061><U006E>"
+country_post "<U0041><U005A>"
 country_ab2 "<U0041><U005A>"
 country_ab3 "<U0041><U005A><U0045>"
 country_num 031
diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY
index 141002be90da..57a7c9b2d320 100644
--- a/localedata/locales/be_BY
+++ b/localedata/locales/be_BY
@@ -179,6 +179,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0411><U0435><U043B><U0430><U0440><U0443><U0441><U044C>"
+country_post "<U0042><U0059>"
 country_ab2 "<U0042><U0059>"
 country_ab3 "<U0042><U004C><U0052>"
 country_num 112
diff --git a/localedata/locales/be_BY@latin b/localedata/locales/be_BY@latin
index b603f2289c5e..a88b7b1a6497 100644
--- a/localedata/locales/be_BY@latin
+++ b/localedata/locales/be_BY@latin
@@ -144,6 +144,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0042><U0059>"
 country_ab2 "<U0042><U0059>"
 country_ab3 "<U0042><U004C><U0052>"
 country_num 112
diff --git a/localedata/locales/bem_ZM b/localedata/locales/bem_ZM
index e01b5a734b6f..a9cd32c1b22c 100644
--- a/localedata/locales/bem_ZM
+++ b/localedata/locales/bem_ZM
@@ -176,8 +176,7 @@ postal_fmt  "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U00
 <U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 % Zambia
 country_name  "<U005A><U0061><U006D><U0062><U0069><U0061>"
-% ZM
-country_post  "<U005A><U004D>"
+country_post "<U005A><U004D>"
 % ZM
 country_ab2   "<U005A><U004D>"
 % ZMB
diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ
index d00269daa632..37f4246084e6 100644
--- a/localedata/locales/ber_DZ
+++ b/localedata/locales/ber_DZ
@@ -288,7 +288,7 @@ LC_ADDRESS
 % LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
-%country_post ""
+country_post "<U0044><U005A>"
 country_ab2 "<U0044><U005A>"
 country_ab3 "<U0044><U005A><U0041>"
 country_num 012
diff --git a/localedata/locales/ber_MA b/localedata/locales/ber_MA
index 80dddffe9a62..d2d3449899db 100644
--- a/localedata/locales/ber_MA
+++ b/localedata/locales/ber_MA
@@ -208,7 +208,7 @@ LC_ADDRESS
 % LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
-%country_post ""
+country_post "<U004D><U0041>"
 country_ab2 "<U004D><U0041>"
 country_ab3 "<U004D><U0041><U0052>"
 country_num 504
diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN
index 49b1cbe2a470..ac52b9da0939 100644
--- a/localedata/locales/bhb_IN
+++ b/localedata/locales/bhb_IN
@@ -161,6 +161,7 @@ LC_ADDRESS
 % This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_car "<U0049><U004E><U0044>"
diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN
index 6b383b27bcc6..732f9af6feff 100644
--- a/localedata/locales/bho_IN
+++ b/localedata/locales/bho_IN
@@ -157,6 +157,7 @@ END LC_NAME
 LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index fca2980f81d9..ba59bf317f41 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -183,6 +183,7 @@ END LC_NAME
 LC_ADDRESS
 postal_fmt      "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0068><U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U0054><U0020><U0025><U007A><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name    "<U09AC><U09BE><U0982><U09B2><U09BE><U09A6><U09C7><U09B6>"
+country_post "<U0042><U0044>"
 country_ab2     "<U0042><U0044>"
 country_ab3     "<U0042><U0047><U0044>"
 % bn
@@ -194,8 +195,6 @@ lang_lib       "<U0062><U0065><U006E>"
 %lang_ab3_term   "ben"
 % ààààà
 lang_name    "<U09AC><U09BE><U0982><U09B2><U09BE>"
-% todo
-%country_post   ""
 country_num     050
 % BD
 country_car    "<U0042><U0044>"
diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
index 41fb04eb759c..659b2cde0744 100644
--- a/localedata/locales/bn_IN
+++ b/localedata/locales/bn_IN
@@ -186,6 +186,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U09AD><U09BE><U09B0><U09A4>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
index a61961836cfe..b1b3579060a2 100644
--- a/localedata/locales/bo_CN
+++ b/localedata/locales/bo_CN
@@ -166,6 +166,7 @@ LC_ADDRESS
 % %c%N%T%N%s %h %e %r%N%b%N%d%N%f%N%a%N
 postal_fmt   "<U0025><U0063><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>"
 country_name "<U0F62><U0F92><U0FB1><U0F0B><U0F53><U0F42>"
+country_post "<U0043><U004E>"
 country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN
index d255ab4800d1..4bfddaedbb50 100644
--- a/localedata/locales/bo_IN
+++ b/localedata/locales/bo_IN
@@ -91,6 +91,7 @@ LC_ADDRESS
 % %z%c%T%s%b%e%r
 postal_fmt "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0F62><U0F92><U0FB1><U0F0B><U0F42><U0F62><U0F0B>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
index 3444cde92f12..bab9bc276516 100644
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@@ -170,6 +170,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0046><U0072><U0061><U00F1><U0073>"
+country_post "<U0046><U0052>"
 country_ab2 "<U0046><U0052>"
 country_ab3 "<U0046><U0052><U0041>"
 country_num 250
diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN
index f2ef8bd39c08..a21be394e0c3 100644
--- a/localedata/locales/brx_IN
+++ b/localedata/locales/brx_IN
@@ -171,6 +171,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U092D><U093E><U0930><U0924>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index a47f87eb373d..6d375b5e3d0a 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -239,6 +239,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U006F><U0073><U006E><U0061><U0020><U0069><U0020><U0048><U0065><U0072><U0063><U0065><U0067><U006F><U0076><U0069><U006E><U0061>"
+country_post "<U0042><U0041>"
 country_ab2 "<U0042><U0041>"
 country_ab3 "<U0042><U0049><U0048>"
 country_num 070
diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
index dad0d0035bd2..e18d55fd3565 100644
--- a/localedata/locales/byn_ER
+++ b/localedata/locales/byn_ER
@@ -121,7 +121,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A4><U122D><U1275><U122B>"
-country_post  "<U0045><U0052><U0049>"
+country_post "<U0045><U0052>"
 country_ab2   "<U0045><U0052>"
 country_ab3   "<U0045><U0052><U0049>"
 country_num   232
diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD
index 77c40471e9d4..540ca1067b58 100644
--- a/localedata/locales/ca_AD
+++ b/localedata/locales/ca_AD
@@ -94,6 +94,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0041><U006E><U0064><U006F><U0072><U0072><U0061>"
+country_post "<U0041><U0044>"
 country_ab2 "<U0041><U0044>"
 country_ab3 "<U0041><U004E><U0044>"
 country_num 020
diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index e74c3c316b9b..d391fcb0a884 100644
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -171,6 +171,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U0073><U0070><U0061><U006E><U0079><U0061>"
+country_post "<U0045><U0053>"
 country_ab2 "<U0045><U0053>"
 country_ab3 "<U0045><U0053><U0050>"
 country_num 724
diff --git a/localedata/locales/ca_FR b/localedata/locales/ca_FR
index 1107ae1f2f3a..eec9a64e33c4 100644
--- a/localedata/locales/ca_FR
+++ b/localedata/locales/ca_FR
@@ -92,6 +92,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0046><U0072><U0061><U006E><U00E7><U0061>"
+country_post "<U0046><U0052>"
 country_ab2 "<U0046><U0052>"
 country_ab3 "<U0046><U0052><U0041>"
 country_num 250
diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT
index c4f816fc0a3f..f039a37d9a02 100644
--- a/localedata/locales/ca_IT
+++ b/localedata/locales/ca_IT
@@ -92,6 +92,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0049><U0074><U00E0><U006C><U0069><U0061>"
+country_post "<U0049><U0054>"
 country_ab2 "<U0049><U0054>"
 country_ab3 "<U0049><U0054><U0041>"
 country_num 380
diff --git a/localedata/locales/ce_RU b/localedata/locales/ce_RU
index 2a8487a5f35c..a48033b80ab1 100644
--- a/localedata/locales/ce_RU
+++ b/localedata/locales/ce_RU
@@ -148,6 +148,7 @@ LC_ADDRESS
 % %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N
 postal_fmt   "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0420><U043E><U0441><U0441><U0438>"
+country_post "<U0052><U0055>"
 % RU
 country_ab2  "<U0052><U0055>"
 % RUS
diff --git a/localedata/locales/chr_US b/localedata/locales/chr_US
index 1fa25fbd93f3..e20212f19f6f 100644
--- a/localedata/locales/chr_US
+++ b/localedata/locales/chr_US
@@ -120,7 +120,7 @@ postal_fmt "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U13A0><U13B9><U13F0><U13DF>"
-country_post "<U0055><U0053><U0041>"
+country_post "<U0055><U0053>"
 country_ab2  "<U0055><U0053>"
 country_ab3  "<U0055><U0053><U0041>"
 country_num  840
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index b35abc462ba3..fb7e07e4849e 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -193,7 +193,6 @@ LC_ADDRESS
 postal_fmt   "<U0025><U0063><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>"
 % äèæå
 country_name "<U4E2D><U83EF><U6C11><U570B>"
-% TW
 country_post "<U0054><U0057>"
 % TW
 country_ab2  "<U0054><U0057>"
diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA
index 7da13f76062e..ad6b20930933 100644
--- a/localedata/locales/crh_UA
+++ b/localedata/locales/crh_UA
@@ -28,7 +28,7 @@ contact		"Re<U015F>at SABIQ"
 email		"tilde.birlik@gmail.com"
 tel		""
 fax		""
-language	"Crimean Tatar"
+language "Crimean Turkish"
 territory	"Ukraine"
 revision	"0.4"
 date		"2009-08-16"
@@ -222,6 +222,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0055><U0041>"
 country_ab2 "<U0055><U0041>"
 country_ab3 "<U0055><U004B><U0052>"
 country_num 804
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 7a278e4186c1..c00c4963b6a9 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -2489,7 +2489,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U010C><U0065><U0073><U006B><U00E1><U0020><U0072><U0065><U0070><U0075><U0062><U006C><U0069><U006B><U0061>"
-country_post  "<U0043><U005A>"
+country_post "<U0043><U005A>"
 country_ab2   "<U0043><U005A>"
 country_ab3   "<U0043><U005A><U0045>"
 country_num   203
diff --git a/localedata/locales/csb_PL b/localedata/locales/csb_PL
index 3479dc589b9a..7acdfd60749f 100644
--- a/localedata/locales/csb_PL
+++ b/localedata/locales/csb_PL
@@ -208,6 +208,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0050><U004C>"
 country_ab2 "<U0050><U004C>"
 country_ab3 "<U0050><U004F><U004C>"
 country_num 616
diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU
index aa92b8823daf..d02a006ac4e0 100644
--- a/localedata/locales/cv_RU
+++ b/localedata/locales/cv_RU
@@ -239,6 +239,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0052><U0055>"
 country_ab2 "<U0052><U0055>"
 country_ab3 "<U0052><U0055><U0053>"
 country_num 643
diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index cc05c209cf08..906ee9d6b9ae 100644
--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@@ -41,7 +41,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0059><U0020><U0044><U0065><U0079><U0072><U006E><U0061><U0073><U0020><U0055><U006E><U0065><U0064><U0069><U0067>"
-% FIXME country_post MAIL_CEPTCODE for country. 'GB' ?
+country_post "<U0047><U0042>"
 country_ab2 "<U0047><U0042>"
 country_ab3 "<U0047><U0042><U0052>"
 country_num 826
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index 95bf3092f241..26ed5d18b2b0 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -263,6 +263,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0044><U0061><U006E><U006D><U0061><U0072><U006B>"
+country_post "<U0044><U004B>"
 country_ab2 "<U0044><U004B>"
 country_ab3 "<U0044><U004E><U004B>"
 country_num 208
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index 7562820f1825..bf9a16c32472 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U00D6><U0073><U0074><U0065><U0072><U0072><U0065><U0069><U0063><U0068>"
+country_post "<U0041><U0054>"
 country_ab2 "<U0041><U0054>"
 country_ab3 "<U0041><U0055><U0054>"
 country_num 040
diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 896e4416b170..fbe82c19b5ac 100644
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -148,6 +148,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U0065><U006C><U0067><U0069><U0065><U006E>"
+country_post "<U0042><U0045>"
 country_ab2 "<U0042><U0045>"
 country_ab3 "<U0042><U0045><U004C>"
 country_num 056
diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH
index 6d400f2ad00d..f1fe4d15d890 100644
--- a/localedata/locales/de_CH
+++ b/localedata/locales/de_CH
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0053><U0063><U0068><U0077><U0065><U0069><U007A>"
+country_post "<U0043><U0048>"
 country_ab2 "<U0043><U0048>"
 country_ab3 "<U0043><U0048><U0045>"
 country_num 756
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index 8d6b4d31fbe4..a6d6cba3b872 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -196,7 +196,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U0044><U0065><U0075><U0074><U0073><U0063><U0068><U006C>/
 <U0061><U006E><U0064>"
-country_post  "<U0044>"
+country_post "<U0044><U0045>"
 country_ab2   "<U0044><U0045>"
 country_ab3   "<U0044><U0045><U0055>"
 country_num   276
diff --git a/localedata/locales/de_IT b/localedata/locales/de_IT
index ba5d23571b70..82b519e05cb4 100644
--- a/localedata/locales/de_IT
+++ b/localedata/locales/de_IT
@@ -132,6 +132,7 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0049><U0074><U0061><U006C><U0069><U0065><U006E>"
+country_post "<U0049><U0054>"
 country_ab2 "<U0049><U0054>"
 country_ab3 "<U0049><U0054><U0041>"
 country_num 380
diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index 54444776b662..e151c7a8202b 100644
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -150,6 +150,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004C><U0075><U0078><U0065><U006D><U0062><U0075><U0072><U0067>"
+country_post "<U004C><U0055>"
 country_ab2 "<U004C><U0055>"
 country_ab3 "<U004C><U0055><U0058>"
 country_num 442
diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
index 3e6590c9dce0..83e925e6bf08 100644
--- a/localedata/locales/doi_IN
+++ b/localedata/locales/doi_IN
@@ -166,6 +166,7 @@ END LC_NAME
 LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV
index 6fee118e7d5c..ca5369e55a11 100644
--- a/localedata/locales/dv_MV
+++ b/localedata/locales/dv_MV
@@ -183,6 +183,7 @@ 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>"
+country_post "<U004D><U0056>"
 country_num 462
 country_car "<U004D><U0056>"
 % lang_name FIXME
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index d89989eda998..02443b224c79 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -658,8 +658,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U0073><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0053>/
 <U0025><U004E><U0025><U007A><U0025><U0063><U0025><U004E>"
 country_name "<U0F60><U0F56><U0FB2><U0F74><U0F42>"
-%FIXME
-%country_post  ""
+country_post "<U0042><U0054>"
 country_ab2 "<U0042><U0054>"
 country_ab3 "<U0042><U0054><U004E>"
 country_num 064
diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY
index d75e911149c4..78ddbb58e2f4 100644
--- a/localedata/locales/el_CY
+++ b/localedata/locales/el_CY
@@ -141,6 +141,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U039A><U03CD><U03C0><U03C1><U03BF><U03C2>"
+country_post "<U0043><U0059>"
 country_ab2 "<U0043><U0059>"
 country_ab3 "<U0043><U0059><U0050>"
 country_num 196
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index de2afe1c6998..f3f7dc5bda68 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -177,6 +177,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0395><U03BB><U03BB><U03AC><U03B4><U03B1>"
+country_post "<U0047><U0052>"
 country_ab2 "<U0047><U0052>"
 country_ab3 "<U0047><U0052><U0043>"
 country_num 300
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index c3ba88f8a26a..d77ece754dd6 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -128,6 +128,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_name "<U0041><U006E><U0074><U0069><U0067><U0075><U0061><U0020><U0026><U0020><U0042><U0061><U0072><U0062><U0075><U0064><U0061>"
+country_post "<U0041><U0047>"
 country_ab2   "<U0041><U0047>"
 country_ab3   "<U0041><U0054><U0047>"
 country_num 028
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index d64cb94569d9..379d5091769b 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -152,6 +152,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0041><U0075><U0073><U0074><U0072><U0061><U006C><U0069><U0061>"
+country_post "<U0041><U0055>"
 country_ab2 "<U0041><U0055>"
 country_ab3 "<U0041><U0055><U0053>"
 country_num 036
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
index 7aadb547bd1f..81f7fdbf73aa 100644
--- a/localedata/locales/en_BW
+++ b/localedata/locales/en_BW
@@ -112,6 +112,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U006F><U0074><U0073><U0077><U0061><U006E><U0061>"
+country_post "<U0042><U0057>"
 country_ab2 "<U0042><U0057>"
 country_ab3 "<U0042><U0057><U0041>"
 country_num 072
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index 820676573a07..14d4da85c286 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -177,6 +177,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0043><U0061><U006E><U0061><U0064><U0061>"
+country_post "<U0043><U0041>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"
 country_num 124
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index 351c84b7fa7f..f5c6949ecacb 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -158,6 +158,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0044><U0065><U006E><U006D><U0061><U0072><U006B>"
+country_post "<U0044><U004B>"
 country_ab2 "<U0044><U004B>"
 country_ab3 "<U0044><U004E><U004B>"
 country_num 208
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index f0f94b90f812..1b8a4efaa6db 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -160,6 +160,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0055><U006E><U0069><U0074><U0065><U0064><U0020><U004B><U0069><U006E><U0067><U0064><U006F><U006D>"
+country_post "<U0047><U0042>"
 country_ab2   "<U0047><U0042>"
 country_ab3   "<U0047><U0042><U0052>"
 country_num   826
diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
index a02f8b95cbdd..02e77fd84358 100644
--- a/localedata/locales/en_HK
+++ b/localedata/locales/en_HK
@@ -174,6 +174,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0048><U006F><U006E><U0067><U0020><U004B><U006F><U006E><U0067><U0020><U0053><U0041><U0052><U0020><U0043><U0068><U0069><U006E><U0061>"
+country_post "<U0048><U004B>"
 country_ab2   "<U0048><U004B>"
 country_ab3   "<U0048><U004B><U0047>"
 country_num   344
diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE
index c300a3f8bca7..294e76eb174b 100644
--- a/localedata/locales/en_IE
+++ b/localedata/locales/en_IE
@@ -149,6 +149,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0049><U0072><U0065><U006C><U0061><U006E><U0064>"
+country_post "<U0049><U0045>"
 country_ab2   "<U0049><U0045>"
 country_ab3   "<U0049><U0052><U004C>"
 country_num   372
diff --git a/localedata/locales/en_IL b/localedata/locales/en_IL
index 5896aaab82ab..fa35d7a447fb 100644
--- a/localedata/locales/en_IL
+++ b/localedata/locales/en_IL
@@ -113,7 +113,7 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0049><U0073><U0072><U0061><U0065><U006C>"
-country_post "<U0049><U0053><U0052>"
+country_post "<U0049><U004C>"
 country_ab2  "<U0049><U004C>"
 country_ab3  "<U0049><U0053><U0052>"
 country_num  376
diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN
index 933a41ccd093..dad719361b94 100644
--- a/localedata/locales/en_IN
+++ b/localedata/locales/en_IN
@@ -173,6 +173,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0049><U006E><U0064><U0069><U0061>"
+country_post "<U0049><U004E>"
 country_ab2   "<U0049><U004E>"
 country_ab3   "<U0049><U004E><U0044>"
 country_num   356
diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG
index 1d58d2d14122..b09ae44feeba 100644
--- a/localedata/locales/en_NG
+++ b/localedata/locales/en_NG
@@ -238,15 +238,11 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 
 % Country name in English - "Nigeria"
 country_name  "<U004E><U0069><U0067><U0065><U0072><U0069><U0061>"
+country_post "<U004E><U0047>"
 
 % Language name in English - "English"
 lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
 
-% CEPT MAILCODES are suggested
-% Alternatively use the code found on your countries postal item tracking number
-% "NG"?
-%country_post   "<U004E><U0047>"
-
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
 % http://www.unece.org/trans/conventn/Distsigns_Sept2003.pdf
 % "WAN"
diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ
index d5d8edad91c2..5d79ec2f2b45 100644
--- a/localedata/locales/en_NZ
+++ b/localedata/locales/en_NZ
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004E><U0065><U0077><U0020><U005A><U0065><U0061><U006C><U0061><U006E><U0064>"
+country_post "<U004E><U005A>"
 country_ab2   "<U004E><U005A>"
 country_ab3   "<U004E><U005A><U004C>"
 country_num   554
diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH
index 865248ee6715..f28a72acd2cb 100644
--- a/localedata/locales/en_PH
+++ b/localedata/locales/en_PH
@@ -175,6 +175,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0050><U0068><U0069><U006C><U0069><U0070><U0070><U0069><U006E><U0065><U0073>"
+country_post "<U0050><U0048>"
 country_ab2 "<U0050><U0048>"
 country_ab3 "<U0050><U0048><U004C>"
 country_num 608
diff --git a/localedata/locales/en_SG b/localedata/locales/en_SG
index 348ec7c2612d..3ab381a065b0 100644
--- a/localedata/locales/en_SG
+++ b/localedata/locales/en_SG
@@ -173,6 +173,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0053><U0069><U006E><U0067><U0061><U0070><U006F><U0072><U0065>"
+country_post "<U0053><U0047>"
 country_ab2   "<U0053><U0047>"
 country_ab3   "<U0053><U0047><U0050>"
 country_num   702
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index 5345fc37cd6e..ec7222be1e0d 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -159,7 +159,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0055><U006E><U0069><U0074><U0065><U0064><U0020><U0053><U0074><U0061><U0074><U0065><U0073>"
-country_post  "<U0055><U0053><U0041>"
+country_post "<U0055><U0053>"
 country_ab2   "<U0055><U0053>"
 country_ab3   "<U0055><U0053><U0041>"
 country_num   840
diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA
index 2ed2c250046c..9d0468336b02 100644
--- a/localedata/locales/en_ZA
+++ b/localedata/locales/en_ZA
@@ -303,15 +303,11 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % Country name in English - "South Africa"
 country_name  "<U0053><U006F><U0075><U0074><U0068><U0020>/
 <U0041><U0066><U0072><U0069><U0063><U0061>"
+country_post "<U005A><U0041>"
 
 % Language name in English - "English"
 lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
 
-% CEPT MAILCODES are suggested
-% Alternatively use the code found on your countries postal item tracking number
-% "ZA"
-country_post   "<U005A><U0041>"
-
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
 % http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
 % "ZA"
diff --git a/localedata/locales/en_ZM b/localedata/locales/en_ZM
index ee7847bd89d2..15e4474f2d86 100644
--- a/localedata/locales/en_ZM
+++ b/localedata/locales/en_ZM
@@ -122,8 +122,7 @@ postal_fmt  "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U00
 <U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 % Zambia
 country_name  "<U005A><U0061><U006D><U0062><U0069><U0061>"
-% ZM
-country_post  "<U005A><U004D>"
+country_post "<U005A><U004D>"
 % ZM
 country_ab2   "<U005A><U004D>"
 % ZMB
diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW
index 4266276ba02c..f569fd989ad6 100644
--- a/localedata/locales/en_ZW
+++ b/localedata/locales/en_ZW
@@ -111,6 +111,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U005A><U0069><U006D><U0062><U0061><U0062><U0077><U0065>"
+country_post "<U005A><U0057>"
 country_ab2   "<U005A><U0057>"
 country_ab3   "<U005A><U0057><U0045>"
 country_num   716
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index 263e1315ff54..0fe64b2ae3bc 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -152,6 +152,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0041><U0072><U0067><U0065><U006E><U0074><U0069><U006E><U0061>"
+country_post "<U0041><U0052>"
 country_ab2   "<U0041><U0052>"
 country_ab3   "<U0041><U0052><U0047>"
 country_num   032
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index 81489a7a7b64..f7f650b7b2b8 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U006F><U006C><U0069><U0076><U0069><U0061>"
+country_post "<U0042><U004F>"
 country_ab2   "<U0042><U004F>"
 country_ab3   "<U0042><U004F><U004C>"
 country_num   068
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index a370715d919a..49c4297c88cd 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0043><U0068><U0069><U006C><U0065>"
+country_post "<U0043><U004C>"
 country_ab2   "<U0043><U004C>"
 country_ab3   "<U0043><U0048><U004C>"
 country_num   152
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index f67f553058cc..7a1b54322a3e 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -152,6 +152,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0043><U006F><U006C><U006F><U006D><U0062><U0069><U0061>"
+country_post "<U0043><U004F>"
 country_ab2   "<U0043><U004F>"
 country_ab3   "<U0043><U004F><U004C>"
 country_num   170
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index a80e494e9b83..2d2d9f1fb05a 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -156,7 +156,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U0043><U006F><U0073><U0074><U0061><U0020><U0052><U0069><U0063><U0061>"
-country_post  "<U0043><U0052>"
+country_post "<U0043><U0052>"
 country_car   "<U0043><U0052>"
 country_isbn  "9930,9977,9968"
 country_ab2   "<U0043><U0052>"
diff --git a/localedata/locales/es_CU b/localedata/locales/es_CU
index bde7f2d95e95..e1c700d9bd18 100644
--- a/localedata/locales/es_CU
+++ b/localedata/locales/es_CU
@@ -155,6 +155,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0043><U0075><U0062><U0061>"
+country_post "<U0043><U0055>"
 country_ab2   "<U0043><U0055>"
 country_ab3   "<U0043><U0055><U0042>"
 country_num   192
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index d217acca4b90..e2e809245465 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -152,6 +152,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0052><U0065><U0070><U00FA><U0062><U006C><U0069><U0063><U0061><U0020><U0044><U006F><U006D><U0069><U006E><U0069><U0063><U0061><U006E><U0061>"
+country_post "<U0044><U004F>"
 country_ab2   "<U0044><U004F>"
 country_ab3   "<U0044><U004F><U004D>"
 country_num   214
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index 182e57d820cc..165800308885 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U0063><U0075><U0061><U0064><U006F><U0072>"
+country_post "<U0045><U0043>"
 country_ab2   "<U0045><U0043>"
 country_ab3   "<U0045><U0043><U0055>"
 country_num   218
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index 4424f29f9ccf..fb8cc50382ff 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -160,6 +160,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U0073><U0070><U0061><U00F1><U0061>"
+country_post "<U0045><U0053>"
 country_ab2   "<U0045><U0053>"
 country_ab3   "<U0045><U0053><U0050>"
 country_num   724
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index a5c11776b784..e13a4e8963ea 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -152,6 +152,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0047><U0075><U0061><U0074><U0065><U006D><U0061><U006C><U0061>"
+country_post "<U0047><U0054>"
 country_ab2   "<U0047><U0054>"
 country_ab3   "<U0047><U0054><U004D>"
 country_num   320
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 8fcbfbea12bc..04c6b8e5c065 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -152,6 +152,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0048><U006F><U006E><U0064><U0075><U0072><U0061><U0073>"
+country_post "<U0048><U004E>"
 country_ab2   "<U0048><U004E>"
 country_ab3   "<U0048><U004E><U0044>"
 country_num   340
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index e7dd44062c42..5c5052d0da31 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004D><U00E9><U0078><U0069><U0063><U006F>"
+country_post "<U004D><U0058>"
 country_ab2   "<U004D><U0058>"
 country_ab3   "<U004D><U0045><U0058>"
 country_num   484
diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
index 35b2581d0c55..8c80f4994416 100644
--- a/localedata/locales/es_NI
+++ b/localedata/locales/es_NI
@@ -144,6 +144,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004E><U0069><U0063><U0061><U0072><U0061><U0067><U0075><U0061>"
+country_post "<U004E><U0049>"
 country_ab2   "<U004E><U0049>"
 country_ab3   "<U004E><U0049><U0043>"
 country_num   558
diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index de3871cf65d4..ebd2618eca77 100644
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0050><U0061><U006E><U0061><U006D><U00E1>"
+country_post "<U0050><U0041>"
 country_ab2   "<U0050><U0041>"
 country_ab3   "<U0050><U0041><U004E>"
 country_num   591
diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index b94a1be76367..8684e2f7c591 100644
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -150,6 +150,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0050><U0065><U0072><U00FA>"
+country_post "<U0050><U0045>"
 country_ab2   "<U0050><U0045>"
 country_ab3   "<U0050><U0045><U0052>"
 country_num   604
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index 20d83d21790b..9355decde147 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -143,6 +143,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0050><U0075><U0065><U0072><U0074><U006F><U0020><U0052><U0069><U0063><U006F>"
+country_post "<U0050><U0052>"
 country_ab2   "<U0050><U0052>"
 country_ab3   "<U0050><U0052><U0049>"
 country_num   630
diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index c60900243d12..ead9348dce38 100644
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -149,6 +149,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0050><U0061><U0072><U0061><U0067><U0075><U0061><U0079>"
+country_post "<U0050><U0059>"
 country_ab2   "<U0050><U0059>"
 country_ab3   "<U0050><U0052><U0059>"
 country_num   600
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index 692b2bdce629..efaaae634954 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -152,6 +152,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U006C><U0020><U0053><U0061><U006C><U0076><U0061><U0064><U006F><U0072>"
+country_post "<U0053><U0056>"
 country_ab2   "<U0053><U0056>"
 country_ab3   "<U0053><U004C><U0056>"
 country_num   222
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index 311c7bb8cb68..1cff382da781 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -203,7 +203,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U0073><U0074><U0061><U0064><U006F><U0073><U0020><U0055><U006E><U0069><U0064><U006F><U0073>"
-country_post  "<U0055><U0053><U0041>"
+country_post "<U0055><U0053>"
 country_ab2   "<U0055><U0053>"
 country_ab3   "<U0055><U0053><U0041>"
 country_num   840
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index 5cdc26ddb20a..faa2a370eba7 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -150,6 +150,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0055><U0072><U0075><U0067><U0075><U0061><U0079>"
+country_post "<U0055><U0059>"
 country_ab2   "<U0055><U0059>"
 country_ab3   "<U0055><U0052><U0059>"
 country_num   858
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index e1292b0033a6..e84907af798c 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -151,6 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0056><U0065><U006E><U0065><U007A><U0075><U0065><U006C><U0061>"
+country_post "<U0056><U0045>"
 country_ab2   "<U0056><U0045>"
 country_ab3   "<U0056><U0045><U004E>"
 country_num   862
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index 096cdd5fa4a2..bab903c28fa1 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -2237,7 +2237,7 @@ postal_fmt      "<U0025><U0061><U0025><U004E>/
 		 <U0025><U0043><U002D><U0025><U007A><U0020><U0025><U0054><U0025><U004E>/
 		 <U0025><U0063><U0025><U004E>"
 country_name    "<U0045><U0065><U0073><U0074><U0069>"
-country_post    "<U0045><U0045>"
+country_post "<U0045><U0045>"
 country_ab2     "<U0045><U0045>"
 country_ab3     "<U0045><U0053><U0054>"
 country_num     233
diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
index d6322bcdfa8a..d67aa6b16918 100644
--- a/localedata/locales/eu_ES
+++ b/localedata/locales/eu_ES
@@ -165,6 +165,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U0073><U0070><U0061><U0069><U006E><U0069><U0061>"
+country_post "<U0045><U0053>"
 country_ab2 "<U0045><U0053>"
 country_ab3 "<U0045><U0053><U0050>"
 country_num 724
diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR
index c5a22c4b87b7..c352379efc14 100644
--- a/localedata/locales/fa_IR
+++ b/localedata/locales/fa_IR
@@ -472,6 +472,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name   "<U0627><U06CC><U0631><U0627><U0646>"
+country_post "<U0049><U0052>"
 country_ab2    "<U0049><U0052>"
 country_ab3    "<U0049><U0052><U004E>"
 country_num    364
diff --git a/localedata/locales/ff_SN b/localedata/locales/ff_SN
index 7a195190c69a..6f80fb0a7ca0 100644
--- a/localedata/locales/ff_SN
+++ b/localedata/locales/ff_SN
@@ -175,8 +175,7 @@ postal_fmt  "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U00
 <U0053><U0020><U0025><U007A><U0025><U004E><U0025><U0063><U0025><U004E>"
 % Senegaal
 country_name  "<U0053><U0065><U006E><U0065><U0067><U0061><U0061><U006C>"
-% SN
-country_post  "<U0053><U004E>"
+country_post "<U0053><U004E>"
 % SN
 country_ab2  "<U0053><U004E>"
 % SEN
diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH
index 7c5e23fef3fb..617f694fbbb3 100644
--- a/localedata/locales/fil_PH
+++ b/localedata/locales/fil_PH
@@ -185,6 +185,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0050><U0069><U006C><U0069><U0070><U0069><U006E><U0061><U0073>"
+country_post "<U0050><U0048>"
 country_ab2 "<U0050><U0048>"
 country_ab3 "<U0050><U0048><U004C>"
 country_num 608
diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO
index 3e4148c2a136..78b9e3295765 100644
--- a/localedata/locales/fo_FO
+++ b/localedata/locales/fo_FO
@@ -141,6 +141,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0046><U00F8><U0072><U006F><U0079><U0061><U0072>"
+country_post "<U0046><U004F>"
 country_ab2 "<U0046><U004F>"
 country_ab3 "<U0046><U0052><U004F>"
 country_num 234
diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index 09f252315823..484896b899c6 100644
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -156,6 +156,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U0065><U006C><U0067><U0069><U0071><U0075><U0065>"
+country_post "<U0042><U0045>"
 country_ab2 "<U0042><U0045>"
 country_ab3 "<U0042><U0045><U004C>"
 country_num 056
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index bbab33ab0648..d39c836caaa8 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -146,6 +146,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0043><U0061><U006E><U0061><U0064><U0061>"
+country_post "<U0043><U0041>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"
 country_num 124
diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
index 12a05bc266e9..92a3ca2ebe6e 100644
--- a/localedata/locales/fr_CH
+++ b/localedata/locales/fr_CH
@@ -138,6 +138,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0053><U0075><U0069><U0073><U0073><U0065>"
+country_post "<U0043><U0048>"
 country_ab2 "<U0043><U0048>"
 country_ab3 "<U0043><U0048><U0045>"
 country_num 756
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index 2f944de76d64..a7267fde2b1b 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -176,6 +176,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0046><U0072><U0061><U006E><U0063><U0065>"
+country_post "<U0046><U0052>"
 country_ab2 "<U0046><U0052>"
 country_ab3 "<U0046><U0052><U0041>"
 country_num 250
diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
index 6b104a9ee6f0..615354e3e7dd 100644
--- a/localedata/locales/fr_LU
+++ b/localedata/locales/fr_LU
@@ -154,6 +154,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004C><U0075><U0078><U0065><U006D><U0062><U006F><U0075><U0072><U0067>"
+country_post "<U004C><U0055>"
 country_ab2 "<U004C><U0055>"
 country_ab3 "<U004C><U0055><U0058>"
 country_num 442
diff --git a/localedata/locales/fur_IT b/localedata/locales/fur_IT
index edc555a4e9f6..82ea0d7a6bd0 100644
--- a/localedata/locales/fur_IT
+++ b/localedata/locales/fur_IT
@@ -141,6 +141,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0049><U0074><U0061><U006C><U0069><U0065>"
+country_post "<U0049><U0054>"
 country_ab2 "<U0049><U0054>"
 country_ab3 "<U0049><U0054><U0041>"
 country_num 380
diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE
index 56af7f9fd1db..84174f25475f 100644
--- a/localedata/locales/fy_DE
+++ b/localedata/locales/fy_DE
@@ -43,7 +43,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
-country_post  "<U0044>"
+country_post "<U0044><U0045>"
 country_ab2   "<U0044><U0045>"
 country_ab3   "<U0044><U0045><U0055>"
 % D
diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
index aa6c40e8b198..d918d62a45ac 100644
--- a/localedata/locales/fy_NL
+++ b/localedata/locales/fy_NL
@@ -129,6 +129,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004E><U0065><U0064><U0065><U0072><U006C><U00E2><U006E>"
+country_post "<U004E><U004C>"
 country_ab2 "<U004E><U004C>"
 country_ab3 "<U004E><U004C><U0044>"
 country_num 528
diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE
index 7d04ae1dceab..d7568697faed 100644
--- a/localedata/locales/ga_IE
+++ b/localedata/locales/ga_IE
@@ -156,6 +156,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U00C9><U0069><U0072><U0065>"
+country_post "<U0049><U0045>"
 country_ab2 "<U0049><U0045>"
 country_ab3 "<U0049><U0052><U004C>"
 country_num 372
diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
index a3b566b50ce1..b6a6cae974f9 100644
--- a/localedata/locales/gd_GB
+++ b/localedata/locales/gd_GB
@@ -142,6 +142,7 @@ LC_ADDRESS
 % %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%S%N%c%N
 postal_fmt   "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0053><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0041><U006E><U0020><U0052><U00EC><U006F><U0067><U0068><U0061><U0063><U0068><U0064><U0020><U0041><U006F><U006E><U0061><U0069><U0063><U0068><U0074><U0065>"
+country_post "<U0047><U0042>"
 % GB
 country_ab2  "<U0047><U0042>"
 % GBR
diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
index b48069c76f87..e644bab0470f 100644
--- a/localedata/locales/gez_ER
+++ b/localedata/locales/gez_ER
@@ -108,7 +108,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A4><U122D><U1275><U122B>"
-country_post  "<U0045><U0052><U0049>"
+country_post "<U0045><U0052>"
 country_ab2   "<U0045><U0052>"
 country_ab3   "<U0045><U0052><U0049>"
 country_num   232
diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
index 5460def24219..b39a348cef8b 100644
--- a/localedata/locales/gez_ET
+++ b/localedata/locales/gez_ET
@@ -108,7 +108,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A2><U1275><U12EE><U1335><U12EB>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES
index 2d1bcd1f0307..3ce68431d3f9 100644
--- a/localedata/locales/gl_ES
+++ b/localedata/locales/gl_ES
@@ -155,6 +155,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0045><U0073><U0070><U0061><U00F1><U0061>"
+country_post "<U0045><U0053>"
 country_ab2 "<U0045><U0053>"
 country_ab3 "<U0045><U0053><U0050>"
 country_num 724
diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
index 0f4ccc5f77b9..be28204f3e14 100644
--- a/localedata/locales/gu_IN
+++ b/localedata/locales/gu_IN
@@ -219,6 +219,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0AAD><U0ABE><U0AB0><U0AA4>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB
index 0c95bdd2468a..6504b4dfe232 100644
--- a/localedata/locales/gv_GB
+++ b/localedata/locales/gv_GB
@@ -167,6 +167,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0052><U0079><U0077><U0076><U0061><U006E><U0065><U0074><U0068><U0020><U0055><U006E><U0079><U0073>"
+country_post "<U0047><U0042>"
 country_ab2 "<U0047><U0042>"
 country_ab3 "<U0047><U0042><U0052>"
 country_num 826
diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG
index b454b19de1bc..87addd54aa4a 100644
--- a/localedata/locales/ha_NG
+++ b/localedata/locales/ha_NG
@@ -271,15 +271,11 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 country_name "<U004E><U0061><U006A><U0065><U0072><U0069><U0079><U0061>"
+country_post "<U004E><U0047>"
 
 % Language name in Hausa - "Hausa"
 lang_name     "<U0048><U0061><U0075><U0073><U0061>"
 
-% CEPT MAILCODES are suggested
-% Alternatively use the code found on your countries postal item tracking number
-% "NG"?
-%country_post   "<U004E><U0047>"
-
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
 % http://www.unece.org/trans/conventn/Distsigns_Sept2003.pdf
 % "WAN"
diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
index 8e6bec2341a4..3d16d1d7fd3d 100644
--- a/localedata/locales/hak_TW
+++ b/localedata/locales/hak_TW
@@ -192,7 +192,6 @@ LC_ADDRESS
 postal_fmt   "<U0025><U0063><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>"
 % äèæå
 country_name "<U4E2D><U83EF><U6C11><U570B>"
-% TW
 country_post "<U0054><U0057>"
 % TW
 country_ab2  "<U0054><U0057>"
diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL
index dba9571a5635..af1f18107924 100644
--- a/localedata/locales/he_IL
+++ b/localedata/locales/he_IL
@@ -161,6 +161,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U05D9><U05E9><U05E8><U05D0><U05DC>"
+country_post "<U0049><U004C>"
 country_ab2 "<U0049><U004C>"
 country_ab3 "<U0049><U0053><U0052>"
 country_num 376
diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN
index 679e8b5191f7..6057db2a3567 100644
--- a/localedata/locales/hi_IN
+++ b/localedata/locales/hi_IN
@@ -215,6 +215,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U092D><U093E><U0930><U0924>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN
index f37636f31872..bd65ab91df46 100644
--- a/localedata/locales/hne_IN
+++ b/localedata/locales/hne_IN
@@ -164,6 +164,7 @@ END LC_NAME
 LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index 700371755309..3d87e818e00e 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -2246,6 +2246,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0048><U0072><U0076><U0061><U0074><U0073><U006B><U0061>"
+country_post "<U0048><U0052>"
 country_ab2 "<U0048><U0052>"
 country_ab3 "<U0048><U0052><U0056>"
 country_num 191
diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE
index 14bc7c01d414..f8d2ba8de317 100644
--- a/localedata/locales/hsb_DE
+++ b/localedata/locales/hsb_DE
@@ -2207,7 +2207,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U004E><U011B><U006D><U0073><U006B><U0061>"
-country_post  "<U0044>"
+country_post "<U0044><U0045>"
 country_ab2   "<U0044><U0045>"
 country_ab3   "<U0044><U0045><U0055>"
 country_num   276
diff --git a/localedata/locales/ht_HT b/localedata/locales/ht_HT
index a1bfddf5800d..b17137784374 100644
--- a/localedata/locales/ht_HT
+++ b/localedata/locales/ht_HT
@@ -175,7 +175,6 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 % Ayiti
 country_name "<U0041><U0079><U0069><U0074><U0069>"
-% HT
 country_post "<U0048><U0054>"
 % HT
 country_ab2  "<U0048><U0054>"
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index 898d293b18c4..3dcac1e4c466 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -586,6 +586,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004D><U0061><U0067><U0079><U0061><U0072><U006F><U0072><U0073><U007A><U00E1><U0067>"
+country_post "<U0048><U0055>"
 country_ab2 "<U0048><U0055>"
 country_ab3 "<U0048><U0055><U004E>"
 country_num 348
diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM
index 3a267862217d..22f4d4821eb0 100644
--- a/localedata/locales/hy_AM
+++ b/localedata/locales/hy_AM
@@ -180,7 +180,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0540><U0561><U0575><U0561><U057D><U057F><U0561><U0576>"
-% FIXME country_post for Armenia?
+country_post "<U0041><U004D>"
 country_ab2 "<U0041><U004D>"
 country_ab3 "<U0041><U0052><U004D>"
 country_num 051
diff --git a/localedata/locales/ia_FR b/localedata/locales/ia_FR
index 85e97eb28917..6723642770e5 100644
--- a/localedata/locales/ia_FR
+++ b/localedata/locales/ia_FR
@@ -125,7 +125,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U0074><U0025><U0068><U0025><U0074><U0025><U0065><U0025><U0074>/
 <U0025><U0072><U0025><U004E><U0025><U007A><U0025><U0074><U0025><U0054>/
 <U0025><U004E><U0025><U0063><U0025><U004E>"
-country_post "<U0046>"
+country_post "<U0046><U0052>"
 country_ab2 "<U0046><U0052>"
 country_ab3 "<U0046><U0052><U0041>"
 country_num 250
diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID
index 53ce462d2550..1e4c791e6dc3 100644
--- a/localedata/locales/id_ID
+++ b/localedata/locales/id_ID
@@ -157,6 +157,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0049><U006E><U0064><U006F><U006E><U0065><U0073><U0069><U0061>"
+country_post "<U0049><U0044>"
 country_ab2 "<U0049><U0044>"
 country_ab3 "<U0049><U0044><U004E>"
 country_num 360
diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG
index 3604562c3201..12a3bc06ec91 100644
--- a/localedata/locales/ig_NG
+++ b/localedata/locales/ig_NG
@@ -470,15 +470,11 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 
 % Country name in Igbo - "Nigeria"
 country_name  "<U004E><U0069><U0067><U0065><U0072><U0069><U0061>"
+country_post "<U004E><U0047>"
 
 % Language name in Igbo - "Igbo"
 lang_name     "<U0049><U0067><U0062><U006F>"
 
-% CEPT MAILCODES are suggested
-% Alternatively use the code found on your countries postal item tracking number
-% "NG"?
-%country_post   "<U004E><U0047>"
-
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
 % http://www.unece.org/trans/conventn/Distsigns_Sept2003.pdf
 % "WAN"
diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
index 5fe6faa59d4c..d66bb7e6739b 100644
--- a/localedata/locales/ik_CA
+++ b/localedata/locales/ik_CA
@@ -233,6 +233,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0043><U0041>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"
 country_num 124
diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index 03cfb6bb673b..fdd0ab0caca9 100644
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -2262,6 +2262,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U00CD><U0073><U006C><U0061><U006E><U0064>"
+country_post "<U0049><U0053>"
 country_ab2 "<U0049><U0053>"
 country_ab3 "<U0049><U0053><U004C>"
 country_num 352
diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH
index 4d9fad7fe1a5..9c708231ae46 100644
--- a/localedata/locales/it_CH
+++ b/localedata/locales/it_CH
@@ -136,6 +136,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0053><U0076><U0069><U007A><U007A><U0065><U0072><U0061>"
+country_post "<U0043><U0048>"
 country_ab2 "<U0043><U0048>"
 country_ab3 "<U0043><U0048><U0045>"
 country_num 756
diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
index e163ce05832b..7859e608a009 100644
--- a/localedata/locales/it_IT
+++ b/localedata/locales/it_IT
@@ -161,6 +161,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0049><U0074><U0061><U006C><U0069><U0061>"
+country_post "<U0049><U0054>"
 country_ab2 "<U0049><U0054>"
 country_ab3 "<U0049><U0054><U0041>"
 country_num 380
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index 126a91be2b95..3c1f9e68e194 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -44,7 +44,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 % FIXME country_name "Canada" in inuktitut ?
-% FIXME country_post "CA" for Canada ?
+country_post "<U0043><U0041>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"
 country_num 124
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index e09aaf9c81d0..ecc4b1239456 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -15043,6 +15043,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U65E5><U672C>"
+country_post "<U004A><U0050>"
 country_ab2 "<U004A><U0050>"
 country_ab3 "<U004A><U0050><U004E>"
 country_num 392
diff --git a/localedata/locales/ka_GE b/localedata/locales/ka_GE
index d9903731dbf9..11f2520f04b8 100644
--- a/localedata/locales/ka_GE
+++ b/localedata/locales/ka_GE
@@ -42,7 +42,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U10E1><U10D0><U10E5><U10D0><U10E0><U10D7><U10D5><U10D4><U10DA><U10DD>"
-% country_post "GE" for Georgia ?
+country_post "<U0047><U0045>"
 country_ab2 "GE"
 country_ab3 "GEO"
 country_num 268
diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ
index aa020e645f34..5b3bb1a5f689 100644
--- a/localedata/locales/kk_KZ
+++ b/localedata/locales/kk_KZ
@@ -275,7 +275,7 @@ postal_fmt   "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U049A><U0430><U0437><U0430><U049B><U0441><U0442><U0430><U043D>"
-country_post "<U004B><U0041><U005A>"
+country_post "<U004B><U005A>"
 country_ab2  "<U004B><U005A>"
 country_ab3  "<U004B><U0041><U005A>"
 country_num  398
diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
index 4ea130b7a883..15db3737afae 100644
--- a/localedata/locales/kl_GL
+++ b/localedata/locales/kl_GL
@@ -142,6 +142,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004B><U0061><U006C><U0061><U0061><U006C><U006C><U0069><U0074><U0020><U004E><U0075><U006E><U0061><U0061><U0074>"
+country_post "<U0047><U004C>"
 country_ab2 "<U0047><U004C>"
 country_ab3 "<U0047><U0052><U004C>"
 country_num 304
diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index 18cf4520710d..afbffc9e6181 100644
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -1863,8 +1863,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U004E><U0025><U007A><U0025><U0063><U0025><U004E>"
 % ááááááá (Kampuchea)
 country_name "<U1780><U1798><U17D2><U1796><U17BB><U1787><U17B6>"
-%FIXME
-%country_post  ""
+country_post "<U004B><U0048>"
 country_ab2 "<U004B><U0048>"
 country_ab3 "<U004B><U0048><U004D>"
 country_num 116
diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN
index 2d486fec6b61..7efe8ad94cc5 100644
--- a/localedata/locales/kn_IN
+++ b/localedata/locales/kn_IN
@@ -223,6 +223,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0CAD><U0CBE><U0CB0><U0CA4>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR
index 531aceee60d7..28b3c4acc535 100644
--- a/localedata/locales/ko_KR
+++ b/localedata/locales/ko_KR
@@ -6238,6 +6238,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<UB300><UD55C><UBBFC><UAD6D>"
+country_post "<U004B><U0052>"
 country_ab2 "<U004B><U0052>"
 country_ab3 "<U004B><U004F><U0052>"
 country_num 410
diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN
index b47f94453e1c..4d72cf9b92f2 100644
--- a/localedata/locales/kok_IN
+++ b/localedata/locales/kok_IN
@@ -188,6 +188,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U092D><U093E><U0930><U0924>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN
index f43c8e428e09..95c22b05bbce 100644
--- a/localedata/locales/ks_IN
+++ b/localedata/locales/ks_IN
@@ -197,6 +197,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U06C1><U0650><U0646><U065B><U062F><U0648><U0633><U062A><U0627><U0646>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ks_IN@devanagari b/localedata/locales/ks_IN@devanagari
index 7245ed1b9c00..a0ee929b82c0 100644
--- a/localedata/locales/ks_IN@devanagari
+++ b/localedata/locales/ks_IN@devanagari
@@ -161,6 +161,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U092D><U093E><U0930><U0924>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR
index a02869381558..791b9f5846fc 100644
--- a/localedata/locales/ku_TR
+++ b/localedata/locales/ku_TR
@@ -205,7 +205,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 % TODO
 country_name	"<U0054><U0075><U0072><U006B><U0065><U0079>"
-country_post "TR"
+country_post "<U0054><U0052>"
 country_ab2  "TR"
 country_ab3  "TUR"
 country_num  792
diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB
index 084679cd22a0..0aa9f6fd9d99 100644
--- a/localedata/locales/kw_GB
+++ b/localedata/locales/kw_GB
@@ -159,6 +159,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0052><U0079><U0077><U0076><U0061><U006E><U0065><U0074><U0068><U0020><U0055><U006E><U0079><U0073>"
+country_post "<U0047><U0042>"
 country_ab2 "<U0047><U0042>"
 country_ab3 "<U0047><U0042><U0052>"
 country_num 826
diff --git a/localedata/locales/ky_KG b/localedata/locales/ky_KG
index 3d2882e3399e..f2c394b6cae5 100644
--- a/localedata/locales/ky_KG
+++ b/localedata/locales/ky_KG
@@ -210,6 +210,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U041A><U044B><U0440><U0433><U044B><U0437><U0441><U0442><U0430><U043D>"
+country_post "<U004B><U0047>"
 country_ab2 "<U004B><U0047>"
 country_ab3 "<U004B><U0047><U005A>"
 country_num 417
diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU
index bfe37bc62f1a..e3005143116c 100644
--- a/localedata/locales/lb_LU
+++ b/localedata/locales/lb_LU
@@ -179,7 +179,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U004C><U00EB><U0074><U007A><U0065><U0062><U0075><U0065>/
 <U0072><U0067>"
-country_post  "<U004C>"
+country_post "<U004C><U0055>"
 country_ab2   "<U004C><U0055>"
 country_ab3   "<U004C><U0055><U0058>"
 country_num   442
diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG
index 0a3fbacfe1d0..3c4b60023ad0 100644
--- a/localedata/locales/lg_UG
+++ b/localedata/locales/lg_UG
@@ -279,8 +279,6 @@ country_name "<U0059><U0075><U0067><U0061><U006E><U0064><U0061>"
 % Country name in Luganda - "Yuganda"
 %
 country_post "<U0055><U0047>"
-% Abbreviated country postal name - "UG"
-%
 country_ab2 "<U0055><U0047>"
 % ISO 3166 two letter country abbreviation - "UG"
 %
diff --git a/localedata/locales/li_BE b/localedata/locales/li_BE
index 952c28b559cb..15b87ea8d7b4 100644
--- a/localedata/locales/li_BE
+++ b/localedata/locales/li_BE
@@ -42,7 +42,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 %FIXME country_name "Belgie"
-country_post  "<U0042>"
+country_post "<U0042><U0045>"
 country_ab2   "<U0042><U0045>"
 country_ab3   "<U0042><U0045><U004C>"
 country_car   "<U0042>"
diff --git a/localedata/locales/li_NL b/localedata/locales/li_NL
index 67ddc349ee8b..08e983f14671 100644
--- a/localedata/locales/li_NL
+++ b/localedata/locales/li_NL
@@ -42,7 +42,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 %FIXME country_name "Nederland"
-country_post  "<U004E><U004C>"
+country_post "<U004E><U004C>"
 country_ab2   "<U004E><U004C>"
 country_ab3   "<U004E><U004C><U0044>"
 country_car   "<U004E><U004C>"
diff --git a/localedata/locales/lij_IT b/localedata/locales/lij_IT
index 1bb0456a3912..03a8dd8e0b7e 100644
--- a/localedata/locales/lij_IT
+++ b/localedata/locales/lij_IT
@@ -130,6 +130,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0049><U0054>"
 country_ab2 "<U0049><U0054>"
 country_ab3 "<U0049><U0054><U0041>"
 country_num 380
diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
index eaeb4f6d7d09..486a8a21b588 100644
--- a/localedata/locales/lo_LA
+++ b/localedata/locales/lo_LA
@@ -743,8 +743,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U0073><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0053>/
 <U0025><U004E><U0025><U007A><U0025><U0063><U0025><U004E>"
 country_name  "<U0EA5><U0EB2><U0EA7>"
-%FIXME
-%country_post  ""
+country_post "<U004C><U0041>"
 country_ab2   "<U004C><U0041>"
 country_ab3   "<U004C><U0041><U004F>"
 country_num   418
diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT
index 78ed64cb8b1a..3aa9a14e1773 100644
--- a/localedata/locales/lt_LT
+++ b/localedata/locales/lt_LT
@@ -2229,6 +2229,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004C><U0069><U0065><U0074><U0075><U0076><U0061>"
+country_post "<U004C><U0054>"
 country_ab2 "<U004C><U0054>"
 country_ab3 "<U004C><U0054><U0055>"
 country_num 440
diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV
index c3cecba4febd..4f5f6f8b1cbc 100644
--- a/localedata/locales/lv_LV
+++ b/localedata/locales/lv_LV
@@ -2221,6 +2221,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004C><U0061><U0074><U0076><U0069><U006A><U0061>"
+country_post "<U004C><U0056>"
 country_ab2 "<U004C><U0056>"
 country_ab3 "<U004C><U0056><U0041>"
 country_num 428
diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
index e575a8ae74f2..57813a59864c 100644
--- a/localedata/locales/lzh_TW
+++ b/localedata/locales/lzh_TW
@@ -227,7 +227,6 @@ LC_ADDRESS
 postal_fmt   "<U0025><U0063><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>"
 % äèæå
 country_name "<U4E2D><U83EF><U6C11><U570B>"
-% TW
 country_post "<U0054><U0057>"
 % TW
 country_ab2  "<U0054><U0057>"
diff --git a/localedata/locales/mag_IN b/localedata/locales/mag_IN
index 3642c63cf344..6610a69cd040 100644
--- a/localedata/locales/mag_IN
+++ b/localedata/locales/mag_IN
@@ -162,6 +162,7 @@ LC_ADDRESS
 
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN
index a005d0a57faa..dd727a3a1bb4 100644
--- a/localedata/locales/mai_IN
+++ b/localedata/locales/mai_IN
@@ -81,6 +81,7 @@ LC_ADDRESS
 
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/mg_MG b/localedata/locales/mg_MG
index a32ca0ae7749..20dcf20b4485 100644
--- a/localedata/locales/mg_MG
+++ b/localedata/locales/mg_MG
@@ -178,6 +178,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004D><U0061><U0064><U0061><U0067><U0061><U0073><U0069><U006B><U0061><U0072><U0061>"
+country_post "<U004D><U0047>"
 country_ab2 "<U004D><U0047>"
 country_ab3 "<U004D><U0044><U0047>"
 country_num 450
diff --git a/localedata/locales/mhr_RU b/localedata/locales/mhr_RU
index a54d3e3e75d7..d6f1b9d57875 100644
--- a/localedata/locales/mhr_RU
+++ b/localedata/locales/mhr_RU
@@ -161,6 +161,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0052><U0055>"
 country_ab2 "<U0052><U0055>"
 country_ab3 "<U0052><U0055><U0053>"
 country_num 643
diff --git a/localedata/locales/mi_NZ b/localedata/locales/mi_NZ
index 50fff06ee146..e22c4c0623da 100644
--- a/localedata/locales/mi_NZ
+++ b/localedata/locales/mi_NZ
@@ -169,6 +169,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U004E><U005A>"
 country_ab2   "<U004E><U005A>"
 country_ab3   "<U004E><U005A><U004C>"
 country_num   554
diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK
index 264848e937f7..df58ca204de1 100644
--- a/localedata/locales/mk_MK
+++ b/localedata/locales/mk_MK
@@ -151,7 +151,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U041C><U0430><U043A><U0435><U0434><U043E><U043D><U0438><U0458><U0430>"
-country_post  "<U004d><U004b>"
+country_post "<U004d><U004b>"
 country_ab2 "<U004d><U004b>"
 country_ab3 "<U004d><U004b><U0044>"
 country_car "<U004d><U004b>"
diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN
index f3f4565a80b8..c44be36fd331 100644
--- a/localedata/locales/ml_IN
+++ b/localedata/locales/ml_IN
@@ -202,6 +202,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt     "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0D07><U0D28><U0D4D><U0D24><U0D4D><U0D2F>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/mn_MN b/localedata/locales/mn_MN
index 78839f253c70..6fdd4ed0ba2e 100644
--- a/localedata/locales/mn_MN
+++ b/localedata/locales/mn_MN
@@ -255,7 +255,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U041C><U043E><U043D><U0433><U043E><U043B>"
-country_post  "<U004D><U004E>"
+country_post "<U004D><U004E>"
 country_ab2   "<U004D><U004E>"
 country_ab3   "<U004D><U004E><U0047>"
 country_num   496
diff --git a/localedata/locales/mni_IN b/localedata/locales/mni_IN
index 795db24479c3..961d7d3a193e 100644
--- a/localedata/locales/mni_IN
+++ b/localedata/locales/mni_IN
@@ -164,6 +164,7 @@ END LC_NAME
 LC_ADDRESS
 
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
index ecb16991cac9..38f2c7930eea 100644
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@@ -213,6 +213,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U092D><U093E><U0930><U0924>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY
index 5dbf8d595b06..8cafa0c079db 100644
--- a/localedata/locales/ms_MY
+++ b/localedata/locales/ms_MY
@@ -182,6 +182,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U004D><U0061><U006C><U0061><U0079><U0073><U0069><U0061>"
+country_post "<U004D><U0059>"
 country_ab2 "<U004D><U0059>"
 country_ab3 "<U004D><U0059><U0053>"
 country_num 458
diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT
index 421c307a08d8..7a39508215e3 100644
--- a/localedata/locales/mt_MT
+++ b/localedata/locales/mt_MT
@@ -278,6 +278,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U004D><U0061><U006C><U0074><U0061>"
+country_post "<U004D><U0054>"
 country_ab2 "<U004D><U0054>"
 country_ab3 "<U004D><U004C><U0054>"
 country_num 470
diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
index eb9893111b93..bb5b60037acc 100644
--- a/localedata/locales/my_MM
+++ b/localedata/locales/my_MM
@@ -311,7 +311,7 @@ END LC_NAME
 LC_ADDRESS
 postal_fmt   "<U0025><U0061><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0068><U0025><U0074><U0025><U0072><U0025><U0074><U0025><U0065><U0025><U0074><U0025><U0073><U0025><U004E><U0025><U0054><U0025><U0074><U0025><U007A><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name   "<U1019><U103C><U1014><U103A><U1019><U102C>"
-country_post    "<U004D><U0079><U0061><U006E><U006D><U0061><U0072>"
+country_post "<U004D><U004D>"
 country_ab2     "<U004D><U004D>"
 country_num 104
 country_car "<U004D><U0059><U0041>"
diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
index cdb6b071a84f..5bf8723ea782 100644
--- a/localedata/locales/nan_TW
+++ b/localedata/locales/nan_TW
@@ -193,7 +193,6 @@ LC_ADDRESS
 postal_fmt   "<U0025><U0063><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>"
 % äèæå
 country_name "<U4E2D><U83EF><U6C11><U570B>"
-% TW
 country_post "<U0054><U0057>"
 % TW
 country_ab2  "<U0054><U0057>"
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index 5379b2320139..32664bafa8d2 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -182,7 +182,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % country_ab3:	TWN
 % country_isbn:	957
 country_name	"<U0054><U00E2><U0069><U002D><U006F><U00E2><U006E>"
-%country_post	"FIXME"
+country_post "<U0054><U0057>"
 country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158
diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO
index 2f6faae54c08..d84c8fd68232 100644
--- a/localedata/locales/nb_NO
+++ b/localedata/locales/nb_NO
@@ -266,6 +266,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004E><U006F><U0072><U0067><U0065>"
+country_post "<U004E><U004F>"
 country_ab2 "<U004E><U004F>"
 country_ab3 "<U004E><U004F><U0052>"
 country_num 578
diff --git a/localedata/locales/nds_DE b/localedata/locales/nds_DE
index 8bbdc4ddf8ff..fdff1c953204 100644
--- a/localedata/locales/nds_DE
+++ b/localedata/locales/nds_DE
@@ -41,7 +41,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
-country_post  "<U0044>"
+country_post "<U0044><U0045>"
 country_ab2   "<U0044><U0045>"
 country_ab3   "<U0044><U0045><U0055>"
 country_car   "<U0044>"
diff --git a/localedata/locales/nds_NL b/localedata/locales/nds_NL
index 107d98c41d64..16b4f8bd788d 100644
--- a/localedata/locales/nds_NL
+++ b/localedata/locales/nds_NL
@@ -41,6 +41,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U004E><U004C>"
 country_ab2 "<U004E><U004C>"
 country_ab3 "<U004E><U004C><U0044>"
 country_car "<U004E><U004C>"
diff --git a/localedata/locales/ne_NP b/localedata/locales/ne_NP
index 049cbd2091cd..4f891dfb9d58 100644
--- a/localedata/locales/ne_NP
+++ b/localedata/locales/ne_NP
@@ -195,6 +195,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0928><U0947><U092A><U093E><U0932>"
+country_post "<U004E><U0050>"
 country_ab2 "<U004E><U0050>"
 country_ab3 "<U004E><U0050><U004C>"
 country_num 524
diff --git a/localedata/locales/nhn_MX b/localedata/locales/nhn_MX
index f80744902dad..254760095b9b 100644
--- a/localedata/locales/nhn_MX
+++ b/localedata/locales/nhn_MX
@@ -142,6 +142,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U004D><U0058>"
 country_ab2   "<U004D><U0058>"
 country_ab3   "<U004D><U0045><U0058>"
 country_num   484
diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU
index af5f1ef4b274..ecd690043955 100644
--- a/localedata/locales/niu_NU
+++ b/localedata/locales/niu_NU
@@ -174,7 +174,6 @@ END LC_NAME
 LC_ADDRESS
 % %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N
 postal_fmt   "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
-% NU
 country_post "<U004E><U0055>"
 % NU
 country_ab2  "<U004E><U0055>"
diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ
index d494c4a4c236..059b4d7620ef 100644
--- a/localedata/locales/niu_NZ
+++ b/localedata/locales/niu_NZ
@@ -174,6 +174,7 @@ END LC_NAME
 LC_ADDRESS
 % %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N
 postal_fmt   "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
+country_post "<U004E><U005A>"
 % NZ
 country_ab2  "<U004E><U005A>"
 % NZL
diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
index 8de141086ff1..a5b781ea14e7 100644
--- a/localedata/locales/nl_AW
+++ b/localedata/locales/nl_AW
@@ -128,6 +128,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_name "<U0041><U0072><U0075><U0062><U0061>"
+country_post "<U0041><U0057>"
 country_ab2   "<U0041><U0057>"
 country_ab3   "<U0041><U0042><U0057>"
 country_num   533
diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index ac728eab8ed3..edf00401167b 100644
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -133,6 +133,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U0065><U006C><U0067><U0069><U00EB>"
+country_post "<U0042><U0045>"
 country_ab2 "<U0042><U0045>"
 country_ab3 "<U0042><U0045><U004C>"
 country_num 056
diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL
index 1d9847328331..ec8c4236a004 100644
--- a/localedata/locales/nl_NL
+++ b/localedata/locales/nl_NL
@@ -163,6 +163,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004E><U0065><U0064><U0065><U0072><U006C><U0061><U006E><U0064>"
+country_post "<U004E><U004C>"
 country_ab2 "<U004E><U004C>"
 country_ab3 "<U004E><U004C><U0044>"
 country_num 528
diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO
index b80493d3ba35..f95671c6f957 100644
--- a/localedata/locales/nn_NO
+++ b/localedata/locales/nn_NO
@@ -166,6 +166,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004E><U006F><U0072><U0065><U0067>"
+country_post "<U004E><U004F>"
 country_ab2 "<U004E><U004F>"
 country_ab3 "<U004E><U004F><U0052>"
 country_num 578
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index cf6a609cd486..54e7285aab50 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -222,8 +222,6 @@ END LC_NAME
 LC_ADDRESS
 % Country name in Southern Ndebele - "iSewula Afrika"
 country_name "<U0069><U0053><U0065><U0077><U0075><U006C><U0061><U0020><U0041><U0066><U0072><U0069><U006B><U0061>"
-
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
index e374f39d51dd..1a9c3cc955ea 100644
--- a/localedata/locales/nso_ZA
+++ b/localedata/locales/nso_ZA
@@ -202,8 +202,6 @@ LC_ADDRESS
 % Country name in Northern Sotho - "Afrika Borwa"
 country_name "<U0041><U0066><U0072><U0069><U006B><U0061><U0020>/
 <U0042><U006F><U0072><U0077><U0061>"
-
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR
index cfabfa1574e8..14e4eed77be7 100644
--- a/localedata/locales/oc_FR
+++ b/localedata/locales/oc_FR
@@ -41,7 +41,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 % FIXME country_name "France" in Occitan ?
-country_post "F"
+country_post "<U0046><U0052>"
 country_ab2 "FR"
 country_ab3 "FRA"
 country_num 250
diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
index 79efde67fd31..7f76d8ef17f6 100644
--- a/localedata/locales/om_ET
+++ b/localedata/locales/om_ET
@@ -141,7 +141,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U0049><U0074><U006F><U006F><U0070><U0068><U0069><U0079><U0061><U0061>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE
index d974f6269477..e22431057729 100644
--- a/localedata/locales/om_KE
+++ b/localedata/locales/om_KE
@@ -232,7 +232,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U004B><U0065><U0065><U006E><U0069><U0079><U0061><U0061>"
-country_post  "<U004B><U0045><U004E>"
+country_post "<U004B><U0045>"
 country_ab2   "<U004B><U0045>"
 country_ab3   "<U004B><U0045><U004E>"
 country_num   404
diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
index a1b5bad6776c..b35cf6c4d018 100644
--- a/localedata/locales/or_IN
+++ b/localedata/locales/or_IN
@@ -822,6 +822,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0B2D><U0B3E><U0B30><U0B24>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU
index 2b3d0367e611..6a8d670796f3 100644
--- a/localedata/locales/os_RU
+++ b/localedata/locales/os_RU
@@ -174,6 +174,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0423><U04D5><U0440><U04D5><U0441><U0435>"
+country_post "<U0052><U0055>"
 country_ab2 "<U0052><U0055>"
 country_ab3 "<U0052><U0055><U0053>"
 country_num 643
diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
index c072d7902706..4dda4502c291 100644
--- a/localedata/locales/pa_IN
+++ b/localedata/locales/pa_IN
@@ -212,6 +212,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0A2D><U0A3E><U0A30><U0A24>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK
index f9de3c20a1ff..1277af91e96e 100644
--- a/localedata/locales/pa_PK
+++ b/localedata/locales/pa_PK
@@ -179,6 +179,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0A2A><U0A3E><U0A15><U0A3F><U0A38><U0A24><U0A3E><U0A28>"
+country_post "<U0050><U004B>"
 country_ab2 "<U0050><U004B>"
 country_ab3 "<U0050><U0041><U004B>"
 country_num 586
diff --git a/localedata/locales/pap_AW b/localedata/locales/pap_AW
index 117bc0705f0b..4139a79fc8ad 100644
--- a/localedata/locales/pap_AW
+++ b/localedata/locales/pap_AW
@@ -46,7 +46,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 % FIXME country_name for Antilles in Paplamento
-% FIXME country_post MAIL_CEPTCODE for Nederland Antilles, AN?
+country_post "<U0041><U0057>"
 % AW
 country_ab2  "<U0041><U0057>"
 % ABW
diff --git a/localedata/locales/pap_CW b/localedata/locales/pap_CW
index 888655c59d32..3639264f31d2 100644
--- a/localedata/locales/pap_CW
+++ b/localedata/locales/pap_CW
@@ -46,7 +46,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 % FIXME country_name for Antilles in Paplamento
-% FIXME country_post MAIL_CEPTCODE for Nederland Antilles, AN?
+country_post "<U0043><U0057>"
 % CW
 country_ab2  "<U0043><U0057>"
 % CUW
diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index 29207b320f97..d8c1b51191a1 100644
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -2232,6 +2232,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0050><U006F><U006C><U0073><U006B><U0061>"
+country_post "<U0050><U004C>"
 country_ab2 "<U0050><U004C>"
 country_ab3 "<U0050><U004F><U004C>"
 country_num 616
diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
index 702a830faa14..4b667b79a13b 100644
--- a/localedata/locales/ps_AF
+++ b/localedata/locales/ps_AF
@@ -260,7 +260,7 @@ postal_fmt	"<U0025><U0061><U0025><U004E><U0025><U0066><U0025>/
 <U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name	"<U0627><U0641><U063A><U0627><U0646>/
 <U0633><U062A><U0627><U0646>"
-%country_post	"<U0041><U0046><U0047>" % FIXME: Not confirmed.
+country_post "<U0041><U0046>"
 country_ab2	"<U0041><U0046>"
 country_ab3	"<U0041><U0046><U0047>"
 country_num	004
diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index ccb25a1cf301..f721fff89101 100644
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -154,6 +154,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U0072><U0061><U0073><U0069><U006C>"
+country_post "<U0042><U0052>"
 country_ab2 "<U0042><U0052>"
 country_ab3 "<U0042><U0052><U0041>"
 country_num 076
diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
index 1301f83096c9..b032469d6616 100644
--- a/localedata/locales/pt_PT
+++ b/localedata/locales/pt_PT
@@ -159,6 +159,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0050><U006F><U0072><U0074><U0075><U0067><U0061><U006C>"
+country_post "<U0050><U0054>"
 country_ab2 "<U0050><U0054>"
 country_ab3 "<U0050><U0052><U0054>"
 country_num 620
diff --git a/localedata/locales/quz_PE b/localedata/locales/quz_PE
index f62086f32b1a..eab46ee6e0de 100644
--- a/localedata/locales/quz_PE
+++ b/localedata/locales/quz_PE
@@ -156,6 +156,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0050><U0045>"
 country_ab2   "<U0050><U0045>"
 country_ab3   "<U0050><U0045><U0052>"
 country_num   604
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 2abf201e6431..a3bd990995e0 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -371,6 +371,7 @@ postal_fmt    "<U0025><U0066>/
 <U0025><U0074><U0025><U0063><U0025><U004E>"
 % Country names are capitalized: Roma>nia
 country_name "<U0052><U006F><U006D><U00E2><U006E><U0069><U0061>"
+country_post "<U0052><U004F>"
 country_ab2 "<U0052><U004F>"
 country_ab3 "<U0052><U004F><U0055>"
 country_num 642
@@ -379,8 +380,6 @@ country_car "<U0052><U004F>"
 % see: http://homepages.cwi.nl/~dik/english/codes/isbn.html
 % and other sources
 country_isbn 973
-% FIXME: is it really RO?
-country_post "<U0052><U004F>"
 % language names are not capitalized in Romanian ( roma>na( )
 lang_name "<U0072><U006F><U006D><U00E2><U006E><U0103>"
 lang_ab "<U0072><U006F>"
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 4c3839eae089..a66388fef5b8 100644
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -184,6 +184,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0420><U043E><U0441><U0441><U0438><U044F>"
+country_post "<U0052><U0055>"
 country_ab2 "<U0052><U0055>"
 country_ab3 "<U0052><U0055><U0053>"
 country_num 643
diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA
index 7daffda26009..3f4af39e2aec 100644
--- a/localedata/locales/ru_UA
+++ b/localedata/locales/ru_UA
@@ -175,6 +175,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0423><U043A><U0440><U0430><U0438><U043D><U0430>"
+country_post "<U0055><U0041>"
 country_ab2 "<U0055><U0041>"
 country_ab3 "<U0055><U004B><U0052>"
 country_num 804
diff --git a/localedata/locales/rw_RW b/localedata/locales/rw_RW
index a784ab434e00..85c5261d099f 100644
--- a/localedata/locales/rw_RW
+++ b/localedata/locales/rw_RW
@@ -138,6 +138,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name   "<U0052><U0077><U0061><U006E><U0064><U0061>"
+country_post "<U0052><U0057>"
 country_ab2    "<U0052><U0057>"
 country_ab3    "<U0052><U0057><U0041>"
 country_num 646
diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN
index 063ef04bdbbe..629234c3a490 100644
--- a/localedata/locales/sa_IN
+++ b/localedata/locales/sa_IN
@@ -230,6 +230,7 @@ LC_ADDRESS
 % LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN
index 0d58474f02c9..49c114abb5cb 100644
--- a/localedata/locales/sat_IN
+++ b/localedata/locales/sat_IN
@@ -168,6 +168,7 @@ LC_ADDRESS
 
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/sc_IT b/localedata/locales/sc_IT
index f8a51cea54c8..07624e5eb29b 100644
--- a/localedata/locales/sc_IT
+++ b/localedata/locales/sc_IT
@@ -138,6 +138,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0049><U0054>"
 country_ab2 "<U0049><U0054>"
 country_ab3 "<U0049><U0054><U0041>"
 country_num 380
diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN
index 8200d464c9b6..74327bb87ce8 100644
--- a/localedata/locales/sd_IN
+++ b/localedata/locales/sd_IN
@@ -192,6 +192,7 @@ LC_ADDRESS
 % This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/sd_IN@devanagari b/localedata/locales/sd_IN@devanagari
index ae6f6af7a0de..09d410b6fb35 100644
--- a/localedata/locales/sd_IN@devanagari
+++ b/localedata/locales/sd_IN@devanagari
@@ -194,6 +194,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U092D><U093E><U0930><U0924>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO
index bee8f53ca366..50246b75b89e 100644
--- a/localedata/locales/se_NO
+++ b/localedata/locales/se_NO
@@ -319,6 +319,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004E><U006F><U0072><U0067><U0061>"
+country_post "<U004E><U004F>"
 country_ab2 "<U004E><U004F>"
 country_ab3 "<U004E><U004F><U0052>"
 country_num 578
diff --git a/localedata/locales/shs_CA b/localedata/locales/shs_CA
index be375f7b183a..4d9ac583704d 100644
--- a/localedata/locales/shs_CA
+++ b/localedata/locales/shs_CA
@@ -155,6 +155,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0043><U0041>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"
 country_num 124
diff --git a/localedata/locales/si_LK b/localedata/locales/si_LK
index 316826186dd7..1a5a3c2c35bc 100644
--- a/localedata/locales/si_LK
+++ b/localedata/locales/si_LK
@@ -192,6 +192,7 @@ LC_ADDRESS
 
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0DC1><U0DCA><U200D><U0DBB><U0DD3><U0020><U0DBD><U0D82><U0D9A><U0DCF><U0DC0>"
+country_post "<U004C><U004B>"
 country_ab2 "<U004C><U004B>"
 country_ab3 "<U004C><U004B><U0041>"
 country_num 144
diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
index 4dda182136c2..e437f9e0955d 100644
--- a/localedata/locales/sid_ET
+++ b/localedata/locales/sid_ET
@@ -111,7 +111,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U0049><U0074><U0069><U0079><U006F><U006F><U0070><U0068><U0069><U0079><U0061>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index 3adf29b2c221..b732b764d708 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -211,6 +211,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0053><U006C><U006F><U0076><U0065><U006E><U0073><U006B><U006F>"
+country_post "<U0053><U004B>"
 country_ab2 "<U0053><U004B>"
 country_ab3 "<U0053><U0056><U004B>"
 country_num 703
diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI
index 93fa1937bd7c..900b927cd105 100644
--- a/localedata/locales/sl_SI
+++ b/localedata/locales/sl_SI
@@ -2220,6 +2220,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0053><U006C><U006F><U0076><U0065><U006E><U0069><U006A><U0061>"
+country_post "<U0053><U0049>"
 country_ab2 "<U0053><U0049>"
 country_ab3 "<U0053><U0056><U004E>"
 country_num 705
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index a1177f692e99..2d1346439ce6 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -121,7 +121,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U004A><U0061><U0062><U0075><U0075><U0074><U0069>"
-country_post  "<U0044><U004A><U0049>"
+country_post "<U0044><U004A>"
 country_ab2   "<U0044><U004A>"
 country_ab3   "<U0044><U004A><U0049>"
 country_num   262
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index 9bea161f7802..13a071bd90f1 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -121,7 +121,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U0049><U0074><U006F><U006F><U0062><U0069><U0079><U0061>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index e7de47df8be2..e7a37905caf6 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -121,7 +121,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U004B><U0069><U0069><U006E><U0069><U0079><U0061>"
-country_post  "<U004B><U0045><U004E>"
+country_post "<U004B><U0045>"
 country_ab2   "<U004B><U0045>"
 country_ab3   "<U004B><U0045><U004E>"
 country_num   404
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index a0a815283890..3e846e7f22da 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -168,7 +168,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U0053><U006F><U006F><U006D><U0061><U0061><U006C><U0069><U0079><U0061>"
-country_post  "<U0053><U004F><U004D>"
+country_post "<U0053><U004F>"
 country_ab2   "<U0053><U004F>"
 country_ab3   "<U0053><U004F><U004D>"
 country_num   706
diff --git a/localedata/locales/sq_AL b/localedata/locales/sq_AL
index 0c3350d04707..9bc4c82e19a9 100644
--- a/localedata/locales/sq_AL
+++ b/localedata/locales/sq_AL
@@ -332,6 +332,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0053><U0068><U0071><U0069><U0070><U00EB><U0072><U0069>"
+country_post "<U0041><U004C>"
 country_ab2 "<U0041><U004C>"
 country_ab3 "<U0041><U004C><U0042>"
 country_num 008
diff --git a/localedata/locales/sq_MK b/localedata/locales/sq_MK
index 4c4559470e70..9a2bd8447c44 100644
--- a/localedata/locales/sq_MK
+++ b/localedata/locales/sq_MK
@@ -102,7 +102,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004D><U0061><U0071><U0065><U0064><U006F><U006E><U0069>"
-country_post  "<U004d><U004b>"
+country_post "<U004d><U004b>"
 country_ab2 "<U004d><U004b>"
 country_ab3 "<U004d><U004b><U0044>"
 country_car "<U004d><U004b>"
diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME
index 122707fd4d72..eb11d096264d 100644
--- a/localedata/locales/sr_ME
+++ b/localedata/locales/sr_ME
@@ -146,8 +146,8 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U004D><U0045>"
 country_ab3   "<U004D><U004E><U0045>"
-country_post  "<U004D><U004E><U0045>"
 country_name  "<U0426><U0440><U043D><U0430><U0020><U0413><U043E><U0440><U0430>"
+country_post "<U004D><U0045>"
 country_num   499
 country_car   "<U004D><U004E><U0045>"
 country_isbn  "<U0038><U0036>"
diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index cedf0f70f36b..06bd97c58edd 100644
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -335,9 +335,8 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0052><U0053>"
 country_ab3   "<U0053><U0052><U0042>"
-% FIXME: country_post is probably incorrect
-country_post  "<U0053><U0052><U0042>"
 country_name  "<U0421><U0440><U0431><U0438><U0458><U0430>"
+country_post "<U0052><U0053>"
 country_num   688
 country_car   "<U0053><U0052><U0042>"
 % FIXME: ISBN code is what? "86" that preceedes all the numbers?
diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
index 001760e22f7d..4fd7e8dc5296 100644
--- a/localedata/locales/sr_RS@latin
+++ b/localedata/locales/sr_RS@latin
@@ -155,8 +155,8 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0052><U0053>"
 country_ab3   "<U0053><U0052><U0042>"
-country_post  "<U0053><U0052><U0042>"
 country_name "<U0053><U0072><U0062><U0069><U006A><U0061>"
+country_post "<U0052><U0053>"
 country_num   688
 country_car   "<U0053><U0052><U0042>"
 country_isbn  "<U0038><U0036>"
diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA
index c989d9af923e..e745d9c8d837 100644
--- a/localedata/locales/ss_ZA
+++ b/localedata/locales/ss_ZA
@@ -227,8 +227,6 @@ END LC_NAME
 LC_ADDRESS
 % Country name in Swati - "iNingizimu Afrika"
 country_name "<U0069><U004E><U0069><U006E><U0067><U0069><U007A><U0069><U006D><U0075><U0020><U0041><U0066><U0072><U0069><U006B><U0061>"
-
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index 5844da2c5094..f6ac27a73236 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -224,8 +224,6 @@ END LC_NAME
 LC_ADDRESS
 % Country name in Sotho - "Afrika Borwa"
 country_name "<U0041><U0066><U0072><U0069><U006B><U0061><U0020><U0042><U006F><U0072><U0077><U0061>"
-
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 
 % FIXME define the following correctly
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index c11da51d237e..2b28c52a9600 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -240,6 +240,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0053><U0076><U0065><U0072><U0069><U0067><U0065>"
+country_post "<U0053><U0045>"
 country_ab2 "<U0053><U0045>"
 country_ab3 "<U0053><U0057><U0045>"
 country_num 752
diff --git a/localedata/locales/sw_KE b/localedata/locales/sw_KE
index 137a381e9cab..8b04d1e50d2d 100644
--- a/localedata/locales/sw_KE
+++ b/localedata/locales/sw_KE
@@ -149,8 +149,7 @@ postal_fmt  "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U00
 <U0025><U0063><U0025><U004E>"
 % Kenya
 country_name  "<U004B><U0065><U006E><U0079><U0061>"
-% KE
-country_post  "<U004B><U0045>"
+country_post "<U004B><U0045>"
 % KE
 country_ab2   "<U004B><U0045>"
 % KEN
diff --git a/localedata/locales/sw_TZ b/localedata/locales/sw_TZ
index 383a3058184a..cc3f7641248a 100644
--- a/localedata/locales/sw_TZ
+++ b/localedata/locales/sw_TZ
@@ -148,8 +148,7 @@ postal_fmt  "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U00
 <U0025><U0063><U0025><U004E>"
 % Tanzania
 country_name  "<U0054><U0061><U006E><U007A><U0061><U006E><U0069><U0061>"
-% TZ
-country_post  "<U0054><U005A>"
+country_post "<U0054><U005A>"
 % TZ
 country_ab2   "<U0054><U005A>"
 % TZA
diff --git a/localedata/locales/szl_PL b/localedata/locales/szl_PL
index 931e416187a1..e52ba3695f43 100644
--- a/localedata/locales/szl_PL
+++ b/localedata/locales/szl_PL
@@ -211,6 +211,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0050><U004C>"
 country_ab2 "<U0050><U004C>"
 country_ab3 "<U0050><U004F><U004C>"
 country_num 616
diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
index dfb33b9d743e..d35c15ab3e46 100644
--- a/localedata/locales/ta_IN
+++ b/localedata/locales/ta_IN
@@ -198,6 +198,7 @@ LC_ADDRESS
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0B87><U0BA8><U0BCD><U0BA4><U0BBF><U0BAF><U0BBE>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK
index 23d863c44e3c..01a7e7add798 100644
--- a/localedata/locales/ta_LK
+++ b/localedata/locales/ta_LK
@@ -116,6 +116,7 @@ LC_ADDRESS
 
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0B87><U0BB2><U0B99><U0BCD><U0B95><U0BC8>"
+country_post "<U004C><U004B>"
 country_ab2 "<U004C><U004B>"
 country_ab3 "<U004C><U004B><U0041>"
 country_num 144
diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN
index 064de749941f..2774690f530e 100644
--- a/localedata/locales/tcy_IN
+++ b/localedata/locales/tcy_IN
@@ -177,6 +177,7 @@ LC_ADDRESS
 % LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_car "<U0049><U004E><U0044>"
diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN
index 3977e727d3df..04cbf7e75242 100644
--- a/localedata/locales/te_IN
+++ b/localedata/locales/te_IN
@@ -211,6 +211,7 @@ postal_fmt      "<U0025><U0061><U0025><U004E>/
 <U0025><U0053><U0025><U004E>/
 <U0025><U0063>"
 country_name    "<U0C2D><U0C3E><U0C30><U0C24><U0020><U0C26><U0C47><U0C36><U0C02>"
+country_post "<U0049><U004E>"
 country_ab2     "<U0049><U004E>"
 country_ab3     "<U0049><U004E><U0044>"
 country_num     356
diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ
index 78e66be8ddbd..22160493f484 100644
--- a/localedata/locales/tg_TJ
+++ b/localedata/locales/tg_TJ
@@ -226,6 +226,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0054><U004A>"
 country_ab2 "<U0054><U004A>"
 country_ab3 "<U0054><U004A><U004B>"
 country_num 762
diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
index 1b9b0414f430..a4ffa42ff4e3 100644
--- a/localedata/locales/th_TH
+++ b/localedata/locales/th_TH
@@ -943,8 +943,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U0073><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0053>/
 <U0025><U004E><U0025><U007A><U0025><U0063><U0025><U004E>"
 country_name  "<U0E44><U0E17><U0E22>"
-%FIXME
-%country_post  ""
+country_post "<U0054><U0048>"
 country_ab2   "<U0054><U0048>"
 country_ab3   "<U0054><U0048><U0041>"
 %country_num   "<U0037><U0036><U0034>"
diff --git a/localedata/locales/the_NP b/localedata/locales/the_NP
index 4fb4695dfed1..9aff85e3d587 100644
--- a/localedata/locales/the_NP
+++ b/localedata/locales/the_NP
@@ -197,6 +197,7 @@ postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 lang_term    "<U0074><U0068><U0065>"
 % the
 lang_lib     "<U0074><U0068><U0065>"
+country_post "<U004E><U0050>"
 country_ab2 "<U004E><U0050>"
 country_ab3 "<U004E><U0050><U004C>"
 country_num 524
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index d177898a3fef..afc779adec52 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -142,7 +142,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A4><U122D><U1275><U122B>"
-country_post  "<U0045><U0052><U0049>"
+country_post "<U0045><U0052>"
 country_ab2   "<U0045><U0052>"
 country_ab3   "<U0045><U0052><U0049>"
 country_num   232
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index 0ed9fa453791..9e6089481dc4 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -944,7 +944,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A2><U1275><U12EE><U1335><U12EB>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
index 9cbbc41cdfc0..5b299ecc2356 100644
--- a/localedata/locales/tig_ER
+++ b/localedata/locales/tig_ER
@@ -121,7 +121,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A4><U122D><U1275><U122B>"
-country_post  "<U0045><U0052><U0049>"
+country_post "<U0045><U0052>"
 country_ab2   "<U0045><U0052>"
 country_ab3   "<U0045><U0052><U0049>"
 country_num   232
diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM
index a144d6336e9b..9929484c32a6 100644
--- a/localedata/locales/tk_TM
+++ b/localedata/locales/tk_TM
@@ -431,7 +431,6 @@ postal_fmt   "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E><U0025>/
 % TÃrkmenistan
 country_name "<U0054><U00FC><U0072><U006B><U006D>/
 <U0065><U006E><U0069><U0073><U0074><U0061><U006E>"
-% TM
 country_post "<U0054><U004D>"
 % TM
 country_car  "<U0054><U004D>"
diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH
index b1c19cab5b6f..3452fe9fd72d 100644
--- a/localedata/locales/tl_PH
+++ b/localedata/locales/tl_PH
@@ -166,6 +166,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0050><U0048>"
 country_ab2 "<U0050><U0048>"
 country_ab3 "<U0050><U0048><U004C>"
 country_num 608
diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA
index 71f063dd90b8..43dbca9847cf 100644
--- a/localedata/locales/tn_ZA
+++ b/localedata/locales/tn_ZA
@@ -230,8 +230,6 @@ LC_ADDRESS
 % Country name in Tswana - "Aforika Borwa"
 country_name "<U0041><U0066><U006F><U0072><U0069><U006B><U0061><U0020>/
 <U0042><U006F><U0072><U0077><U0061>"
-
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
index d31cd85d6978..36fc00f15ec5 100644
--- a/localedata/locales/tr_CY
+++ b/localedata/locales/tr_CY
@@ -92,8 +92,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U004B><U0131><U0062><U0072><U0131><U0073>"
-% TR
-country_post	"<U0054><U0052>"
+country_post "<U0043><U0059>"
 country_car "<U0043><U0059>"
 country_isbn	975
 country_num 196
diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index aac470f0724b..f1ed705218e9 100644
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -4342,8 +4342,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0054><U00FC><U0072><U006B><U0069><U0079><U0065>"
-% TR
-country_post	"<U0054><U0052>"
+country_post "<U0054><U0052>"
 % TR
 country_car	"<U0054><U0052>"
 country_isbn	975
diff --git a/localedata/locales/ts_ZA b/localedata/locales/ts_ZA
index 9df1859a4991..ee7ed4f9786a 100644
--- a/localedata/locales/ts_ZA
+++ b/localedata/locales/ts_ZA
@@ -224,8 +224,6 @@ END LC_NAME
 LC_ADDRESS
 % Country name in Tsonga - "Afrika Dzonga"
 country_name "<U0041><U0066><U0072><U0069><U006B><U0061><U0020><U0044><U007A><U006F><U006E><U0067><U0061>"
-
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU
index f10bb0f73950..88111f3aae11 100644
--- a/localedata/locales/tt_RU
+++ b/localedata/locales/tt_RU
@@ -321,6 +321,7 @@ END LC_NAME
 LC_ADDRESS
 % FIXME
 postal_fmt "???"
+country_post "<U0052><U0055>"
 country_num 643
 % RUS
 country_car    "<U0052><U0055><U0053>"
diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif
index db6db5c3c607..c4bedc897d9a 100644
--- a/localedata/locales/tt_RU@iqtelif
+++ b/localedata/locales/tt_RU@iqtelif
@@ -172,6 +172,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0052><U0055>"
 country_ab2 "<U0052><U0055>"
 country_ab3 "<U0052><U0055><U0053>"
 country_num 643
diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index c967e27c62f8..89a49016b1f4 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -320,7 +320,7 @@ postal_fmt	"<U0025><U0063><U0025><U004E><U0025>/
 <U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0061>/
 <U0025><U004E>"
 country_name "<U062C><U06C7><U06AD><U06AF><U0648>"
-%country_post	"FIXME"
+country_post "<U0043><U004E>"
 country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 37f401121003..699db57c6ee4 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -1144,13 +1144,11 @@ postal_fmt "<U0025><U0061><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U006
 
 % Country name in the language of the current document.
 country_name  "<U0423><U043A><U0440><U0430><U0457><U043D><U0430>" % Ukrayina
+country_post "<U0055><U0041>"
 
 % Language name in the language of the current document.
 lang_name     "<U0443><U043A><U0440><U0430><U0457><U043D><U0441><U044C><U043A><U0430>" % ukrayins`ka [mova]
 
-% Abbreviation of the country, see CERT-MAILCODES. (%c)
-country_post  "<U0055><U0041>"
-
 % Two-letter abbreviation of the country, see ISO 3166.
 country_ab2   "<U0055><U0041>"
 
diff --git a/localedata/locales/unm_US b/localedata/locales/unm_US
index 05d21d3c760d..bf374b581073 100644
--- a/localedata/locales/unm_US
+++ b/localedata/locales/unm_US
@@ -143,7 +143,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name  "<U0055><U0053><U0041>"
-country_post  "<U0055><U0053><U0041>"
+country_post "<U0055><U0053>"
 country_ab2   "<U0055><U0053>"
 country_ab3   "<U0055><U0053><U0041>"
 country_num   840
diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN
index 5018c6e7cb90..ebe35017030f 100644
--- a/localedata/locales/ur_IN
+++ b/localedata/locales/ur_IN
@@ -175,6 +175,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0628><U06BE><U0627><U0631><U062A>"
+country_post "<U0049><U004E>"
 country_ab2 "<U0049><U004E>"
 country_ab3 "<U0049><U004E><U0044>"
 country_num 356
diff --git a/localedata/locales/ur_PK b/localedata/locales/ur_PK
index 5057c0e7d957..c462e90edb67 100644
--- a/localedata/locales/ur_PK
+++ b/localedata/locales/ur_PK
@@ -196,6 +196,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U067E><U0627><U06A9><U0633><U062A><U0627><U0646>"
+country_post "<U0050><U004B>"
 country_ab2 "<U0050><U004B>"
 country_ab3 "<U0050><U0041><U004B>"
 country_num 586
diff --git a/localedata/locales/uz_UZ b/localedata/locales/uz_UZ
index 506d55dc42aa..c3688cb7e157 100644
--- a/localedata/locales/uz_UZ
+++ b/localedata/locales/uz_UZ
@@ -318,7 +318,7 @@ postal_fmt    "<U0025><U0043><U0025><U004E>/
 <U0064><U0025><U004E><U0025><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0061><U0025><U004E><U0025><U007A>"
 country_name "<U004F><U02BB><U007A><U0062><U0065><U006B><U0069><U0073><U0074><U006F><U006E>"
-country_post "UZ" % ??
+country_post "<U0055><U005A>"
 country_ab2  "UZ"
 country_ab3  "UZB"
 country_num  860
diff --git a/localedata/locales/uz_UZ@cyrillic b/localedata/locales/uz_UZ@cyrillic
index e8483e219ebe..7a6ff4df283c 100644
--- a/localedata/locales/uz_UZ@cyrillic
+++ b/localedata/locales/uz_UZ@cyrillic
@@ -317,7 +317,7 @@ postal_fmt    "<U0025><U0043><U0025><U004E>/
 <U0064><U0025><U004E><U0025><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0061><U0025><U004E><U0025><U007A>"
 country_name "<U040E><U0437><U0431><U0435><U043A><U0438><U0441><U0442><U043E><U043D>"
-country_post "<U0055><U005A>" % ??
+country_post "<U0055><U005A>"
 country_ab2  "<U0055><U005A>"
 country_ab3  "<U0055><U005A><U0042>"
 country_num  860
diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
index c5cec115cf9d..0934620acd73 100644
--- a/localedata/locales/ve_ZA
+++ b/localedata/locales/ve_ZA
@@ -211,8 +211,6 @@ LC_ADDRESS
 % Country name in Venda - "Afurika Tshipembe"
 country_name "<U0041><U0066><U0075><U0072><U0069><U006B><U0061><U0020>/
 <U0054><U0073><U0068><U0069><U0070><U0065><U006D><U0062><U0065>"
-
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN
index c1c879b5e1b2..8465e80aadc7 100644
--- a/localedata/locales/vi_VN
+++ b/localedata/locales/vi_VN
@@ -333,6 +333,7 @@ LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name "<U0056><U0069><U1EC7><U0074><U0020><U004E><U0061><U006D>"
+country_post "<U0056><U004E>"
 lang_name "<U0056><U0069><U1EC7><U0074><U0020><U006E><U0067><U1EEF>"
 
 country_ab2 "<U0056><U004E>"
diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE
index 378287142ad6..469e85e34a12 100644
--- a/localedata/locales/wa_BE
+++ b/localedata/locales/wa_BE
@@ -44,7 +44,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0042><U0065><U006C><U006A><U0069><U006B><U0065>"
-country_post "B"
+country_post "<U0042><U0045>"
 country_ab2 "BE"
 country_ab3 "BEL"
 country_num 056
diff --git a/localedata/locales/wae_CH b/localedata/locales/wae_CH
index d1e870151bec..8d1d0358918c 100644
--- a/localedata/locales/wae_CH
+++ b/localedata/locales/wae_CH
@@ -209,9 +209,7 @@ LC_ADDRESS
 country_name "<U0053><U0063><U0068><U0077><U0069><U007A>"
 % Country name "Switzerland"
 %
-country_post "<U0044><U0048>"
-% Abbreviated country postal name - "CH"
-%
+country_post "<U0043><U0048>"
 lang_name "<U0057><U0061><U006C><U0073><U0065><U0072>"
 % Language name - "Walser"
 
diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
index 05a699cea25f..74675ac26fc0 100644
--- a/localedata/locales/wal_ET
+++ b/localedata/locales/wal_ET
@@ -108,7 +108,7 @@ LC_ADDRESS
 postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
 country_name  "<U12A2><U1275><U12EE><U1335><U12EB>"
-country_post  "<U0045><U0054><U0048>"
+country_post "<U0045><U0054>"
 country_ab2   "<U0045><U0054>"
 country_ab3   "<U0045><U0054><U0048>"
 country_num   231   % 210 found in at least one ISO 3166 doc
diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN
index e1729ef5b669..d9c3247c9de3 100644
--- a/localedata/locales/wo_SN
+++ b/localedata/locales/wo_SN
@@ -173,6 +173,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
+country_post "<U0053><U004E>"
 country_ab2 "<U0053><U004E>"
 country_ab3 "<U0053><U0045><U004E>"
 country_num 686
diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA
index 791357936944..cabf88fd3e89 100644
--- a/localedata/locales/xh_ZA
+++ b/localedata/locales/xh_ZA
@@ -220,8 +220,6 @@ LC_ADDRESS
 % Country name in Xhosa - "Mzantsi Afrika"
 country_name "<U004D><U007A><U0061><U006E><U0074><U0073><U0069><U0020>/
 <U0041><U0066><U0072><U0069><U006B><U0061>"
-%
-% Abbreviated country postal name - "ZA"
 country_post "<U005A><U0041>"
 %
 % Language name in Sotho - "IsiXhosa"
diff --git a/localedata/locales/yi_US b/localedata/locales/yi_US
index 5110b5c2c5d1..452815a4ec95 100644
--- a/localedata/locales/yi_US
+++ b/localedata/locales/yi_US
@@ -45,7 +45,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U05E4><U05BF><U05D0><U05B7><U05E8><U05D0><U05D9><U05D9><U05E0><U05D9><U05D2><U05D8><U05E2><U0020><U05E9><U05D8><U05D0><U05B7><U05D8><U05DF>"
-country_post "USA"
+country_post "<U0055><U0053>"
 country_ab2 "US"
 country_ab3 "USA"
 country_num 840
diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
index 8402a0375d3c..67c5064cf45b 100644
--- a/localedata/locales/yo_NG
+++ b/localedata/locales/yo_NG
@@ -474,15 +474,11 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 
 country_name "<U004F><U0072><U00ED><U006C><U1EB9><U0301><U00E8><U0064><U0065><U0020><U004E><U00E0><U00EC><U006A><U00ED><U0072><U00ED><U00E0>"
+country_post "<U004E><U0047>"
 
 % Language name in Yoruba - "YorÃbÃ"
 lang_name     "<U0059><U006F><U0072><U00F9><U0062><U00E1>"
 
-% CEPT MAILCODES are suggested
-% Alternatively use the code found on your countries postal item tracking number
-% "NG"?
-%country_post   "<U004E><U0047>"
-
 % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
 % http://www.unece.org/trans/conventn/Distsigns_Sept2003.pdf
 % "WAN"
diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK
index 3a8f58fabce3..25e322efe875 100644
--- a/localedata/locales/yue_HK
+++ b/localedata/locales/yue_HK
@@ -154,6 +154,7 @@ postal_fmt  "<U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0068>/
 <U0025><U004E><U0025><U0062><U0025><U0065><U0025><U0072><U0025><U004E>/
 <U0025><U0066><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0061>"
 country_name "<U4E2D><U83EF><U4EBA><U6C11><U5171><U548C><U570B><U9999><U6E2F><U7279><U5225><U884C><U653F><U5340>"
+country_post "<U0048><U004B>"
 country_ab2 "<U0048><U004B>"
 country_ab3 "<U0048><U004B><U0047>"
 country_num 344
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index e4b4886f31fb..feeddf3623ae 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -177,7 +177,7 @@ postal_fmt	"<U0025><U0063><U0025><U004E><U0025>/
 <U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U0061>/
 <U0025><U004E>"
 country_name	"<U4E2D><U534E><U4EBA><U6C11><U5171><U548C><U56FD>"
-%country_post	"FIXME"
+country_post "<U0043><U004E>"
 country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index cc85c159222b..db3bc6d38f03 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -178,6 +178,7 @@ LC_ADDRESS
 % LC_ADDRESS
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
 <U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0048><U004B>"
 country_ab2 "<U0048><U004B>"
 country_ab3 "<U0048><U004B><U0047>"
 country_num 344
diff --git a/localedata/locales/zh_SG b/localedata/locales/zh_SG
index 8b85cd6ad10a..01aca53694b2 100644
--- a/localedata/locales/zh_SG
+++ b/localedata/locales/zh_SG
@@ -174,6 +174,7 @@ LC_ADDRESS
 % This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category
 % generated by IBM Basic CountryPack Transformer.
 postal_fmt  "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073><U0025><U0062><U0025><U0065><U0025><U0072>"
+country_post "<U0053><U0047>"
 country_ab2 "<U0053><U0047>"
 country_ab3 "<U0053><U0047><U0050>"
 country_num 702
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index 08ebd9c4fa00..ab25a236c1e5 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -184,7 +184,7 @@ postal_fmt	"<U0025><U0063><U0025><U004E><U0025>/
 % country_ab3:	TWN
 % country_isbn:	957
 country_name	"<U4E2D><U83EF><U6C11><U570B>"
-%country_post	"FIXME"
+country_post "<U0054><U0057>"
 country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158
diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA
index 7d471535bf8b..a0b0d995b186 100644
--- a/localedata/locales/zu_ZA
+++ b/localedata/locales/zu_ZA
@@ -213,8 +213,6 @@ country_name "<U0069><U002D><U0053><U006F><U0075><U0074><U0068><U0020><U0041><U0
 % Country name in Zulu - "Mzansi Afrika"
 %
 country_post "<U005A><U0041>"
-% Abbreviated country postal name - "ZA"
-%
 lang_name "<U0049><U0073><U0069><U005A><U0075><U006C><U0075>"
 % Language name in Zulu - "IsiZulu"
 
-- 
2.8.2


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]