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]

[COMMITTED] [BZ #16103] LC_MEASUREMENT review and standardization


On Fri, Nov 8, 2013 at 10:51 AM, Chris Leonard <cjlhomeaddress@gmail.com> wrote:
> After Marko mentioned that a recent locale addition was missing the
> LC_MEASUREMENT category in LC_IDENTIFICATION section, I did a review
> of all locales and found that 200 others had the same missing element:
>
> https://sourceware.org/bugzilla/show_bug.cgi?id=16102
>
> As LC_MEASUREMENT is very simple, I also reviewed all of the
> LC_MEASUREMENT sections to standardize them to include comments and
> removed many spurious FIXME comments that had propagated from locale
> to locale.
>
> This patch touches nearly every locale file, so it is large in scope,
> but simple in concept.  I did a full build to test that the patch
> complies fine.
>
> Questions:
>
> 1) Is it okay to land this large, but very simple patch as one?
>
> 2) Besdies adding the bug number to NEWS as closed, is there a need
> for it's own "news item" and if so, what should it say?
>
> Thanks for your input.
>
> cjl
>
>
> 2013-11-08  Chris Leonard  <cjl@sugarlabs.org>
>
>     [BZ #16103]
>     * locales/aa_DJ: LC_MEASUREMENT review and standardization
>     * locales/aa_ER: Likewise.
>     * locales/aa_ER@saaho: Likewise.
>     * locales/aa_ET: Likewise.
>     * locales/af_ZA: Likewise.
>     * locales/ak_GH: Likewise.
>     * locales/am_ET: Likewise.
>     * locales/an_ES: Likewise.
>     * locales/anp_IN: Likewise.
>     * locales/ar_AE: Likewise.
>     * locales/ar_BH: Likewise.
>     * locales/ar_DZ: Likewise.
>     * locales/ar_EG: Likewise.
>     * locales/ar_IN: Likewise.
>     * locales/ar_IQ: Likewise.
>     * locales/ar_JO: Likewise.
>     * locales/ar_KW: Likewise.
>     * locales/ar_LB: Likewise.
>     * locales/ar_LY: Likewise.
>     * locales/ar_MA: Likewise.
>     * locales/ar_OM: Likewise.
>     * locales/ar_QA: Likewise.
>     * locales/ar_SA: Likewise.
>     * locales/ar_SD: Likewise.
>     * locales/ar_SS: Likewise.
>     * locales/ar_SY: Likewise.
>     * locales/ar_TN: Likewise.
>     * locales/ar_YE: Likewise.
>     * locales/as_IN: Likewise.
>     * locales/ast_ES: Likewise.
>     * locales/ayc_PE: Likewise.
>     * locales/az_AZ: Likewise.
>     * locales/be_BY: Likewise.
>     * locales/be_BY@latin: Likewise.
>     * locales/bem_ZM: Likewise.
>     * locales/ber_DZ: Likewise.
>     * locales/ber_MA: Likewise.
>     * locales/bg_BG: Likewise.
>     * locales/bho_IN: Likewise.
>     * locales/bn_BD: Likewise.
>     * locales/bn_IN: Likewise.
>     * locales/bo_CN: Likewise.
>     * locales/bo_IN: Likewise.
>     * locales/br_FR: Likewise.
>     * locales/br_FR@euro: Likewise.
>     * locales/brx_IN: Likewise.
>     * locales/bs_BA: Likewise.
>     * locales/byn_ER: Likewise.
>     * locales/ca_AD: Likewise.
>     * locales/ca_ES: Likewise.
>     * locales/ca_ES@euro: Likewise.
>     * locales/ca_FR: Likewise.
>     * locales/ca_IT: Likewise.
>     * locales/cmn_TW: Likewise.
>     * locales/crh_UA: Likewise.
>     * locales/cs_CZ: Likewise.
>     * locales/csb_PL: Likewise.
>     * locales/cv_RU: Likewise.
>     * locales/cy_GB: Likewise.
>     * locales/da_DK: Likewise.
>     * locales/de_AT: Likewise.
>     * locales/de_AT@euro: Likewise.
>     * locales/de_BE: Likewise.
>     * locales/de_BE@euro: Likewise.
>     * locales/de_CH: Likewise.
>     * locales/de_DE: Likewise.
>     * locales/de_DE@euro: Likewise.
>     * locales/de_LU: Likewise.
>     * locales/de_LU@euro: Likewise.
>     * locales/doi_IN: Likewise.
>     * locales/dv_MV: Likewise.
>     * locales/dz_BT: Likewise.
>     * locales/el_CY: Likewise.
>     * locales/el_GR: Likewise.
>     * locales/el_GR@euro: Likewise.
>     * locales/en_AG: Likewise.
>     * locales/en_AU: Likewise.
>     * locales/en_BW: Likewise.
>     * locales/en_CA: Likewise.
>     * locales/en_DK: Likewise.
>     * locales/en_GB: Likewise.
>     * locales/en_HK: Likewise.
>     * locales/en_IE: Likewise.
>     * locales/en_IE@euro: Likewise.
>     * locales/en_IN: Likewise.
>     * locales/en_NG: Likewise.
>     * locales/en_NZ: Likewise.
>     * locales/en_PH: Likewise.
>     * locales/en_SG: Likewise.
>     * locales/en_US: Likewise.
>     * locales/en_ZA: Likewise.
>     * locales/en_ZM: Likewise.
>     * locales/en_ZW: Likewise.
>     * locales/es_AR: Likewise.
>     * locales/es_BO: Likewise.
>     * locales/es_CL: Likewise.
>     * locales/es_CO: Likewise.
>     * locales/es_CR: Likewise.
>     * locales/es_CU: Likewise.
>     * locales/es_DO: Likewise.
>     * locales/es_EC: Likewise.
>     * locales/es_ES: Likewise.
>     * locales/es_ES@euro: Likewise.
>     * locales/es_GT: Likewise.
>     * locales/es_HN: Likewise.
>     * locales/es_MX: Likewise.
>     * locales/es_NI: Likewise.
>     * locales/es_PA: Likewise.
>     * locales/es_PE: Likewise.
>     * locales/es_PR: Likewise.
>     * locales/es_PY: Likewise.
>     * locales/es_SV: Likewise.
>     * locales/es_US: Likewise.
>     * locales/es_UY: Likewise.
>     * locales/es_VE: Likewise.
>     * locales/et_EE: Likewise.
>     * locales/eu_ES: Likewise.
>     * locales/eu_ES@euro: Likewise.
>     * locales/fa_IR: Likewise.
>     * locales/ff_SN: Likewise.
>     * locales/fi_FI: Likewise.
>     * locales/fi_FI@euro: Likewise.
>     * locales/fil_PH: Likewise.
>     * locales/fo_FO: Likewise.
>     * locales/fr_BE: Likewise.
>     * locales/fr_BE@euro: Likewise.
>     * locales/fr_CA: Likewise.
>     * locales/fr_CH: Likewise.
>     * locales/fr_FR: Likewise.
>     * locales/fr_FR@euro: Likewise.
>     * locales/fr_LU: Likewise.
>     * locales/fr_LU@euro: Likewise.
>     * locales/fur_IT: Likewise.
>     * locales/fy_DE: Likewise.
>     * locales/fy_NL: Likewise.
>     * locales/ga_IE: Likewise.
>     * locales/ga_IE@euro: Likewise.
>     * locales/gd_GB: Likewise.
>     * locales/gez_ER: Likewise.
>     * locales/gez_ER@abegede: Likewise.
>     * locales/gez_ET: Likewise.
>     * locales/gez_ET@abegede: Likewise.
>     * locales/gl_ES: Likewise.
>     * locales/gl_ES@euro: Likewise.
>     * locales/gu_IN: Likewise.
>     * locales/gv_GB: Likewise.
>     * locales/ha_NG: Likewise.
>     * locales/hak_TW: Likewise.
>     * locales/he_IL: Likewise.
>     * locales/hi_IN: Likewise.
>     * locales/hne_IN: Likewise.
>     * locales/hr_HR: Likewise.
>     * locales/hsb_DE: Likewise.
>     * locales/hu_HU: Likewise.
>     * locales/hy_AM: Likewise.
>     * locales/ia_FR: Likewise.
>     * locales/id_ID: Likewise.
>     * locales/ig_NG: Likewise.
>     * locales/ik_CA: Likewise.
>     * locales/is_IS: Likewise.
>     * locales/it_CH: Likewise.
>     * locales/it_IT: Likewise.
>     * locales/it_IT@euro: Likewise.
>     * locales/iu_CA: Likewise.
>     * locales/ja_JP: Likewise.
>     * locales/ka_GE: Likewise.
>     * locales/kk_KZ: Likewise.
>     * locales/kl_GL: Likewise.
>     * locales/km_KH: Likewise.
>     * locales/kn_IN: Likewise.
>     * locales/ko_KR: Likewise.
>     * locales/kok_IN: Likewise.
>     * locales/ks_IN: Likewise.
>     * locales/ks_IN@devanagari: Likewise.
>     * locales/ku_TR: Likewise.
>     * locales/kw_GB: Likewise.
>     * locales/ky_KG: Likewise.
>     * locales/lb_LU: Likewise.
>     * locales/lg_UG: Likewise.
>     * locales/li_BE: Likewise.
>     * locales/li_NL: Likewise.
>     * locales/lij_IT: Likewise.
>     * locales/lo_LA: Likewise.
>     * locales/lt_LT: Likewise.
>     * locales/lv_LV: Likewise.
>     * locales/lzh_TW: Likewise.
>     * locales/mag_IN: Likewise.
>     * locales/mai_IN: Likewise.
>     * locales/mg_MG: Likewise.
>     * locales/mhr_RU: Likewise.
>     * locales/mi_NZ: Likewise.
>     * locales/mk_MK: Likewise.
>     * locales/ml_IN: Likewise.
>     * locales/mn_MN: Likewise.
>     * locales/mni_IN: Likewise.
>     * locales/mr_IN: Likewise.
>     * locales/ms_MY: Likewise.
>     * locales/mt_MT: Likewise.
>     * locales/my_MM: Likewise.
>     * locales/nan_TW: Likewise.
>     * locales/nan_TW@latin: Likewise.
>     * locales/nb_NO: Likewise.
>     * locales/nds_DE: Likewise.
>     * locales/nds_NL: Likewise.
>     * locales/ne_NP: Likewise.
>     * locales/nhn_MX: Likewise.
>     * locales/niu_NU: Likewise.
>     * locales/niu_NZ: Likewise.
>     * locales/nl_AW: Likewise.
>     * locales/nl_BE: Likewise.
>     * locales/nl_BE@euro: Likewise.
>     * locales/nl_NL: Likewise.
>     * locales/nl_NL@euro: Likewise.
>     * locales/nn_NO: Likewise.
>     * locales/nr_ZA: Likewise.
>     * locales/nso_ZA: Likewise.
>     * locales/oc_FR: Likewise.
>     * locales/om_ET: Likewise.
>     * locales/om_KE: Likewise.
>     * locales/or_IN: Likewise.
>     * locales/os_RU: Likewise.
>     * locales/pa_IN: Likewise.
>     * locales/pa_PK: Likewise.
>     * locales/pap_AN: Likewise.
>     * locales/pap_AW: Likewise.
>     * locales/pap_CW: Likewise.
>     * locales/pl_PL: Likewise.
>     * locales/ps_AF: Likewise.
>     * locales/pt_BR: Likewise.
>     * locales/pt_PT: Likewise.
>     * locales/pt_PT@euro: Likewise.
>     * locales/quz_PE: Likewise.
>     * locales/ro_RO: Likewise.
>     * locales/ru_RU: Likewise.
>     * locales/ru_UA: Likewise.
>     * locales/rw_RW: Likewise.
>     * locales/sa_IN: Likewise.
>     * locales/sat_IN: Likewise.
>     * locales/sc_IT: Likewise.
>     * locales/sd_IN: Likewise.
>     * locales/sd_IN@devanagari: Likewise.
>     * locales/se_NO: Likewise.
>     * locales/shs_CA: Likewise.
>     * locales/si_LK: Likewise.
>     * locales/sid_ET: Likewise.
>     * locales/sk_SK: Likewise.
>     * locales/sl_SI: Likewise.
>     * locales/so_DJ: Likewise.
>     * locales/so_ET: Likewise.
>     * locales/so_KE: Likewise.
>     * locales/so_SO: Likewise.
>     * locales/sq_AL: Likewise.
>     * locales/sq_MK: Likewise.
>     * locales/sr_ME: Likewise.
>     * locales/sr_RS: Likewise.
>     * locales/sr_RS@latin: Likewise.
>     * locales/ss_ZA: Likewise.
>     * locales/st_ZA: Likewise.
>     * locales/sv_FI: Likewise.
>     * locales/sv_FI@euro: Likewise.
>     * locales/sv_SE: Likewise.
>     * locales/sw_KE: Likewise.
>     * locales/sw_TZ: Likewise.
>     * locales/szl_PL: Likewise.
>     * locales/ta_IN: Likewise.
>     * locales/ta_LK: Likewise.
>     * locales/te_IN: Likewise.
>     * locales/tg_TJ: Likewise.
>     * locales/th_TH: Likewise.
>     * locales/ti_ER: Likewise.
>     * locales/ti_ET: Likewise.
>     * locales/tig_ER: Likewise.
>     * locales/tk_TM: Likewise.
>     * locales/tl_PH: Likewise.
>     * locales/tn_ZA: Likewise.
>     * locales/tr_CY: Likewise.
>     * locales/tr_TR: Likewise.
>     * locales/ts_ZA: Likewise.
>     * locales/tt_RU: Likewise.
>     * locales/tt_RU@iqtelif: Likewise.
>     * locales/ug_CN: Likewise.
>     * locales/uk_UA: Likewise.
>     * locales/unm_US: Likewise.
>     * locales/ur_IN: Likewise.
>     * locales/ur_PK: Likewise.
>     * locales/uz_UZ: Likewise.
>     * locales/uz_UZ@cyrillic: Likewise.
>     * locales/ve_ZA: Likewise.
>     * locales/vi_VN: Likewise.
>     * locales/wa_BE: Likewise.
>     * locales/wa_BE@euro: Likewise.
>     * locales/wae_CH: Likewise.
>     * locales/wal_ET: Likewise.
>     * locales/wo_SN: Likewise.
>     * locales/xh_ZA: Likewise.
>     * locales/yi_US: Likewise.
>     * locales/yo_NG: Likewise.
>     * locales/yue_HK: Likewise.
>     * locales/zh_CN: Likewise.
>     * locales/zh_HK: Likewise.
>     * locales/zh_SG: Likewise.
>     * locales/zh_TW: Likewise.
>     * locales/zu_ZA: Likewise.
>
>
> From 8e510fca53803feb7d3664df153e1b317f8dfd97 Mon Sep 17 00:00:00 2001
> From: Chris Leonard <cjlhomeaddress@gmail.com>
> Date: Fri, 8 Nov 2013 10:31:01 -0500
> Subject: [PATCH] [BZ #16102]  LC_MEASUREMENT review and standardization
>
> ---
>  localedata/ChangeLog                | 307 ++++++++++++++++++++++++++++++++++++
>  localedata/locales/aa_DJ            |   5 +-
>  localedata/locales/aa_ER            |   3 +-
>  localedata/locales/aa_ER@saaho      |   3 +-
>  localedata/locales/aa_ET            |   3 +-
>  localedata/locales/af_ZA            |   3 +-
>  localedata/locales/ak_GH            |   2 +-
>  localedata/locales/am_ET            |   3 +-
>  localedata/locales/an_ES            |   4 +-
>  localedata/locales/anp_IN           |   3 +-
>  localedata/locales/ar_AE            |   5 +-
>  localedata/locales/ar_BH            |   5 +-
>  localedata/locales/ar_DZ            |   5 +-
>  localedata/locales/ar_EG            |   5 +-
>  localedata/locales/ar_IN            |   5 +-
>  localedata/locales/ar_IQ            |   5 +-
>  localedata/locales/ar_JO            |   5 +-
>  localedata/locales/ar_KW            |   5 +-
>  localedata/locales/ar_LB            |   5 +-
>  localedata/locales/ar_LY            |   5 +-
>  localedata/locales/ar_MA            |   5 +-
>  localedata/locales/ar_OM            |   5 +-
>  localedata/locales/ar_QA            |   5 +-
>  localedata/locales/ar_SA            |   5 +-
>  localedata/locales/ar_SD            |   5 +-
>  localedata/locales/ar_SS            |   5 +-
>  localedata/locales/ar_SY            |   5 +-
>  localedata/locales/ar_TN            |   5 +-
>  localedata/locales/ar_YE            |   5 +-
>  localedata/locales/as_IN            |   4 +-
>  localedata/locales/ast_ES           |   4 +-
>  localedata/locales/ayc_PE           |   1 +
>  localedata/locales/az_AZ            |   1 +
>  localedata/locales/be_BY            |   6 +-
>  localedata/locales/be_BY@latin      |   4 +-
>  localedata/locales/bem_ZM           |   3 +-
>  localedata/locales/ber_DZ           |   1 +
>  localedata/locales/ber_MA           |   1 +
>  localedata/locales/bg_BG            |   4 +-
>  localedata/locales/bho_IN           |   5 +-
>  localedata/locales/bn_BD            |   2 +-
>  localedata/locales/bn_IN            |   5 +-
>  localedata/locales/bo_CN            |   5 +-
>  localedata/locales/bo_IN            |   5 +-
>  localedata/locales/br_FR            |   1 +
>  localedata/locales/br_FR@euro       |   5 +-
>  localedata/locales/brx_IN           |   5 +-
>  localedata/locales/bs_BA            |   1 +
>  localedata/locales/byn_ER           |   3 +-
>  localedata/locales/ca_AD            |   5 +-
>  localedata/locales/ca_ES            |   6 +-
>  localedata/locales/ca_ES@euro       |   5 +-
>  localedata/locales/ca_FR            |   5 +-
>  localedata/locales/ca_IT            |   5 +-
>  localedata/locales/cmn_TW           |   1 +
>  localedata/locales/crh_UA           |   1 +
>  localedata/locales/cs_CZ            |   5 +-
>  localedata/locales/csb_PL           |   5 +-
>  localedata/locales/cv_RU            |   5 +-
>  localedata/locales/cy_GB            |   3 +-
>  localedata/locales/da_DK            |   6 +-
>  localedata/locales/de_AT            |   5 +-
>  localedata/locales/de_AT@euro       |   5 +-
>  localedata/locales/de_BE            |   5 +-
>  localedata/locales/de_BE@euro       |   5 +-
>  localedata/locales/de_CH            |   6 +-
>  localedata/locales/de_DE            |   5 +-
>  localedata/locales/de_DE@euro       |   5 +-
>  localedata/locales/de_LU            |   6 +-
>  localedata/locales/de_LU@euro       |   5 +-
>  localedata/locales/doi_IN           |   5 +-
>  localedata/locales/dv_MV            |   5 +-
>  localedata/locales/dz_BT            |   7 +-
>  localedata/locales/el_CY            |   6 +-
>  localedata/locales/el_GR            |   6 +-
>  localedata/locales/el_GR@euro       |   5 +-
>  localedata/locales/en_AG            |   5 +-
>  localedata/locales/en_AU            |   6 +-
>  localedata/locales/en_BW            |   6 +-
>  localedata/locales/en_CA            |   6 +-
>  localedata/locales/en_DK            |   5 +-
>  localedata/locales/en_GB            |   5 +-
>  localedata/locales/en_HK            |   6 +-
>  localedata/locales/en_IE            |   6 +-
>  localedata/locales/en_IE@euro       |   5 +-
>  localedata/locales/en_IN            |   5 +-
>  localedata/locales/en_NG            |   3 +-
>  localedata/locales/en_NZ            |   6 +-
>  localedata/locales/en_PH            |   6 +-
>  localedata/locales/en_SG            |   6 +-
>  localedata/locales/en_US            |   3 +-
>  localedata/locales/en_ZA            |   3 +-
>  localedata/locales/en_ZM            |   3 +-
>  localedata/locales/en_ZW            |   6 +-
>  localedata/locales/es_AR            |   6 +-
>  localedata/locales/es_BO            |   6 +-
>  localedata/locales/es_CL            |   6 +-
>  localedata/locales/es_CO            |   6 +-
>  localedata/locales/es_CR            |   5 +-
>  localedata/locales/es_CU            |   6 +-
>  localedata/locales/es_DO            |   6 +-
>  localedata/locales/es_EC            |   6 +-
>  localedata/locales/es_ES            |   6 +-
>  localedata/locales/es_ES@euro       |   5 +-
>  localedata/locales/es_GT            |   6 +-
>  localedata/locales/es_HN            |   6 +-
>  localedata/locales/es_MX            |   6 +-
>  localedata/locales/es_NI            |   6 +-
>  localedata/locales/es_PA            |   6 +-
>  localedata/locales/es_PE            |   6 +-
>  localedata/locales/es_PR            |   3 +-
>  localedata/locales/es_PY            |   6 +-
>  localedata/locales/es_SV            |   6 +-
>  localedata/locales/es_US            |   3 +-
>  localedata/locales/es_UY            |   6 +-
>  localedata/locales/es_VE            |   6 +-
>  localedata/locales/et_EE            |   6 +-
>  localedata/locales/eu_ES            |   6 +-
>  localedata/locales/eu_ES@euro       |   5 +-
>  localedata/locales/fa_IR            |   5 +-
>  localedata/locales/ff_SN            |   3 +-
>  localedata/locales/fi_FI            |   3 +-
>  localedata/locales/fi_FI@euro       |   3 +-
>  localedata/locales/fil_PH           |   1 +
>  localedata/locales/fo_FO            |   6 +-
>  localedata/locales/fr_BE            |   6 +-
>  localedata/locales/fr_BE@euro       |   5 +-
>  localedata/locales/fr_CA            |   5 +-
>  localedata/locales/fr_CH            |   6 +-
>  localedata/locales/fr_FR            |   5 +-
>  localedata/locales/fr_FR@euro       |   5 +-
>  localedata/locales/fr_LU            |   6 +-
>  localedata/locales/fr_LU@euro       |   5 +-
>  localedata/locales/fur_IT           |   5 +-
>  localedata/locales/fy_DE            |   3 +-
>  localedata/locales/fy_NL            |   3 +-
>  localedata/locales/ga_IE            |   6 +-
>  localedata/locales/ga_IE@euro       |   5 +-
>  localedata/locales/gd_GB            |   3 +-
>  localedata/locales/gez_ER           |   3 +-
>  localedata/locales/gez_ER@abegede   |   3 +-
>  localedata/locales/gez_ET           |   3 +-
>  localedata/locales/gez_ET@abegede   |   3 +-
>  localedata/locales/gl_ES            |   6 +-
>  localedata/locales/gl_ES@euro       |   5 +-
>  localedata/locales/gu_IN            |   5 +-
>  localedata/locales/gv_GB            |   6 +-
>  localedata/locales/ha_NG            |   5 +-
>  localedata/locales/hak_TW           |   1 +
>  localedata/locales/he_IL            |   6 +-
>  localedata/locales/hi_IN            |   5 +-
>  localedata/locales/hne_IN           |   5 +-
>  localedata/locales/hr_HR            |   6 +-
>  localedata/locales/hsb_DE           |   5 +-
>  localedata/locales/hu_HU            |   6 +-
>  localedata/locales/hy_AM            |   2 +-
>  localedata/locales/ia_FR            |   3 +-
>  localedata/locales/id_ID            |   6 +-
>  localedata/locales/ig_NG            |   5 +-
>  localedata/locales/ik_CA            |   4 +-
>  localedata/locales/is_IS            |   6 +-
>  localedata/locales/it_CH            |   6 +-
>  localedata/locales/it_IT            |   6 +-
>  localedata/locales/it_IT@euro       |   5 +-
>  localedata/locales/iu_CA            |   2 +-
>  localedata/locales/ja_JP            |   6 +-
>  localedata/locales/ka_GE            |   2 +-
>  localedata/locales/kk_KZ            |   6 +-
>  localedata/locales/kl_GL            |   6 +-
>  localedata/locales/km_KH            |   6 +-
>  localedata/locales/kn_IN            |   5 +-
>  localedata/locales/ko_KR            |   6 +-
>  localedata/locales/kok_IN           |   5 +-
>  localedata/locales/ks_IN            |   6 +-
>  localedata/locales/ks_IN@devanagari |   5 +-
>  localedata/locales/ku_TR            |   3 +-
>  localedata/locales/kw_GB            |   6 +-
>  localedata/locales/ky_KG            |   5 +-
>  localedata/locales/lb_LU            |   1 +
>  localedata/locales/lg_UG            |   5 +-
>  localedata/locales/li_BE            |   3 +-
>  localedata/locales/li_NL            |   3 +-
>  localedata/locales/lij_IT           |   6 +-
>  localedata/locales/lo_LA            |   6 +-
>  localedata/locales/lt_LT            |   6 +-
>  localedata/locales/lv_LV            |   6 +-
>  localedata/locales/lzh_TW           |   1 +
>  localedata/locales/mag_IN           |   5 +-
>  localedata/locales/mai_IN           |   5 +-
>  localedata/locales/mg_MG            |   5 +-
>  localedata/locales/mhr_RU           |   5 +-
>  localedata/locales/mi_NZ            |   1 +
>  localedata/locales/mk_MK            |   5 +-
>  localedata/locales/ml_IN            |   4 +-
>  localedata/locales/mn_MN            |   5 +-
>  localedata/locales/mni_IN           |   5 +-
>  localedata/locales/mr_IN            |   5 +-
>  localedata/locales/ms_MY            |   6 +-
>  localedata/locales/mt_MT            |   6 +-
>  localedata/locales/my_MM            |   3 +-
>  localedata/locales/nan_TW           |   1 +
>  localedata/locales/nan_TW@latin     |   1 +
>  localedata/locales/nb_NO            |   5 +-
>  localedata/locales/nds_DE           |   3 +-
>  localedata/locales/nds_NL           |   3 +-
>  localedata/locales/ne_NP            |   6 +-
>  localedata/locales/nhn_MX           |   3 +-
>  localedata/locales/niu_NU           |   1 +
>  localedata/locales/niu_NZ           |   1 +
>  localedata/locales/nl_AW            |   5 +-
>  localedata/locales/nl_BE            |   5 +-
>  localedata/locales/nl_BE@euro       |   5 +-
>  localedata/locales/nl_NL            |   6 +-
>  localedata/locales/nl_NL@euro       |   5 +-
>  localedata/locales/nn_NO            |   5 +-
>  localedata/locales/nr_ZA            |   3 +-
>  localedata/locales/nso_ZA           |   3 +-
>  localedata/locales/oc_FR            |   3 +-
>  localedata/locales/om_ET            |   3 +-
>  localedata/locales/om_KE            |   9 +-
>  localedata/locales/or_IN            |   4 +-
>  localedata/locales/os_RU            |   5 +-
>  localedata/locales/pa_IN            |   5 +-
>  localedata/locales/pa_PK            |   5 +-
>  localedata/locales/pap_AN           |   2 +-
>  localedata/locales/pap_AW           |   2 +-
>  localedata/locales/pap_CW           |   2 +-
>  localedata/locales/pl_PL            |   6 +-
>  localedata/locales/ps_AF            |   3 +-
>  localedata/locales/pt_BR            |   6 +-
>  localedata/locales/pt_PT            |   5 +-
>  localedata/locales/pt_PT@euro       |   5 +-
>  localedata/locales/quz_PE           |   2 +-
>  localedata/locales/ro_RO            |   5 +-
>  localedata/locales/ru_RU            |   6 +-
>  localedata/locales/ru_UA            |   6 +-
>  localedata/locales/rw_RW            |   3 +-
>  localedata/locales/sa_IN            |   5 +-
>  localedata/locales/sat_IN           |   5 +-
>  localedata/locales/sc_IT            |   5 +-
>  localedata/locales/sd_IN            |   6 +-
>  localedata/locales/sd_IN@devanagari |   5 +-
>  localedata/locales/se_NO            |   3 +-
>  localedata/locales/shs_CA           |   5 +-
>  localedata/locales/si_LK            |   7 +-
>  localedata/locales/sid_ET           |   5 +-
>  localedata/locales/sk_SK            |   6 +-
>  localedata/locales/sl_SI            |   6 +-
>  localedata/locales/so_DJ            |   5 +-
>  localedata/locales/so_ET            |   7 +-
>  localedata/locales/so_KE            |  13 +-
>  localedata/locales/so_SO            |   7 +-
>  localedata/locales/sq_AL            |   6 +-
>  localedata/locales/sq_MK            |   2 +-
>  localedata/locales/sr_ME            |   3 +-
>  localedata/locales/sr_RS            |   3 +-
>  localedata/locales/sr_RS@latin      |   3 +-
>  localedata/locales/ss_ZA            |   3 +-
>  localedata/locales/st_ZA            |   3 +-
>  localedata/locales/sv_FI            |   3 +-
>  localedata/locales/sv_FI@euro       |   3 +-
>  localedata/locales/sv_SE            |   5 +-
>  localedata/locales/sw_KE            |   3 +-
>  localedata/locales/sw_TZ            |   3 +-
>  localedata/locales/szl_PL           |   3 +-
>  localedata/locales/ta_IN            |   3 +-
>  localedata/locales/ta_LK            |   5 +-
>  localedata/locales/te_IN            |   5 +-
>  localedata/locales/tg_TJ            |   1 +
>  localedata/locales/th_TH            |   6 +-
>  localedata/locales/ti_ER            |   9 +-
>  localedata/locales/ti_ET            |   9 +-
>  localedata/locales/tig_ER           |   7 +-
>  localedata/locales/tk_TM            |   1 +
>  localedata/locales/tl_PH            |   1 +
>  localedata/locales/tn_ZA            |   3 +-
>  localedata/locales/tr_CY            |   3 +-
>  localedata/locales/tr_TR            |   3 +-
>  localedata/locales/ts_ZA            |   3 +-
>  localedata/locales/tt_RU            |   3 +-
>  localedata/locales/tt_RU@iqtelif    |   1 +
>  localedata/locales/ug_CN            |   2 +-
>  localedata/locales/uk_UA            |   6 +-
>  localedata/locales/unm_US           |   3 +-
>  localedata/locales/ur_IN            |   5 +-
>  localedata/locales/ur_PK            |   3 +-
>  localedata/locales/uz_UZ            |   3 +-
>  localedata/locales/uz_UZ@cyrillic   |   3 +-
>  localedata/locales/ve_ZA            |   3 +-
>  localedata/locales/vi_VN            |   1 +
>  localedata/locales/wa_BE            |   4 +-
>  localedata/locales/wa_BE@euro       |   5 +-
>  localedata/locales/wae_CH           |   3 +-
>  localedata/locales/wal_ET           |   7 +-
>  localedata/locales/wo_SN            |   5 +-
>  localedata/locales/xh_ZA            |   3 +-
>  localedata/locales/yi_US            |   3 +-
>  localedata/locales/yo_NG            |   5 +-
>  localedata/locales/yue_HK           |   5 +-
>  localedata/locales/zh_CN            |   5 +-
>  localedata/locales/zh_HK            |   6 +-
>  localedata/locales/zh_SG            |   6 +-
>  localedata/locales/zh_TW            |   4 +-
>  localedata/locales/zu_ZA            |   3 +-
>  304 files changed, 1055 insertions(+), 615 deletions(-)
>
> diff --git a/localedata/ChangeLog b/localedata/ChangeLog
> index e493d9d..09f8f26 100644
> --- a/localedata/ChangeLog
> +++ b/localedata/ChangeLog
> @@ -1,3 +1,310 @@
> +2013-11-08  Chris Leonard  <cjl@sugarlabs.org>
> +
> +    [BZ #16102]
> +    * locales/aa_DJ: LC_MEASUREMENT review and standardization
> +    * locales/aa_ER: Likewise.
> +    * locales/aa_ER@saaho: Likewise.
> +    * locales/aa_ET: Likewise.
> +    * locales/af_ZA: Likewise.
> +    * locales/ak_GH: Likewise.
> +    * locales/am_ET: Likewise.
> +    * locales/an_ES: Likewise.
> +    * locales/anp_IN: Likewise.
> +    * locales/ar_AE: Likewise.
> +    * locales/ar_BH: Likewise.
> +    * locales/ar_DZ: Likewise.
> +    * locales/ar_EG: Likewise.
> +    * locales/ar_IN: Likewise.
> +    * locales/ar_IQ: Likewise.
> +    * locales/ar_JO: Likewise.
> +    * locales/ar_KW: Likewise.
> +    * locales/ar_LB: Likewise.
> +    * locales/ar_LY: Likewise.
> +    * locales/ar_MA: Likewise.
> +    * locales/ar_OM: Likewise.
> +    * locales/ar_QA: Likewise.
> +    * locales/ar_SA: Likewise.
> +    * locales/ar_SD: Likewise.
> +    * locales/ar_SS: Likewise.
> +    * locales/ar_SY: Likewise.
> +    * locales/ar_TN: Likewise.
> +    * locales/ar_YE: Likewise.
> +    * locales/as_IN: Likewise.
> +    * locales/ast_ES: Likewise.
> +    * locales/ayc_PE: Likewise.
> +    * locales/az_AZ: Likewise.
> +    * locales/be_BY: Likewise.
> +    * locales/be_BY@latin: Likewise.
> +    * locales/bem_ZM: Likewise.
> +    * locales/ber_DZ: Likewise.
> +    * locales/ber_MA: Likewise.
> +    * locales/bg_BG: Likewise.
> +    * locales/bho_IN: Likewise.
> +    * locales/bn_BD: Likewise.
> +    * locales/bn_IN: Likewise.
> +    * locales/bo_CN: Likewise.
> +    * locales/bo_IN: Likewise.
> +    * locales/br_FR: Likewise.
> +    * locales/br_FR@euro: Likewise.
> +    * locales/brx_IN: Likewise.
> +    * locales/bs_BA: Likewise.
> +    * locales/byn_ER: Likewise.
> +    * locales/ca_AD: Likewise.
> +    * locales/ca_ES: Likewise.
> +    * locales/ca_ES@euro: Likewise.
> +    * locales/ca_FR: Likewise.
> +    * locales/ca_IT: Likewise.
> +    * locales/cmn_TW: Likewise.
> +    * locales/crh_UA: Likewise.
> +    * locales/cs_CZ: Likewise.
> +    * locales/csb_PL: Likewise.
> +    * locales/cv_RU: Likewise.
> +    * locales/cy_GB: Likewise.
> +    * locales/da_DK: Likewise.
> +    * locales/de_AT: Likewise.
> +    * locales/de_AT@euro: Likewise.
> +    * locales/de_BE: Likewise.
> +    * locales/de_BE@euro: Likewise.
> +    * locales/de_CH: Likewise.
> +    * locales/de_DE: Likewise.
> +    * locales/de_DE@euro: Likewise.
> +    * locales/de_LU: Likewise.
> +    * locales/de_LU@euro: Likewise.
> +    * locales/doi_IN: Likewise.
> +    * locales/dv_MV: Likewise.
> +    * locales/dz_BT: Likewise.
> +    * locales/el_CY: Likewise.
> +    * locales/el_GR: Likewise.
> +    * locales/el_GR@euro: Likewise.
> +    * locales/en_AG: Likewise.
> +    * locales/en_AU: Likewise.
> +    * locales/en_BW: Likewise.
> +    * locales/en_CA: Likewise.
> +    * locales/en_DK: Likewise.
> +    * locales/en_GB: Likewise.
> +    * locales/en_HK: Likewise.
> +    * locales/en_IE: Likewise.
> +    * locales/en_IE@euro: Likewise.
> +    * locales/en_IN: Likewise.
> +    * locales/en_NG: Likewise.
> +    * locales/en_NZ: Likewise.
> +    * locales/en_PH: Likewise.
> +    * locales/en_SG: Likewise.
> +    * locales/en_US: Likewise.
> +    * locales/en_ZA: Likewise.
> +    * locales/en_ZM: Likewise.
> +    * locales/en_ZW: Likewise.
> +    * locales/es_AR: Likewise.
> +    * locales/es_BO: Likewise.
> +    * locales/es_CL: Likewise.
> +    * locales/es_CO: Likewise.
> +    * locales/es_CR: Likewise.
> +    * locales/es_CU: Likewise.
> +    * locales/es_DO: Likewise.
> +    * locales/es_EC: Likewise.
> +    * locales/es_ES: Likewise.
> +    * locales/es_ES@euro: Likewise.
> +    * locales/es_GT: Likewise.
> +    * locales/es_HN: Likewise.
> +    * locales/es_MX: Likewise.
> +    * locales/es_NI: Likewise.
> +    * locales/es_PA: Likewise.
> +    * locales/es_PE: Likewise.
> +    * locales/es_PR: Likewise.
> +    * locales/es_PY: Likewise.
> +    * locales/es_SV: Likewise.
> +    * locales/es_US: Likewise.
> +    * locales/es_UY: Likewise.
> +    * locales/es_VE: Likewise.
> +    * locales/et_EE: Likewise.
> +    * locales/eu_ES: Likewise.
> +    * locales/eu_ES@euro: Likewise.
> +    * locales/fa_IR: Likewise.
> +    * locales/ff_SN: Likewise.
> +    * locales/fi_FI: Likewise.
> +    * locales/fi_FI@euro: Likewise.
> +    * locales/fil_PH: Likewise.
> +    * locales/fo_FO: Likewise.
> +    * locales/fr_BE: Likewise.
> +    * locales/fr_BE@euro: Likewise.
> +    * locales/fr_CA: Likewise.
> +    * locales/fr_CH: Likewise.
> +    * locales/fr_FR: Likewise.
> +    * locales/fr_FR@euro: Likewise.
> +    * locales/fr_LU: Likewise.
> +    * locales/fr_LU@euro: Likewise.
> +    * locales/fur_IT: Likewise.
> +    * locales/fy_DE: Likewise.
> +    * locales/fy_NL: Likewise.
> +    * locales/ga_IE: Likewise.
> +    * locales/ga_IE@euro: Likewise.
> +    * locales/gd_GB: Likewise.
> +    * locales/gez_ER: Likewise.
> +    * locales/gez_ER@abegede: Likewise.
> +    * locales/gez_ET: Likewise.
> +    * locales/gez_ET@abegede: Likewise.
> +    * locales/gl_ES: Likewise.
> +    * locales/gl_ES@euro: Likewise.
> +    * locales/gu_IN: Likewise.
> +    * locales/gv_GB: Likewise.
> +    * locales/ha_NG: Likewise.
> +    * locales/hak_TW: Likewise.
> +    * locales/he_IL: Likewise.
> +    * locales/hi_IN: Likewise.
> +    * locales/hne_IN: Likewise.
> +    * locales/hr_HR: Likewise.
> +    * locales/hsb_DE: Likewise.
> +    * locales/hu_HU: Likewise.
> +    * locales/hy_AM: Likewise.
> +    * locales/ia_FR: Likewise.
> +    * locales/id_ID: Likewise.
> +    * locales/ig_NG: Likewise.
> +    * locales/ik_CA: Likewise.
> +    * locales/is_IS: Likewise.
> +    * locales/it_CH: Likewise.
> +    * locales/it_IT: Likewise.
> +    * locales/it_IT@euro: Likewise.
> +    * locales/iu_CA: Likewise.
> +    * locales/ja_JP: Likewise.
> +    * locales/ka_GE: Likewise.
> +    * locales/kk_KZ: Likewise.
> +    * locales/kl_GL: Likewise.
> +    * locales/km_KH: Likewise.
> +    * locales/kn_IN: Likewise.
> +    * locales/ko_KR: Likewise.
> +    * locales/kok_IN: Likewise.
> +    * locales/ks_IN: Likewise.
> +    * locales/ks_IN@devanagari: Likewise.
> +    * locales/ku_TR: Likewise.
> +    * locales/kw_GB: Likewise.
> +    * locales/ky_KG: Likewise.
> +    * locales/lb_LU: Likewise.
> +    * locales/lg_UG: Likewise.
> +    * locales/li_BE: Likewise.
> +    * locales/li_NL: Likewise.
> +    * locales/lij_IT: Likewise.
> +    * locales/lo_LA: Likewise.
> +    * locales/lt_LT: Likewise.
> +    * locales/lv_LV: Likewise.
> +    * locales/lzh_TW: Likewise.
> +    * locales/mag_IN: Likewise.
> +    * locales/mai_IN: Likewise.
> +    * locales/mg_MG: Likewise.
> +    * locales/mhr_RU: Likewise.
> +    * locales/mi_NZ: Likewise.
> +    * locales/mk_MK: Likewise.
> +    * locales/ml_IN: Likewise.
> +    * locales/mn_MN: Likewise.
> +    * locales/mni_IN: Likewise.
> +    * locales/mr_IN: Likewise.
> +    * locales/ms_MY: Likewise.
> +    * locales/mt_MT: Likewise.
> +    * locales/my_MM: Likewise.
> +    * locales/nan_TW: Likewise.
> +    * locales/nan_TW@latin: Likewise.
> +    * locales/nb_NO: Likewise.
> +    * locales/nds_DE: Likewise.
> +    * locales/nds_NL: Likewise.
> +    * locales/ne_NP: Likewise.
> +    * locales/nhn_MX: Likewise.
> +    * locales/niu_NU: Likewise.
> +    * locales/niu_NZ: Likewise.
> +    * locales/nl_AW: Likewise.
> +    * locales/nl_BE: Likewise.
> +    * locales/nl_BE@euro: Likewise.
> +    * locales/nl_NL: Likewise.
> +    * locales/nl_NL@euro: Likewise.
> +    * locales/nn_NO: Likewise.
> +    * locales/nr_ZA: Likewise.
> +    * locales/nso_ZA: Likewise.
> +    * locales/oc_FR: Likewise.
> +    * locales/om_ET: Likewise.
> +    * locales/om_KE: Likewise.
> +    * locales/or_IN: Likewise.
> +    * locales/os_RU: Likewise.
> +    * locales/pa_IN: Likewise.
> +    * locales/pa_PK: Likewise.
> +    * locales/pap_AN: Likewise.
> +    * locales/pap_AW: Likewise.
> +    * locales/pap_CW: Likewise.
> +    * locales/pl_PL: Likewise.
> +    * locales/ps_AF: Likewise.
> +    * locales/pt_BR: Likewise.
> +    * locales/pt_PT: Likewise.
> +    * locales/pt_PT@euro: Likewise.
> +    * locales/quz_PE: Likewise.
> +    * locales/ro_RO: Likewise.
> +    * locales/ru_RU: Likewise.
> +    * locales/ru_UA: Likewise.
> +    * locales/rw_RW: Likewise.
> +    * locales/sa_IN: Likewise.
> +    * locales/sat_IN: Likewise.
> +    * locales/sc_IT: Likewise.
> +    * locales/sd_IN: Likewise.
> +    * locales/sd_IN@devanagari: Likewise.
> +    * locales/se_NO: Likewise.
> +    * locales/shs_CA: Likewise.
> +    * locales/si_LK: Likewise.
> +    * locales/sid_ET: Likewise.
> +    * locales/sk_SK: Likewise.
> +    * locales/sl_SI: Likewise.
> +    * locales/so_DJ: Likewise.
> +    * locales/so_ET: Likewise.
> +    * locales/so_KE: Likewise.
> +    * locales/so_SO: Likewise.
> +    * locales/sq_AL: Likewise.
> +    * locales/sq_MK: Likewise.
> +    * locales/sr_ME: Likewise.
> +    * locales/sr_RS: Likewise.
> +    * locales/sr_RS@latin: Likewise.
> +    * locales/ss_ZA: Likewise.
> +    * locales/st_ZA: Likewise.
> +    * locales/sv_FI: Likewise.
> +    * locales/sv_FI@euro: Likewise.
> +    * locales/sv_SE: Likewise.
> +    * locales/sw_KE: Likewise.
> +    * locales/sw_TZ: Likewise.
> +    * locales/szl_PL: Likewise.
> +    * locales/ta_IN: Likewise.
> +    * locales/ta_LK: Likewise.
> +    * locales/te_IN: Likewise.
> +    * locales/tg_TJ: Likewise.
> +    * locales/th_TH: Likewise.
> +    * locales/ti_ER: Likewise.
> +    * locales/ti_ET: Likewise.
> +    * locales/tig_ER: Likewise.
> +    * locales/tk_TM: Likewise.
> +    * locales/tl_PH: Likewise.
> +    * locales/tn_ZA: Likewise.
> +    * locales/tr_CY: Likewise.
> +    * locales/tr_TR: Likewise.
> +    * locales/ts_ZA: Likewise.
> +    * locales/tt_RU: Likewise.
> +    * locales/tt_RU@iqtelif: Likewise.
> +    * locales/ug_CN: Likewise.
> +    * locales/uk_UA: Likewise.
> +    * locales/unm_US: Likewise.
> +    * locales/ur_IN: Likewise.
> +    * locales/ur_PK: Likewise.
> +    * locales/uz_UZ: Likewise.
> +    * locales/uz_UZ@cyrillic: Likewise.
> +    * locales/ve_ZA: Likewise.
> +    * locales/vi_VN: Likewise.
> +    * locales/wa_BE: Likewise.
> +    * locales/wa_BE@euro: Likewise.
> +    * locales/wae_CH: Likewise.
> +    * locales/wal_ET: Likewise.
> +    * locales/wo_SN: Likewise.
> +    * locales/xh_ZA: Likewise.
> +    * locales/yi_US: Likewise.
> +    * locales/yo_NG: Likewise.
> +    * locales/yue_HK: Likewise.
> +    * locales/zh_CN: Likewise.
> +    * locales/zh_HK: Likewise.
> +    * locales/zh_SG: Likewise.
> +    * locales/zh_TW: Likewise.
> +    * locales/zu_ZA: Likewise.
> +
>  2013-11-04  Chris Leonard  <cjl@sugarlabs.org>
>
>      * locales/unm_US: Adjust language-code fields of LC_ADDRESS.
> diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
> index 369caf2..078f255 100644
> --- a/localedata/locales/aa_DJ
> +++ b/localedata/locales/aa_DJ
> @@ -76,11 +76,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -%
> -% This is the ISO_IEC TR14652 Locale definition for the
> LC_MEASUREMENT category.
> -%
> +% metric
>  measurement 1
> -%
>  END LC_MEASUREMENT
>
>
> diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
> index 5f8a60e..38bc073 100644
> --- a/localedata/locales/aa_ER
> +++ b/localedata/locales/aa_ER
> @@ -72,7 +72,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ER"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
> index 0929967..63c1cb9 100644
> --- a/localedata/locales/aa_ER@saaho
> +++ b/localedata/locales/aa_ER@saaho
> @@ -72,7 +72,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "aa_ER"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
> index bc64388..c433fbc 100644
> --- a/localedata/locales/aa_ET
> +++ b/localedata/locales/aa_ET
> @@ -72,7 +72,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA
> index e7df1c3..143ad75 100644
> --- a/localedata/locales/af_ZA
> +++ b/localedata/locales/af_ZA
> @@ -185,7 +185,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ak_GH b/localedata/locales/ak_GH
> index b33ba6b..159acc8 100644
> --- a/localedata/locales/ak_GH
> +++ b/localedata/locales/ak_GH
> @@ -161,7 +161,7 @@ END LC_PAPER
>
>  LC_MEASUREMENT
>  % metric
> -measurement    1
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
> index ed66cf6..666e984 100644
> --- a/localedata/locales/am_ET
> +++ b/localedata/locales/am_ET
> @@ -1403,7 +1403,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>
> diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
> index e672ce9..4dc3137 100644
> --- a/localedata/locales/an_ES
> +++ b/localedata/locales/an_ES
> @@ -42,6 +42,7 @@ category  "i18n:1999";LC_PAPER
>  category  "i18n:1999";LC_NAME
>  category  "i18n:1999";LC_ADDRESS
>  category  "i18n:1999";LC_TELEPHONE
> +category  "i18n:1999";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -116,7 +117,8 @@ copy "es_ES"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "es_ES"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/anp_IN b/localedata/locales/anp_IN
> index c240064..8d54890 100644
> --- a/localedata/locales/anp_IN
> +++ b/localedata/locales/anp_IN
> @@ -42,7 +42,7 @@ category  "anp_IN:2013";LC_PAPER
>  category  "anp_IN:2013";LC_NAME
>  category  "anp_IN:2013";LC_ADDRESS
>  category  "anp_IN:2013";LC_TELEPHONE
> -
> +category  "anp_IN:2013";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -201,5 +201,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE
> index c7f249b..520245b 100644
> --- a/localedata/locales/ar_AE
> +++ b/localedata/locales/ar_AE
> @@ -28,6 +28,7 @@ category  "ar_AE:2000";LC_PAPER
>  category  "ar_AE:2000";LC_NAME
>  category  "ar_AE:2000";LC_ADDRESS
>  category  "ar_AE:2000";LC_TELEPHONE
> +category  "ar_AE:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -203,8 +204,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH
> index 39e5e0d..558462a 100644
> --- a/localedata/locales/ar_BH
> +++ b/localedata/locales/ar_BH
> @@ -28,6 +28,7 @@ category  "ar_BH:2000";LC_PAPER
>  category  "ar_BH:2000";LC_NAME
>  category  "ar_BH:2000";LC_ADDRESS
>  category  "ar_BH:2000";LC_TELEPHONE
> +category  "ar_BH:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -208,8 +209,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ
> index cda64af..c91718a 100644
> --- a/localedata/locales/ar_DZ
> +++ b/localedata/locales/ar_DZ
> @@ -28,6 +28,7 @@ category  "ar_DZ:2000";LC_PAPER
>  category  "ar_DZ:2000";LC_NAME
>  category  "ar_DZ:2000";LC_ADDRESS
>  category  "ar_DZ:2000";LC_TELEPHONE
> +category  "ar_DZ:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -207,8 +208,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG
> index 3916ed7..446d7f2 100644
> --- a/localedata/locales/ar_EG
> +++ b/localedata/locales/ar_EG
> @@ -28,6 +28,7 @@ category  "ar_EG:2000";LC_PAPER
>  category  "ar_EG:2000";LC_NAME
>  category  "ar_EG:2000";LC_ADDRESS
>  category  "ar_EG:2000";LC_TELEPHONE
> +category  "ar_EG:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -214,8 +215,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN
> index 819925f..c6fe5b1 100644
> --- a/localedata/locales/ar_IN
> +++ b/localedata/locales/ar_IN
> @@ -28,7 +28,7 @@ category  "ar_IN:2000";LC_PAPER
>  category  "ar_IN:2000";LC_NAME
>  category  "ar_IN:2000";LC_ADDRESS
>  category  "ar_IN:2000";LC_TELEPHONE
> -
> +category  "ar_IN:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -179,5 +179,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ
> index a398234..5519916 100644
> --- a/localedata/locales/ar_IQ
> +++ b/localedata/locales/ar_IQ
> @@ -28,6 +28,7 @@ category  "ar_IQ:2000";LC_PAPER
>  category  "ar_IQ:2000";LC_NAME
>  category  "ar_IQ:2000";LC_ADDRESS
>  category  "ar_IQ:2000";LC_TELEPHONE
> +category  "ar_IQ:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -206,8 +207,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO
> index 8f65c74..e113718 100644
> --- a/localedata/locales/ar_JO
> +++ b/localedata/locales/ar_JO
> @@ -28,6 +28,7 @@ category  "ar_JO:2000";LC_PAPER
>  category  "ar_JO:2000";LC_NAME
>  category  "ar_JO:2000";LC_ADDRESS
>  category  "ar_JO:2000";LC_TELEPHONE
> +category  "ar_JO:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -224,8 +225,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW
> index 8bd66ad..d27d6b5 100644
> --- a/localedata/locales/ar_KW
> +++ b/localedata/locales/ar_KW
> @@ -28,6 +28,7 @@ category  "ar_KW:2000";LC_PAPER
>  category  "ar_KW:2000";LC_NAME
>  category  "ar_KW:2000";LC_ADDRESS
>  category  "ar_KW:2000";LC_TELEPHONE
> +category  "ar_KW:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -206,8 +207,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB
> index c946022..5cf1e39 100644
> --- a/localedata/locales/ar_LB
> +++ b/localedata/locales/ar_LB
> @@ -28,6 +28,7 @@ category  "ar_LB:2000";LC_PAPER
>  category  "ar_LB:2000";LC_NAME
>  category  "ar_LB:2000";LC_ADDRESS
>  category  "ar_LB:2000";LC_TELEPHONE
> +category  "ar_LB:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -223,8 +224,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY
> index d95255d..f5956a3 100644
> --- a/localedata/locales/ar_LY
> +++ b/localedata/locales/ar_LY
> @@ -28,6 +28,7 @@ category  "ar_LY:2000";LC_PAPER
>  category  "ar_LY:2000";LC_NAME
>  category  "ar_LY:2000";LC_ADDRESS
>  category  "ar_LY:2000";LC_TELEPHONE
> +category  "ar_LY:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -206,8 +207,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA
> index d13dd61..3e8125b 100644
> --- a/localedata/locales/ar_MA
> +++ b/localedata/locales/ar_MA
> @@ -28,6 +28,7 @@ category  "ar_MA:2000";LC_PAPER
>  category  "ar_MA:2000";LC_NAME
>  category  "ar_MA:2000";LC_ADDRESS
>  category  "ar_MA:2000";LC_TELEPHONE
> +category  "ar_MA:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -206,8 +207,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM
> index ea546bd..1c25ab3 100644
> --- a/localedata/locales/ar_OM
> +++ b/localedata/locales/ar_OM
> @@ -28,6 +28,7 @@ category  "ar_OM:2000";LC_PAPER
>  category  "ar_OM:2000";LC_NAME
>  category  "ar_OM:2000";LC_ADDRESS
>  category  "ar_OM:2000";LC_TELEPHONE
> +category  "ar_OM:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -204,8 +205,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA
> index 4764f69..18a6963 100644
> --- a/localedata/locales/ar_QA
> +++ b/localedata/locales/ar_QA
> @@ -28,6 +28,7 @@ category  "ar_QA:2000";LC_PAPER
>  category  "ar_QA:2000";LC_NAME
>  category  "ar_QA:2000";LC_ADDRESS
>  category  "ar_QA:2000";LC_TELEPHONE
> +category  "ar_QA:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -206,8 +207,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
> index 538449e..a8889b0 100644
> --- a/localedata/locales/ar_SA
> +++ b/localedata/locales/ar_SA
> @@ -32,6 +32,7 @@ category  "ar_SA:2000";LC_PAPER
>  category  "ar_SA:2000";LC_NAME
>  category  "ar_SA:2000";LC_ADDRESS
>  category  "ar_SA:2000";LC_TELEPHONE
> +category  "ar_SA:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -368,8 +369,8 @@ int_prefix     "<U0039><U0036><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD
> index c8a3469..4cdec5f 100644
> --- a/localedata/locales/ar_SD
> +++ b/localedata/locales/ar_SD
> @@ -41,6 +41,7 @@ category  "ar_SD:2000";LC_PAPER
>  category  "ar_SD:2000";LC_NAME
>  category  "ar_SD:2000";LC_ADDRESS
>  category  "ar_SD:2000";LC_TELEPHONE
> +category  "ar_SD:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -222,8 +223,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS
> index 8cf487a..fd71d6e 100644
> --- a/localedata/locales/ar_SS
> +++ b/localedata/locales/ar_SS
> @@ -41,6 +41,7 @@ category  "ar_SS:2000";LC_PAPER
>  category  "ar_SS:2000";LC_NAME
>  category  "ar_SS:2000";LC_ADDRESS
>  category  "ar_SS:2000";LC_TELEPHONE
> +category  "ar_SS:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -220,8 +221,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY
> index 9290de5..ed901d8 100644
> --- a/localedata/locales/ar_SY
> +++ b/localedata/locales/ar_SY
> @@ -28,6 +28,7 @@ category  "ar_SY:2000";LC_PAPER
>  category  "ar_SY:2000";LC_NAME
>  category  "ar_SY:2000";LC_ADDRESS
>  category  "ar_SY:2000";LC_TELEPHONE
> +category  "ar_SY:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -223,8 +224,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN
> index 9714e4e..0ad7ec8 100644
> --- a/localedata/locales/ar_TN
> +++ b/localedata/locales/ar_TN
> @@ -28,6 +28,7 @@ category  "ar_TN:2000";LC_PAPER
>  category  "ar_TN:2000";LC_NAME
>  category  "ar_TN:2000";LC_ADDRESS
>  category  "ar_TN:2000";LC_TELEPHONE
> +category  "ar_TN:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -206,8 +207,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE
> index 0413752..11ea3f5 100644
> --- a/localedata/locales/ar_YE
> +++ b/localedata/locales/ar_YE
> @@ -28,6 +28,7 @@ category  "ar_YE:2000";LC_PAPER
>  category  "ar_YE:2000";LC_NAME
>  category  "ar_YE:2000";LC_ADDRESS
>  category  "ar_YE:2000";LC_TELEPHONE
> +category  "ar_YE:2000";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -204,8 +205,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN
> index b7288b7..1e3e4d7 100644
> --- a/localedata/locales/as_IN
> +++ b/localedata/locales/as_IN
> @@ -28,6 +28,7 @@ category  "as_IN:2000";LC_PAPER
>  category  "as_IN:2000";LC_NAME
>  category  "as_IN:2000";LC_ADDRESS
>  category  "as_IN:2000";LC_TELEPHONE
> +category  "as_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%
> @@ -177,5 +178,6 @@ END LC_TELEPHONE
>
>  %%%%%%%%%%%%%
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ast_ES b/localedata/locales/ast_ES
> index 967f547..5c7dc64 100644
> --- a/localedata/locales/ast_ES
> +++ b/localedata/locales/ast_ES
> @@ -41,6 +41,7 @@ category  "ast_ES:2000";LC_PAPER
>  category  "ast_ES:2000";LC_NAME
>  category  "ast_ES:2000";LC_ADDRESS
>  category  "ast_ES:2000";LC_TELEPHONE
> +category  "ast_ES:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -122,7 +123,8 @@ copy "es_ES"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "es_ES"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ayc_PE b/localedata/locales/ayc_PE
> index a65dff0..f77c25c 100644
> --- a/localedata/locales/ayc_PE
> +++ b/localedata/locales/ayc_PE
> @@ -172,6 +172,7 @@ copy "es_PE"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
> index 0dd3de1..c02c858 100644
> --- a/localedata/locales/az_AZ
> +++ b/localedata/locales/az_AZ
> @@ -283,6 +283,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY
> index e648679..df1d63c 100644
> --- a/localedata/locales/be_BY
> +++ b/localedata/locales/be_BY
> @@ -39,7 +39,7 @@ category  "be_BY:2000";LC_PAPER
>  category  "be_BY:2000";LC_NAME
>  category  "be_BY:2000";LC_ADDRESS
>  category  "be_BY:2000";LC_TELEPHONE
> -
> +category  "be_BY:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -162,8 +162,8 @@ int_select     "<U0038><U007E><U0031><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/be_BY@latin b/localedata/locales/be_BY@latin
> index 6dbbfad..7616e5e 100644
> --- a/localedata/locales/be_BY@latin
> +++ b/localedata/locales/be_BY@latin
> @@ -39,6 +39,7 @@ category  "be_BY@latin:2000";LC_PAPER
>  category  "be_BY@latin:2000";LC_NAME
>  category  "be_BY@latin:2000";LC_ADDRESS
>  category  "be_BY@latin:2000";LC_TELEPHONE
> +category  "be_BY@latin:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -143,5 +144,6 @@ copy "be_BY"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "be_BY"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/bem_ZM b/localedata/locales/bem_ZM
> index ddf36a6..9ce6c42 100644
> --- a/localedata/locales/bem_ZM
> +++ b/localedata/locales/bem_ZM
> @@ -140,7 +140,8 @@ width  210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -measurement  1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ
> index 5c1f7d8..f793740 100644
> --- a/localedata/locales/ber_DZ
> +++ b/localedata/locales/ber_DZ
> @@ -259,6 +259,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/ber_MA b/localedata/locales/ber_MA
> index 5f285a1..fbafdd2 100644
> --- a/localedata/locales/ber_MA
> +++ b/localedata/locales/ber_MA
> @@ -179,6 +179,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG
> index 9316d10..de461bd 100644
> --- a/localedata/locales/bg_BG
> +++ b/localedata/locales/bg_BG
> @@ -37,6 +37,7 @@ category  "bg_BG:2000";LC_PAPER
>  category  "bg_BG:2000";LC_NAME
>  category  "bg_BG:2000";LC_ADDRESS
>  category  "bg_BG:2000";LC_TELEPHONE
> +category  "bg_BG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -280,5 +281,6 @@ int_select  "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN
> index 54028b9..12a87dd 100644
> --- a/localedata/locales/bho_IN
> +++ b/localedata/locales/bho_IN
> @@ -29,7 +29,7 @@ category  "bho_IN:2011";LC_PAPER
>  category  "bho_IN:2011";LC_NAME
>  category  "bho_IN:2011";LC_ADDRESS
>  category  "bho_IN:2011";LC_TELEPHONE
> -
> +category  "bho_IN:2011";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -170,5 +170,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
> index 58842d6..b684aa0 100644
> --- a/localedata/locales/bn_BD
> +++ b/localedata/locales/bn_BD
> @@ -144,8 +144,8 @@ yesstr      "<U09B9><U09CD><U09AF><U09BE><U0981>"
>  nostr       "<U09A8><U09BE>"
>  END LC_MESSAGES
>
> -% Metric Measurement system (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
> index ddf3cf2..5f99da4 100644
> --- a/localedata/locales/bn_IN
> +++ b/localedata/locales/bn_IN
> @@ -29,7 +29,7 @@ category  "bn_IN:2000";LC_PAPER
>  category  "bn_IN:2000";LC_NAME
>  category  "bn_IN:2000";LC_ADDRESS
>  category  "bn_IN:2000";LC_TELEPHONE
> -
> +category  "bn_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -198,5 +198,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
> index fab02ae..d813c10 100644
> --- a/localedata/locales/bo_CN
> +++ b/localedata/locales/bo_CN
> @@ -28,7 +28,7 @@ category  "bo_CN:2007";LC_PAPER
>  category  "bo_CN:2007";LC_NAME
>  category  "bo_CN:2007";LC_ADDRESS
>  category  "bo_CN:2007";LC_TELEPHONE
> -
> +category  "bo_CN:2007";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -139,7 +139,8 @@ copy "zh_CN"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "zh_CN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN
> index 73a9084..8ab793c 100644
> --- a/localedata/locales/bo_IN
> +++ b/localedata/locales/bo_IN
> @@ -28,7 +28,7 @@ category  "bo_IN:2007";LC_PAPER
>  category  "bo_IN:2007";LC_NAME
>  category  "bo_IN:2007";LC_ADDRESS
>  category  "bo_IN:2007";LC_TELEPHONE
> -
> +category  "bo_IN:2007";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -65,7 +65,8 @@ copy "hi_IN"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
> index 564212d..6a4b666 100644
> --- a/localedata/locales/br_FR
> +++ b/localedata/locales/br_FR
> @@ -150,6 +150,7 @@ copy "fr_FR"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/br_FR@euro b/localedata/locales/br_FR@euro
> index a28fcf6..db20b80 100644
> --- a/localedata/locales/br_FR@euro
> +++ b/localedata/locales/br_FR@euro
> @@ -34,7 +34,7 @@ category  "br_FR@euro:2000";LC_PAPER
>  category  "br_FR@euro:2000";LC_NAME
>  category  "br_FR@euro:2000";LC_ADDRESS
>  category  "br_FR@euro:2000";LC_TELEPHONE
> -
> +category  "br_FR@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "br_FR"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "br_FR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN
> index ed79fe4..98b7f44 100644
> --- a/localedata/locales/brx_IN
> +++ b/localedata/locales/brx_IN
> @@ -28,7 +28,7 @@ category  "brx_IN:2011";LC_PAPER
>  category  "brx_IN:2011";LC_NAME
>  category  "brx_IN:2011";LC_ADDRESS
>  category  "brx_IN:2011";LC_TELEPHONE
> -
> +category  "brx_IN:2011";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -192,5 +192,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
> index c4d37d7..dfa339c 100644
> --- a/localedata/locales/bs_BA
> +++ b/localedata/locales/bs_BA
> @@ -216,6 +216,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
> index ff4061f..299a36a 100644
> --- a/localedata/locales/byn_ER
> +++ b/localedata/locales/byn_ER
> @@ -68,7 +68,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ER"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD
> index 4edb85a..c97ce89 100644
> --- a/localedata/locales/ca_AD
> +++ b/localedata/locales/ca_AD
> @@ -37,7 +37,7 @@ category  "ca_AD:2000";LC_PAPER
>  category  "ca_AD:2000";LC_NAME
>  category  "ca_AD:2000";LC_ADDRESS
>  category  "ca_AD:2000";LC_TELEPHONE
> -
> +category  "ca_AD:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -75,7 +75,8 @@ int_prefix     "<U0033><U0037><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "ca_ES"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
> index 68ffd47..b8f5875 100644
> --- a/localedata/locales/ca_ES
> +++ b/localedata/locales/ca_ES
> @@ -42,7 +42,7 @@ category  "ca_ES:2000";LC_PAPER
>  category  "ca_ES:2000";LC_NAME
>  category  "ca_ES:2000";LC_ADDRESS
>  category  "ca_ES:2000";LC_TELEPHONE
> -
> +category  "ca_ES:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -156,8 +156,8 @@ int_prefix     "<U0033><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
> index b3e6ecb..ecccc23 100644
> --- a/localedata/locales/ca_ES@euro
> +++ b/localedata/locales/ca_ES@euro
> @@ -37,7 +37,7 @@ category  "ca_ES@euro:2000";LC_PAPER
>  category  "ca_ES@euro:2000";LC_NAME
>  category  "ca_ES@euro:2000";LC_ADDRESS
>  category  "ca_ES@euro:2000";LC_TELEPHONE
> -
> +category  "ca_ES@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -73,7 +73,8 @@ copy "ca_ES"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "ca_ES"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ca_FR b/localedata/locales/ca_FR
> index aac4eac..efc2386 100644
> --- a/localedata/locales/ca_FR
> +++ b/localedata/locales/ca_FR
> @@ -37,7 +37,7 @@ category  "ca_FR:2000";LC_PAPER
>  category  "ca_FR:2000";LC_NAME
>  category  "ca_FR:2000";LC_ADDRESS
>  category  "ca_FR:2000";LC_TELEPHONE
> -
> +category  "ca_FR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -73,7 +73,8 @@ copy "fr_FR"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "fr_FR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT
> index 3865b88..1836588 100644
> --- a/localedata/locales/ca_IT
> +++ b/localedata/locales/ca_IT
> @@ -37,7 +37,7 @@ category  "ca_IT:2000";LC_PAPER
>  category  "ca_IT:2000";LC_NAME
>  category  "ca_IT:2000";LC_ADDRESS
>  category  "ca_IT:2000";LC_TELEPHONE
> -
> +category  "ca_IT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -73,7 +73,8 @@ copy "it_IT"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "it_IT"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
> index 1ac117c..a332659 100644
> --- a/localedata/locales/cmn_TW
> +++ b/localedata/locales/cmn_TW
> @@ -162,6 +162,7 @@ width  210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA
> index 7bf156d..9b701b7 100644
> --- a/localedata/locales/crh_UA
> +++ b/localedata/locales/crh_UA
> @@ -213,6 +213,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
> index 12fe500..2a7b4fa 100644
> --- a/localedata/locales/cs_CZ
> +++ b/localedata/locales/cs_CZ
> @@ -128,7 +128,7 @@ category  "cs_CZ:2000";LC_PAPER
>  category  "cs_CZ:2000";LC_NAME
>  category  "cs_CZ:2000";LC_ADDRESS
>  category  "cs_CZ:2000";LC_TELEPHONE
> -
> +category  "cs_CZ:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  %% Po\F8ad\ED znak\F9
> @@ -2472,7 +2472,8 @@ int_prefix     "<U0034><U0032><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/csb_PL b/localedata/locales/csb_PL
> index 1ee9494..27b08b3 100644
> --- a/localedata/locales/csb_PL
> +++ b/localedata/locales/csb_PL
> @@ -44,7 +44,7 @@ category  "csb_PL:2000";LC_PAPER
>  category  "csb_PL:2000";LC_NAME
>  category  "csb_PL:2000";LC_ADDRESS
>  category  "csb_PL:2000";LC_TELEPHONE
> -
> +category  "csb_PL:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -198,7 +198,8 @@ copy "pl_PL"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "pl_PL"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU
> index 0d04cfb..120e0d7 100644
> --- a/localedata/locales/cv_RU
> +++ b/localedata/locales/cv_RU
> @@ -42,7 +42,7 @@ category  "cv_RU:2000";LC_PAPER
>  category  "cv_RU:2000";LC_NAME
>  category  "cv_RU:2000";LC_ADDRESS
>  category  "cv_RU:2000";LC_TELEPHONE
> -
> +category  "cv_RU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -226,7 +226,8 @@ copy "ru_RU"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "ru_RU"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
> index 3005a63..66298e0 100644
> --- a/localedata/locales/cy_GB
> +++ b/localedata/locales/cy_GB
> @@ -57,7 +57,8 @@ copy "en_GB"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_GB"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_CTYPE
> diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
> index 2694a91..670e209 100644
> --- a/localedata/locales/da_DK
> +++ b/localedata/locales/da_DK
> @@ -51,7 +51,7 @@ category  "da_DK:2000";LC_PAPER
>  category  "da_DK:2000";LC_NAME
>  category  "da_DK:2000";LC_ADDRESS
>  category  "da_DK:2000";LC_TELEPHONE
> -
> +category  "da_DK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -234,8 +234,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
> index 185da1a..802e865 100644
> --- a/localedata/locales/de_AT
> +++ b/localedata/locales/de_AT
> @@ -41,7 +41,7 @@ category  "de_AT:2000";LC_PAPER
>  category  "de_AT:2000";LC_NAME
>  category  "de_AT:2000";LC_ADDRESS
>  category  "de_AT:2000";LC_TELEPHONE
> -
> +category  "de_AT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -138,7 +138,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/de_AT@euro b/localedata/locales/de_AT@euro
> index 9604b25..2a2d47f 100644
> --- a/localedata/locales/de_AT@euro
> +++ b/localedata/locales/de_AT@euro
> @@ -41,7 +41,7 @@ category  "de_AT@euro:2000";LC_PAPER
>  category  "de_AT@euro:2000";LC_NAME
>  category  "de_AT@euro:2000";LC_ADDRESS
>  category  "de_AT@euro:2000";LC_TELEPHONE
> -
> +category  "de_AT@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -78,7 +78,8 @@ copy "de_AT"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_AT"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
> index d7001e0..3f50dec 100644
> --- a/localedata/locales/de_BE
> +++ b/localedata/locales/de_BE
> @@ -43,7 +43,7 @@ category  "de_BE:2000";LC_PAPER
>  category  "de_BE:2000";LC_NAME
>  category  "de_BE:2000";LC_ADDRESS
>  category  "de_BE:2000";LC_TELEPHONE
> -
> +category  "de_BE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -132,7 +132,8 @@ copy "fr_BE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "fr_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro
> index d9c4188..a0d299c 100644
> --- a/localedata/locales/de_BE@euro
> +++ b/localedata/locales/de_BE@euro
> @@ -35,7 +35,7 @@ category  "de_BE@euro:2000";LC_PAPER
>  category  "de_BE@euro:2000";LC_NAME
>  category  "de_BE@euro:2000";LC_ADDRESS
>  category  "de_BE@euro:2000";LC_TELEPHONE
> -
> +category  "de_BE@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -71,7 +71,8 @@ copy "de_BE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH
> index 0e43767..456eae6 100644
> --- a/localedata/locales/de_CH
> +++ b/localedata/locales/de_CH
> @@ -42,7 +42,7 @@ category  "de_CH:2000";LC_PAPER
>  category  "de_CH:2000";LC_NAME
>  category  "de_CH:2000";LC_ADDRESS
>  category  "de_CH:2000";LC_TELEPHONE
> -
> +category  "de_CH:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -140,8 +140,8 @@ int_prefix     "<U0034><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
> index bfa7fc0..8d8a3b8 100644
> --- a/localedata/locales/de_DE
> +++ b/localedata/locales/de_DE
> @@ -27,7 +27,7 @@ category  "de_DE:2000";LC_PAPER
>  category  "de_DE:2000";LC_NAME
>  category  "de_DE:2000";LC_ADDRESS
>  category  "de_DE:2000";LC_TELEPHONE
> -
> +category  "de_DE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -212,5 +212,6 @@ int_prefix     "<U0034><U0039>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/de_DE@euro b/localedata/locales/de_DE@euro
> index 7e9c97a..cc7e073 100644
> --- a/localedata/locales/de_DE@euro
> +++ b/localedata/locales/de_DE@euro
> @@ -27,7 +27,7 @@ category  "de_DE@euro:2000";LC_PAPER
>  category  "de_DE@euro:2000";LC_NAME
>  category  "de_DE@euro:2000";LC_ADDRESS
>  category  "de_DE@euro:2000";LC_TELEPHONE
> -
> +category  "de_DE@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -75,5 +75,6 @@ copy "de_DE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_DE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
> index 5f80739..d25ce1b 100644
> --- a/localedata/locales/de_LU
> +++ b/localedata/locales/de_LU
> @@ -43,7 +43,7 @@ category  "de_LU:2000";LC_PAPER
>  category  "de_LU:2000";LC_NAME
>  category  "de_LU:2000";LC_ADDRESS
>  category  "de_LU:2000";LC_TELEPHONE
> -
> +category  "de_LU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -137,8 +137,8 @@ int_prefix     "<U0033><U0035><U0032>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro
> index caff758..c267677 100644
> --- a/localedata/locales/de_LU@euro
> +++ b/localedata/locales/de_LU@euro
> @@ -35,7 +35,7 @@ category  "de_LU:2000@euro";LC_PAPER
>  category  "de_LU:2000@euro";LC_NAME
>  category  "de_LU:2000@euro";LC_ADDRESS
>  category  "de_LU:2000@euro";LC_TELEPHONE
> -
> +category  "de_LU:2000@euro";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -71,7 +71,8 @@ copy "de_LU"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_LU"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
> index 47e9079..6ae0ffb 100644
> --- a/localedata/locales/doi_IN
> +++ b/localedata/locales/doi_IN
> @@ -27,7 +27,7 @@ category  "doi_IN:2012";LC_PAPER
>  category  "doi_IN:2012";LC_NAME
>  category  "doi_IN:2012";LC_ADDRESS
>  category  "doi_IN:2012";LC_TELEPHONE
> -
> +category  "doi_IN:2012";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -182,5 +182,6 @@ copy "hi_IN"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV
> index 4876d14..b0e9ef2 100644
> --- a/localedata/locales/dv_MV
> +++ b/localedata/locales/dv_MV
> @@ -38,7 +38,7 @@ category  "dv_MV:2006";LC_PAPER
>  category  "dv_MV:2006";LC_NAME
>  category  "dv_MV:2006";LC_ADDRESS
>  category  "dv_MV:2006";LC_TELEPHONE
> -
> +category  "dv_MV:2006";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -163,7 +163,8 @@ int_prefix     "<U0039><U0036><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
> index 8474346..d6443b4 100644
> --- a/localedata/locales/dz_BT
> +++ b/localedata/locales/dz_BT
> @@ -31,6 +31,7 @@ date       "2004-09-03"
>  %
>  category  "dz_BT:2004";LC_IDENTIFICATION
>  category  "dz_BT:2004";LC_CTYPE
> +category  "dz_BT:2004";LC_TIME
>  category  "dz_BT:2004";LC_COLLATE
>  category  "dz_BT:2004";LC_NUMERIC
>  category  "dz_BT:2004";LC_MONETARY
> @@ -39,7 +40,7 @@ category  "dz_BT:2004";LC_PAPER
>  category  "dz_BT:2004";LC_NAME
>  category  "dz_BT:2004";LC_ADDRESS
>  category  "dz_BT:2004";LC_TELEPHONE
> -
> +category  "dz_BT:2004";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%%%%
> @@ -631,8 +632,8 @@ width    210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY
> index 58cbb14..a7c671c 100644
> --- a/localedata/locales/el_CY
> +++ b/localedata/locales/el_CY
> @@ -28,7 +28,7 @@ category  "el_CY:2000";LC_PAPER
>  category  "el_CY:2000";LC_NAME
>  category  "el_CY:2000";LC_ADDRESS
>  category  "el_CY:2000";LC_TELEPHONE
> -
> +category  "el_CY:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -83,8 +83,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
> index ad18cef..53d2ec4 100644
> --- a/localedata/locales/el_GR
> +++ b/localedata/locales/el_GR
> @@ -42,7 +42,7 @@ category  "el_GR:2000";LC_PAPER
>  category  "el_GR:2000";LC_NAME
>  category  "el_GR:2000";LC_ADDRESS
>  category  "el_GR:2000";LC_TELEPHONE
> -
> +category  "el_GR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -158,8 +158,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/el_GR@euro b/localedata/locales/el_GR@euro
> index 2a37cf6..3045829 100644
> --- a/localedata/locales/el_GR@euro
> +++ b/localedata/locales/el_GR@euro
> @@ -25,7 +25,7 @@ category  "el_GR@euro:2000";LC_PAPER
>  category  "el_GR@euro:2000";LC_NAME
>  category  "el_GR@euro:2000";LC_ADDRESS
>  category  "el_GR@euro:2000";LC_TELEPHONE
> -
> +category  "el_GR@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -73,5 +73,6 @@ copy "el_GR"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "el_GR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
> index 043d2a2..52efb35 100644
> --- a/localedata/locales/en_AG
> +++ b/localedata/locales/en_AG
> @@ -27,7 +27,7 @@ category  "en_AG:2008";LC_PAPER
>  category  "en_AG:2008";LC_NAME
>  category  "en_AG:2008";LC_ADDRESS
>  category  "en_AG:2008";LC_TELEPHONE
> -
> +category  "en_AG:2008";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -101,5 +101,6 @@ int_select     "<U0030><U0031><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_US"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
> index eeeeef2..4c86de2 100644
> --- a/localedata/locales/en_AU
> +++ b/localedata/locales/en_AU
> @@ -43,7 +43,7 @@ category  "en_AU:2000";LC_PAPER
>  category  "en_AU:2000";LC_NAME
>  category  "en_AU:2000";LC_ADDRESS
>  category  "en_AU:2000";LC_TELEPHONE
> -
> +category  "en_AU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -139,8 +139,8 @@ int_select     "<U0030><U0030><U0031><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
> index f3b0f02..59ac215 100644
> --- a/localedata/locales/en_BW
> +++ b/localedata/locales/en_BW
> @@ -40,7 +40,7 @@ category  "en_BW:2000";LC_PAPER
>  category  "en_BW:2000";LC_NAME
>  category  "en_BW:2000";LC_ADDRESS
>  category  "en_BW:2000";LC_TELEPHONE
> -
> +category  "en_BW:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -96,8 +96,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
> index 74717c6..a04e96c 100644
> --- a/localedata/locales/en_CA
> +++ b/localedata/locales/en_CA
> @@ -45,7 +45,7 @@ category  "en_CA:2000";LC_PAPER
>  category  "en_CA:2000";LC_NAME
>  category  "en_CA:2000";LC_ADDRESS
>  category  "en_CA:2000";LC_TELEPHONE
> -
> +category  "en_CA:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -161,8 +161,8 @@ int_select     "<U0030><U0031><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
> index 1600974..da639dd 100644
> --- a/localedata/locales/en_DK
> +++ b/localedata/locales/en_DK
> @@ -48,7 +48,7 @@ category  "en_DK:2000";LC_PAPER
>  category  "en_DK:2000";LC_NAME
>  category  "en_DK:2000";LC_ADDRESS
>  category  "en_DK:2000";LC_TELEPHONE
> -
> +category  "en_DK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -141,7 +141,8 @@ copy "da_DK"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "da_DK"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
> index 88f440a..a66e9a1 100644
> --- a/localedata/locales/en_GB
> +++ b/localedata/locales/en_GB
> @@ -43,7 +43,7 @@ category  "en_GB:2000";LC_PAPER
>  category  "en_GB:2000";LC_NAME
>  category  "en_GB:2000";LC_ADDRESS
>  category  "en_GB:2000";LC_TELEPHONE
> -
> +category  "en_GB:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -145,7 +145,8 @@ int_prefix     "<U0034><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
> index 653543a..bc9b2e4 100644
> --- a/localedata/locales/en_HK
> +++ b/localedata/locales/en_HK
> @@ -32,7 +32,7 @@ category  "en_HK:2000";LC_PAPER
>  category  "en_HK:2000";LC_NAME
>  category  "en_HK:2000";LC_ADDRESS
>  category  "en_HK:2000";LC_TELEPHONE
> -
> +category  "en_HK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -216,8 +216,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE
> index 568a7e9..e2f0fc0 100644
> --- a/localedata/locales/en_IE
> +++ b/localedata/locales/en_IE
> @@ -43,7 +43,7 @@ category  "en_IE:2000";LC_PAPER
>  category  "en_IE:2000";LC_NAME
>  category  "en_IE:2000";LC_ADDRESS
>  category  "en_IE:2000";LC_TELEPHONE
> -
> +category  "en_IE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -137,8 +137,8 @@ int_prefix     "<U0033><U0035><U0033>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_IE@euro b/localedata/locales/en_IE@euro
> index 7f5d518..1d3c5b3 100644
> --- a/localedata/locales/en_IE@euro
> +++ b/localedata/locales/en_IE@euro
> @@ -35,7 +35,7 @@ category  "en_IE@euro:2000";LC_PAPER
>  category  "en_IE@euro:2000";LC_NAME
>  category  "en_IE@euro:2000";LC_ADDRESS
>  category  "en_IE@euro:2000";LC_TELEPHONE
> -
> +category  "en_IE@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "en_IE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_IE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN
> index 9205a7b..f8f0db5 100644
> --- a/localedata/locales/en_IN
> +++ b/localedata/locales/en_IN
> @@ -29,7 +29,7 @@ category  "en_IN:2000";LC_PAPER
>  category  "en_IN:2000";LC_NAME
>  category  "en_IN:2000";LC_ADDRESS
>  category  "en_IN:2000";LC_TELEPHONE
> -
> +category  "en_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -208,5 +208,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG
> index f98251e..364b549 100644
> --- a/localedata/locales/en_NG
> +++ b/localedata/locales/en_NG
> @@ -211,7 +211,8 @@ int_prefix     "<U0032><U0033><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_DK"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ
> index e786f21..9208299 100644
> --- a/localedata/locales/en_NZ
> +++ b/localedata/locales/en_NZ
> @@ -43,7 +43,7 @@ category  "en_NZ:2000";LC_PAPER
>  category  "en_NZ:2000";LC_NAME
>  category  "en_NZ:2000";LC_ADDRESS
>  category  "en_NZ:2000";LC_TELEPHONE
> -
> +category  "en_NZ:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -138,8 +138,8 @@ int_prefix     "<U0036><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH
> index d8d87ba..8badc18 100644
> --- a/localedata/locales/en_PH
> +++ b/localedata/locales/en_PH
> @@ -31,7 +31,7 @@ category  "en_PH:2000";LC_PAPER
>  category  "en_PH:2000";LC_NAME
>  category  "en_PH:2000";LC_ADDRESS
>  category  "en_PH:2000";LC_TELEPHONE
> -
> +category  "en_PH:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -212,8 +212,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/en_SG b/localedata/locales/en_SG
> index 467dfa0..7228582 100644
> --- a/localedata/locales/en_SG
> +++ b/localedata/locales/en_SG
> @@ -29,7 +29,7 @@ category  "en_SG:2000";LC_PAPER
>  category  "en_SG:2000";LC_NAME
>  category  "en_SG:2000";LC_ADDRESS
>  category  "en_SG:2000";LC_TELEPHONE
> -
> +category  "en_SG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -215,8 +215,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/en_US b/localedata/locales/en_US
> index 4c5fa34..fe33d47 100644
> --- a/localedata/locales/en_US
> +++ b/localedata/locales/en_US
> @@ -27,7 +27,7 @@ category  "en_US:2000";LC_PAPER
>  category  "en_US:2000";LC_NAME
>  category  "en_US:2000";LC_ADDRESS
>  category  "en_US:2000";LC_TELEPHONE
> -
> +category  "en_US:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -183,5 +183,6 @@ int_prefix     "<U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> +% US customary units
>  measurement    2
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA
> index 2a6b2ba..294b0a3 100644
> --- a/localedata/locales/en_ZA
> +++ b/localedata/locales/en_ZA
> @@ -248,7 +248,8 @@ int_prefix     "<U0032><U0037>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/en_ZM b/localedata/locales/en_ZM
> index 8277032..e3f811d 100644
> --- a/localedata/locales/en_ZM
> +++ b/localedata/locales/en_ZM
> @@ -60,7 +60,8 @@ copy "bem_ZM"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "bem_ZM"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW
> index 24558ed..431dfd2 100644
> --- a/localedata/locales/en_ZW
> +++ b/localedata/locales/en_ZW
> @@ -40,7 +40,7 @@ category  "en_ZW:2000";LC_PAPER
>  category  "en_ZW:2000";LC_NAME
>  category  "en_ZW:2000";LC_ADDRESS
>  category  "en_ZW:2000";LC_TELEPHONE
> -
> +category  "en_ZW:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -95,8 +95,8 @@ int_prefix     "<U0032><U0036><U0033>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
> index 3eaabd3..3acba03 100644
> --- a/localedata/locales/es_AR
> +++ b/localedata/locales/es_AR
> @@ -44,7 +44,7 @@ category  "es_AR:2000";LC_PAPER
>  category  "es_AR:2000";LC_NAME
>  category  "es_AR:2000";LC_ADDRESS
>  category  "es_AR:2000";LC_TELEPHONE
> -
> +category  "es_AR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -138,8 +138,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
> index b3544d9..79b37da 100644
> --- a/localedata/locales/es_BO
> +++ b/localedata/locales/es_BO
> @@ -44,7 +44,7 @@ category  "es_BO:2000";LC_PAPER
>  category  "es_BO:2000";LC_NAME
>  category  "es_BO:2000";LC_ADDRESS
>  category  "es_BO:2000";LC_TELEPHONE
> -
> +category  "es_BO:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -136,8 +136,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
> index a40b361..f36ece7 100644
> --- a/localedata/locales/es_CL
> +++ b/localedata/locales/es_CL
> @@ -44,7 +44,7 @@ category  "es_CL:2000";LC_PAPER
>  category  "es_CL:2000";LC_NAME
>  category  "es_CL:2000";LC_ADDRESS
>  category  "es_CL:2000";LC_TELEPHONE
> -
> +category  "es_CL:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -134,8 +134,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
> index 31a28e7..aa0ecaa 100644
> --- a/localedata/locales/es_CO
> +++ b/localedata/locales/es_CO
> @@ -44,7 +44,7 @@ category  "es_CO:2000";LC_PAPER
>  category  "es_CO:2000";LC_NAME
>  category  "es_CO:2000";LC_ADDRESS
>  category  "es_CO:2000";LC_TELEPHONE
> -
> +category  "es_CO:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -137,8 +137,8 @@ int_select     "<U0030><U0030><U0039>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
> index e42dce2..ec478bf 100644
> --- a/localedata/locales/es_CR
> +++ b/localedata/locales/es_CR
> @@ -35,7 +35,7 @@ category  "es_CR:2000";LC_PAPER
>  category  "es_CR:2000";LC_NAME
>  category  "es_CR:2000";LC_ADDRESS
>  category  "es_CR:2000";LC_TELEPHONE
> -
> +category  "es_CR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -132,7 +132,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_CU b/localedata/locales/es_CU
> index 86de054..66d8867 100644
> --- a/localedata/locales/es_CU
> +++ b/localedata/locales/es_CU
> @@ -41,7 +41,7 @@ category  "es_CU:2000";LC_PAPER
>  category  "es_CU:2000";LC_NAME
>  category  "es_CU:2000";LC_ADDRESS
>  category  "es_CU:2000";LC_TELEPHONE
> -
> +category  "es_CU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -101,8 +101,8 @@ int_prefix     "<U0035><U0033>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
> index 15da7d3..41c8f8b 100644
> --- a/localedata/locales/es_DO
> +++ b/localedata/locales/es_DO
> @@ -44,7 +44,7 @@ category  "es_DO:2000";LC_PAPER
>  category  "es_DO:2000";LC_NAME
>  category  "es_DO:2000";LC_ADDRESS
>  category  "es_DO:2000";LC_TELEPHONE
> -
> +category  "es_DO:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -138,8 +138,8 @@ int_select     "<U0030><U0031><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
> index 8292308..541fe08 100644
> --- a/localedata/locales/es_EC
> +++ b/localedata/locales/es_EC
> @@ -44,7 +44,7 @@ category  "es_EC:2000";LC_PAPER
>  category  "es_EC:2000";LC_NAME
>  category  "es_EC:2000";LC_ADDRESS
>  category  "es_EC:2000";LC_TELEPHONE
> -
> +category  "es_EC:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -136,8 +136,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
> index a75c01f..095fea8 100644
> --- a/localedata/locales/es_ES
> +++ b/localedata/locales/es_ES
> @@ -44,7 +44,7 @@ category  "es_ES:2000";LC_PAPER
>  category  "es_ES:2000";LC_NAME
>  category  "es_ES:2000";LC_ADDRESS
>  category  "es_ES:2000";LC_TELEPHONE
> -
> +category  "es_ES:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -150,8 +150,8 @@ int_prefix     "<U0033><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro
> index 721738e..8ffc7cc 100644
> --- a/localedata/locales/es_ES@euro
> +++ b/localedata/locales/es_ES@euro
> @@ -35,7 +35,7 @@ category  "es_ES@euro:2000";LC_PAPER
>  category  "es_ES@euro:2000";LC_NAME
>  category  "es_ES@euro:2000";LC_ADDRESS
>  category  "es_ES@euro:2000";LC_TELEPHONE
> -
> +category  "es_ES@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -71,7 +71,8 @@ copy "es_ES"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "es_ES"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
> index e17e70e..e4a40f5 100644
> --- a/localedata/locales/es_GT
> +++ b/localedata/locales/es_GT
> @@ -43,7 +43,7 @@ category  "es_GT:2000";LC_PAPER
>  category  "es_GT:2000";LC_NAME
>  category  "es_GT:2000";LC_ADDRESS
>  category  "es_GT:2000";LC_TELEPHONE
> -
> +category  "es_GT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -135,8 +135,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
> index 6e0def2..e9d69e9 100644
> --- a/localedata/locales/es_HN
> +++ b/localedata/locales/es_HN
> @@ -44,7 +44,7 @@ category  "es_HN:2000";LC_PAPER
>  category  "es_HN:2000";LC_NAME
>  category  "es_HN:2000";LC_ADDRESS
>  category  "es_HN:2000";LC_TELEPHONE
> -
> +category  "es_HN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -138,8 +138,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
> index faf9626..c82190d 100644
> --- a/localedata/locales/es_MX
> +++ b/localedata/locales/es_MX
> @@ -44,7 +44,7 @@ category  "es_MX:2000";LC_PAPER
>  category  "es_MX:2000";LC_NAME
>  category  "es_MX:2000";LC_ADDRESS
>  category  "es_MX:2000";LC_TELEPHONE
> -
> +category  "es_MX:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -135,8 +135,8 @@ int_prefix     "<U0035><U0032>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
> index 7e109b3..29f42cb 100644
> --- a/localedata/locales/es_NI
> +++ b/localedata/locales/es_NI
> @@ -35,7 +35,7 @@ category  "es_NI:2000";LC_PAPER
>  category  "es_NI:2000";LC_NAME
>  category  "es_NI:2000";LC_ADDRESS
>  category  "es_NI:2000";LC_TELEPHONE
> -
> +category  "es_NI:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -129,8 +129,8 @@ int_prefix     "<U0035><U0030><U0035>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
> index 702af0b..ae3be46 100644
> --- a/localedata/locales/es_PA
> +++ b/localedata/locales/es_PA
> @@ -44,7 +44,7 @@ category  "es_PA:2000";LC_PAPER
>  category  "es_PA:2000";LC_NAME
>  category  "es_PA:2000";LC_ADDRESS
>  category  "es_PA:2000";LC_TELEPHONE
> -
> +category  "es_PA:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -135,8 +135,8 @@ int_prefix     "<U0035><U0030><U0032>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
> index e3ab3d6..f2095e3 100644
> --- a/localedata/locales/es_PE
> +++ b/localedata/locales/es_PE
> @@ -44,7 +44,7 @@ category  "es_PE:2000";LC_PAPER
>  category  "es_PE:2000";LC_NAME
>  category  "es_PE:2000";LC_ADDRESS
>  category  "es_PE:2000";LC_TELEPHONE
> -
> +category  "es_PE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -136,8 +136,8 @@ int_prefix     "<U0035><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
> index 3f13684..7cc1197 100644
> --- a/localedata/locales/es_PR
> +++ b/localedata/locales/es_PR
> @@ -35,7 +35,7 @@ category  "es_PR:2000";LC_PAPER
>  category  "es_PR:2000";LC_NAME
>  category  "es_PR:2000";LC_ADDRESS
>  category  "es_PR:2000";LC_TELEPHONE
> -
> +category  "es_PR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -126,6 +126,7 @@ int_prefix     "<U0031><U0037><U0038><U0037>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> +% US customary units
>  measurement    2
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
> index 11916c4..5174007 100644
> --- a/localedata/locales/es_PY
> +++ b/localedata/locales/es_PY
> @@ -44,7 +44,7 @@ category  "es_PY:2000";LC_PAPER
>  category  "es_PY:2000";LC_NAME
>  category  "es_PY:2000";LC_ADDRESS
>  category  "es_PY:2000";LC_TELEPHONE
> -
> +category  "es_PY:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -135,8 +135,8 @@ int_prefix     "<U0035><U0039><U0035>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
> index 8b30284..4099974 100644
> --- a/localedata/locales/es_SV
> +++ b/localedata/locales/es_SV
> @@ -44,7 +44,7 @@ category  "es_SV:2000";LC_PAPER
>  category  "es_SV:2000";LC_NAME
>  category  "es_SV:2000";LC_ADDRESS
>  category  "es_SV:2000";LC_TELEPHONE
> -
> +category  "es_SV:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -136,8 +136,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_US b/localedata/locales/es_US
> index 5c1b740..49407df 100644
> --- a/localedata/locales/es_US
> +++ b/localedata/locales/es_US
> @@ -44,7 +44,7 @@ category  "es_US:2000";LC_PAPER
>  category  "es_US:2000";LC_NAME
>  category  "es_US:2000";LC_ADDRESS
>  category  "es_US:2000";LC_TELEPHONE
> -
> +category  "es_US:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -187,6 +187,7 @@ int_prefix     "<U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> +% US customary units
>  measurement    2
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
> index 980ae94..fb44ef6 100644
> --- a/localedata/locales/es_UY
> +++ b/localedata/locales/es_UY
> @@ -44,7 +44,7 @@ category  "es_UY:2000";LC_PAPER
>  category  "es_UY:2000";LC_NAME
>  category  "es_UY:2000";LC_ADDRESS
>  category  "es_UY:2000";LC_TELEPHONE
> -
> +category  "es_UY:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -135,8 +135,8 @@ int_prefix     "<U0035><U0039><U0038>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
> index 2784cb5..f5a9a28 100644
> --- a/localedata/locales/es_VE
> +++ b/localedata/locales/es_VE
> @@ -44,7 +44,7 @@ category  "es_VE:2000";LC_PAPER
>  category  "es_VE:2000";LC_NAME
>  category  "es_VE:2000";LC_ADDRESS
>  category  "es_VE:2000";LC_TELEPHONE
> -
> +category  "es_VE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -135,8 +135,8 @@ int_prefix     "<U0035><U0038>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
> index c8bdc6b..dd905b9 100644
> --- a/localedata/locales/et_EE
> +++ b/localedata/locales/et_EE
> @@ -51,7 +51,7 @@ category  "et_EE:2000";LC_PAPER
>  category  "et_EE:2000";LC_NAME
>  category  "et_EE:2000";LC_ADDRESS
>  category  "et_EE:2000";LC_TELEPHONE
> -
> +category  "et_EE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2221,8 +2221,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
> index 7c56210..cd07cb3 100644
> --- a/localedata/locales/eu_ES
> +++ b/localedata/locales/eu_ES
> @@ -47,7 +47,7 @@ category  "eu_ES:2000";LC_PAPER
>  category  "eu_ES:2000";LC_NAME
>  category  "eu_ES:2000";LC_ADDRESS
>  category  "eu_ES:2000";LC_TELEPHONE
> -
> +category  "eu_ES:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -149,8 +149,8 @@ int_prefix     "<U0033><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro
> index 356bf62..1d2ac5a 100644
> --- a/localedata/locales/eu_ES@euro
> +++ b/localedata/locales/eu_ES@euro
> @@ -36,7 +36,7 @@ category  "eu_ES@euro:2000";LC_PAPER
>  category  "eu_ES@euro:2000";LC_NAME
>  category  "eu_ES@euro:2000";LC_ADDRESS
>  category  "eu_ES@euro:2000";LC_TELEPHONE
> -
> +category  "eu_ES@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -86,7 +86,8 @@ copy "eu_ES"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "eu_ES"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR
> index 2429787..c2e493e 100644
> --- a/localedata/locales/fa_IR
> +++ b/localedata/locales/fa_IR
> @@ -42,7 +42,7 @@ category  "fa_IR:2005";LC_PAPER
>  category  "fa_IR:2005";LC_NAME
>  category  "fa_IR:2005";LC_ADDRESS
>  category  "fa_IR:2005";LC_TELEPHONE
> -
> +category  "fa_IR:2005";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -488,5 +488,6 @@ int_prefix     "<U0039><U0038>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ff_SN b/localedata/locales/ff_SN
> index 0c68401..d3adda2 100644
> --- a/localedata/locales/ff_SN
> +++ b/localedata/locales/ff_SN
> @@ -137,7 +137,8 @@ width   210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -measurement  1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
> index bd6805a..bc79487 100644
> --- a/localedata/locales/fi_FI
> +++ b/localedata/locales/fi_FI
> @@ -230,7 +230,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro
> index 8c610cc..76f78ee 100644
> --- a/localedata/locales/fi_FI@euro
> +++ b/localedata/locales/fi_FI@euro
> @@ -72,7 +72,8 @@ copy "fi_FI"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "fi_FI"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH
> index b2c70a5..158b133 100644
> --- a/localedata/locales/fil_PH
> +++ b/localedata/locales/fil_PH
> @@ -154,6 +154,7 @@ copy "tl_PH"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO
> index 0a84b2b..e447a2a 100644
> --- a/localedata/locales/fo_FO
> +++ b/localedata/locales/fo_FO
> @@ -46,7 +46,7 @@ category  "fo_FO:2000";LC_PAPER
>  category  "fo_FO:2000";LC_NAME
>  category  "fo_FO:2000";LC_ADDRESS
>  category  "fo_FO:2000";LC_TELEPHONE
> -
> +category  "fo_FO:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -124,8 +124,8 @@ int_prefix     "<U0032><U0039><U0038>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
> index 9ac30a2..5759d1e 100644
> --- a/localedata/locales/fr_BE
> +++ b/localedata/locales/fr_BE
> @@ -42,7 +42,7 @@ category  "fr_BE:2000";LC_PAPER
>  category  "fr_BE:2000";LC_NAME
>  category  "fr_BE:2000";LC_ADDRESS
>  category  "fr_BE:2000";LC_TELEPHONE
> -
> +category  "fr_BE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -141,8 +141,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_BE@euro b/localedata/locales/fr_BE@euro
> index 08f9298..4c85905 100644
> --- a/localedata/locales/fr_BE@euro
> +++ b/localedata/locales/fr_BE@euro
> @@ -35,7 +35,7 @@ category  "fr_BE@euro:2000";LC_PAPER
>  category  "fr_BE@euro:2000";LC_NAME
>  category  "fr_BE@euro:2000";LC_ADDRESS
>  category  "fr_BE@euro:2000";LC_TELEPHONE
> -
> +category  "fr_BE@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "fr_BE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "fr_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
> index a86f603..2d8715d 100644
> --- a/localedata/locales/fr_CA
> +++ b/localedata/locales/fr_CA
> @@ -43,7 +43,7 @@ category  "fr_CA:2000";LC_PAPER
>  category  "fr_CA:2000";LC_NAME
>  category  "fr_CA:2000";LC_ADDRESS
>  category  "fr_CA:2000";LC_TELEPHONE
> -
> +category  "fr_CA:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -129,7 +129,8 @@ copy "en_CA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_CA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
> index da8dd76..972a16c 100644
> --- a/localedata/locales/fr_CH
> +++ b/localedata/locales/fr_CH
> @@ -43,7 +43,7 @@ category  "fr_CH:2000";LC_PAPER
>  category  "fr_CH:2000";LC_NAME
>  category  "fr_CH:2000";LC_ADDRESS
>  category  "fr_CH:2000";LC_TELEPHONE
> -
> +category  "fr_CH:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -121,8 +121,8 @@ int_prefix     "<U0034><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
> index f5b5b04..b654df1 100644
> --- a/localedata/locales/fr_FR
> +++ b/localedata/locales/fr_FR
> @@ -44,7 +44,7 @@ category  "fr_FR:2000";LC_PAPER
>  category  "fr_FR:2000";LC_NAME
>  category  "fr_FR:2000";LC_ADDRESS
>  category  "fr_FR:2000";LC_TELEPHONE
> -
> +category  "fr_FR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -160,7 +160,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_FR@euro b/localedata/locales/fr_FR@euro
> index 5f858fd..c1ae9d8 100644
> --- a/localedata/locales/fr_FR@euro
> +++ b/localedata/locales/fr_FR@euro
> @@ -34,7 +34,7 @@ category  "fr_FR@euro:2000";LC_PAPER
>  category  "fr_FR@euro:2000";LC_NAME
>  category  "fr_FR@euro:2000";LC_ADDRESS
>  category  "fr_FR@euro:2000";LC_TELEPHONE
> -
> +category  "fr_FR@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "fr_FR"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "fr_FR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
> index 5d76dc7..228878c 100644
> --- a/localedata/locales/fr_LU
> +++ b/localedata/locales/fr_LU
> @@ -42,7 +42,7 @@ category  "fr_LU:2000";LC_PAPER
>  category  "fr_LU:2000";LC_NAME
>  category  "fr_LU:2000";LC_ADDRESS
>  category  "fr_LU:2000";LC_TELEPHONE
> -
> +category  "fr_LU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -138,8 +138,8 @@ int_prefix     "<U0033><U0035><U0032>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro
> index 014ff1d..1c2828e 100644
> --- a/localedata/locales/fr_LU@euro
> +++ b/localedata/locales/fr_LU@euro
> @@ -35,7 +35,7 @@ category  "fr_LU@euro:2000";LC_PAPER
>  category  "fr_LU@euro:2000";LC_NAME
>  category  "fr_LU@euro:2000";LC_ADDRESS
>  category  "fr_LU@euro:2000";LC_TELEPHONE
> -
> +category  "fr_LU@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "fr_LU"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "fr_LU"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fur_IT b/localedata/locales/fur_IT
> index df51976..544aa45 100644
> --- a/localedata/locales/fur_IT
> +++ b/localedata/locales/fur_IT
> @@ -35,7 +35,7 @@ category  "fur_IT:2000";LC_PAPER
>  category  "fur_IT:2000";LC_NAME
>  category  "fur_IT:2000";LC_ADDRESS
>  category  "fur_IT:2000";LC_TELEPHONE
> -
> +category  "fur_IT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -124,7 +124,8 @@ copy  "it_IT"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy  "it_IT"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE
> index d4a8614..e8f1a9a 100644
> --- a/localedata/locales/fy_DE
> +++ b/localedata/locales/fy_DE
> @@ -89,7 +89,8 @@ copy "de_DE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_DE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NUMERIC
> diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
> index c6be0b1..5d8afbc 100644
> --- a/localedata/locales/fy_NL
> +++ b/localedata/locales/fy_NL
> @@ -105,7 +105,8 @@ copy "nl_NL"
>  END LC_MONETARY
>
>  LC_MEASUREMENT
> -copy "nl_NL"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE
> index dda0009..5ee2380 100644
> --- a/localedata/locales/ga_IE
> +++ b/localedata/locales/ga_IE
> @@ -40,7 +40,7 @@ category  "ga_IE:2000";LC_PAPER
>  category  "ga_IE:2000";LC_NAME
>  category  "ga_IE:2000";LC_ADDRESS
>  category  "ga_IE:2000";LC_TELEPHONE
> -
> +category  "ga_IE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -140,8 +140,8 @@ int_prefix     "<U0033><U0035><U0033>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ga_IE@euro b/localedata/locales/ga_IE@euro
> index c9474a5..99422e3 100644
> --- a/localedata/locales/ga_IE@euro
> +++ b/localedata/locales/ga_IE@euro
> @@ -34,7 +34,7 @@ category  "ga_IE@euro:2000";LC_PAPER
>  category  "ga_IE@euro:2000";LC_NAME
>  category  "ga_IE@euro:2000";LC_ADDRESS
>  category  "ga_IE@euro:2000";LC_TELEPHONE
> -
> +category  "ga_IE@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -70,7 +70,8 @@ copy "ga_IE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "ga_IE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
> index f2d9e81..41943f5 100644
> --- a/localedata/locales/gd_GB
> +++ b/localedata/locales/gd_GB
> @@ -121,7 +121,8 @@ copy "en_GB"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "en_GB"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
> index 5baff5c..fb8f7ca 100644
> --- a/localedata/locales/gez_ER
> +++ b/localedata/locales/gez_ER
> @@ -70,7 +70,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ER"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/gez_ER@abegede
> b/localedata/locales/gez_ER@abegede
> index 9b938f6..f3e0b9a 100644
> --- a/localedata/locales/gez_ER@abegede
> +++ b/localedata/locales/gez_ER@abegede
> @@ -115,7 +115,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "gez_ER"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
> index b5a6cc6..13cd5f4 100644
> --- a/localedata/locales/gez_ET
> +++ b/localedata/locales/gez_ET
> @@ -70,7 +70,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/gez_ET@abegede
> b/localedata/locales/gez_ET@abegede
> index 3a97c55..3377c1e 100644
> --- a/localedata/locales/gez_ET@abegede
> +++ b/localedata/locales/gez_ET@abegede
> @@ -71,7 +71,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "gez_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES
> index 6acf505..20ee0c2 100644
> --- a/localedata/locales/gl_ES
> +++ b/localedata/locales/gl_ES
> @@ -43,7 +43,7 @@ category  "gl_ES:2000";LC_PAPER
>  category  "gl_ES:2000";LC_NAME
>  category  "gl_ES:2000";LC_ADDRESS
>  category  "gl_ES:2000";LC_TELEPHONE
> -
> +category  "gl_ES:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -139,8 +139,8 @@ int_prefix     "<U0033><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/gl_ES@euro b/localedata/locales/gl_ES@euro
> index 534a092..20a3341 100644
> --- a/localedata/locales/gl_ES@euro
> +++ b/localedata/locales/gl_ES@euro
> @@ -36,7 +36,7 @@ category  "gl_ES@euro:2000";LC_PAPER
>  category  "gl_ES@euro:2000";LC_NAME
>  category  "gl_ES@euro:2000";LC_ADDRESS
>  category  "gl_ES@euro:2000";LC_TELEPHONE
> -
> +category  "gl_ES@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -72,7 +72,8 @@ copy "gl_ES"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "gl_ES"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
> index 4e4f5c6..0fae48c 100644
> --- a/localedata/locales/gu_IN
> +++ b/localedata/locales/gu_IN
> @@ -29,7 +29,7 @@ category  "gu_IN:2000";LC_PAPER
>  category  "gu_IN:2000";LC_NAME
>  category  "gu_IN:2000";LC_ADDRESS
>  category  "gu_IN:2000";LC_TELEPHONE
> -
> +category  "gu_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -232,5 +232,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB
> index 40ab187..11c59e6 100644
> --- a/localedata/locales/gv_GB
> +++ b/localedata/locales/gv_GB
> @@ -45,7 +45,7 @@ category  "gv_GB:2000";LC_PAPER
>  category  "gv_GB:2000";LC_NAME
>  category  "gv_GB:2000";LC_ADDRESS
>  category  "gv_GB:2000";LC_TELEPHONE
> -
> +category  "gv_GB:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -154,8 +154,8 @@ int_prefix     "<U0034><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG
> index 8c431cc..6ea1a88 100644
> --- a/localedata/locales/ha_NG
> +++ b/localedata/locales/ha_NG
> @@ -38,7 +38,7 @@ category  "ha_NG:2000";LC_PAPER
>  category  "ha_NG:2000";LC_NAME
>  category  "ha_NG:2000";LC_ADDRESS
>  category  "ha_NG:2000";LC_TELEPHONE
> -
> +category  "ha_NG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -227,7 +227,8 @@ copy "en_NG"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "en_NG"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
> index 1886e5a..454ebad 100644
> --- a/localedata/locales/hak_TW
> +++ b/localedata/locales/hak_TW
> @@ -161,6 +161,7 @@ width  210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL
> index b2539a1..fe8125b 100644
> --- a/localedata/locales/he_IL
> +++ b/localedata/locales/he_IL
> @@ -47,7 +47,7 @@ category  "he_IL:2000";LC_PAPER
>  category  "he_IL:2000";LC_NAME
>  category  "he_IL:2000";LC_ADDRESS
>  category  "he_IL:2000";LC_TELEPHONE
> -
> +category  "he_IL:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -144,8 +144,8 @@ int_prefix     "<U0039><U0037><U0032>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN
> index 047f47f..c41a264 100644
> --- a/localedata/locales/hi_IN
> +++ b/localedata/locales/hi_IN
> @@ -28,7 +28,7 @@ category  "hi_IN:2000";LC_PAPER
>  category  "hi_IN:2000";LC_NAME
>  category  "hi_IN:2000";LC_ADDRESS
>  category  "hi_IN:2000";LC_TELEPHONE
> -
> +category  "hi_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -236,7 +236,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN
> index 6a80b69..c9f8163 100644
> --- a/localedata/locales/hne_IN
> +++ b/localedata/locales/hne_IN
> @@ -28,7 +28,7 @@ category  "hne_IN:2008";LC_PAPER
>  category  "hne_IN:2008";LC_NAME
>  category  "hne_IN:2008";LC_ADDRESS
>  category  "hne_IN:2008";LC_TELEPHONE
> -
> +category  "hne_IN:2008";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -176,5 +176,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
> index 7dccab3..5d29968 100644
> --- a/localedata/locales/hr_HR
> +++ b/localedata/locales/hr_HR
> @@ -44,7 +44,7 @@ category  "hr_HR:2000";LC_PAPER
>  category  "hr_HR:2000";LC_NAME
>  category  "hr_HR:2000";LC_ADDRESS
>  category  "hr_HR:2000";LC_TELEPHONE
> -
> +category  "hr_HR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2229,8 +2229,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE
> index fd3217a..db130fd 100644
> --- a/localedata/locales/hsb_DE
> +++ b/localedata/locales/hsb_DE
> @@ -31,7 +31,7 @@ category  "i18n:1997";LC_PAPER
>  category  "i18n:1997";LC_NAME
>  category  "i18n:1997";LC_ADDRESS
>  category  "i18n:1997";LC_TELEPHONE
> -
> +category  "i18n:1997";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2187,7 +2187,8 @@ copy "de_DE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_DE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
> index a6169d7..0dfae82 100644
> --- a/localedata/locales/hu_HU
> +++ b/localedata/locales/hu_HU
> @@ -55,7 +55,7 @@ category  "hu_HU:2000";LC_PAPER
>  category  "hu_HU:2000";LC_NAME
>  category  "hu_HU:2000";LC_ADDRESS
>  category  "hu_HU:2000";LC_TELEPHONE
> -
> +category  "hu_HU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -566,8 +566,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM
> index 1e4649a..5610889 100644
> --- a/localedata/locales/hy_AM
> +++ b/localedata/locales/hy_AM
> @@ -156,8 +156,8 @@ yesexpr
> "<U005E><U005B><U0079><U0059><U0073><U0053><U0561><U0531><U005D>"
>  noexpr      "<U005E><U005B><U006E><U004E><U0578><U0548><U005D>"
>  END LC_MESSAGES
>
> -% Metric Measurement system (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/ia_FR b/localedata/locales/ia_FR
> index b6cd1fc..722cc6e 100644
> --- a/localedata/locales/ia_FR
> +++ b/localedata/locales/ia_FR
> @@ -106,7 +106,8 @@ nostr   "<U004E><U006F>"
>  END LC_MESSAGES
>
>  LC_MEASUREMENT
> -copy "fr_FR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_PAPER
> diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID
> index 35cf7b1..668f25d 100644
> --- a/localedata/locales/id_ID
> +++ b/localedata/locales/id_ID
> @@ -43,7 +43,7 @@ category  "id_ID:2000";LC_PAPER
>  category  "id_ID:2000";LC_NAME
>  category  "id_ID:2000";LC_ADDRESS
>  category  "id_ID:2000";LC_TELEPHONE
> -
> +category  "id_ID:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -141,8 +141,8 @@ int_prefix     "<U0036><U0032>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG
> index eb6fc38..8b1a48b 100644
> --- a/localedata/locales/ig_NG
> +++ b/localedata/locales/ig_NG
> @@ -38,7 +38,7 @@ category  "ig_NG:2000";LC_PAPER
>  category  "ig_NG:2000";LC_NAME
>  category  "ig_NG:2000";LC_ADDRESS
>  category  "ig_NG:2000";LC_TELEPHONE
> -
> +category  "ig_NG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -424,7 +424,8 @@ copy "en_NG"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "en_NG"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
> index 3ca018a..1826ca7 100644
> --- a/localedata/locales/ik_CA
> +++ b/localedata/locales/ik_CA
> @@ -38,7 +38,7 @@ category  "ik_CA:2000";LC_PAPER
>  category  "ik_CA:2000";LC_NAME
>  category  "ik_CA:2000";LC_ADDRESS
>  category  "ik_CA:2000";LC_TELEPHONE
> -
> +category  "ik_CA:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -211,8 +211,8 @@ LC_PAPER
>  copy "en_CA"
>  END LC_PAPER
>
> -% Metric System (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
> index 1e2dff0..299c4aa 100644
> --- a/localedata/locales/is_IS
> +++ b/localedata/locales/is_IS
> @@ -44,7 +44,7 @@ category  "is_IS:2000";LC_PAPER
>  category  "is_IS:2000";LC_NAME
>  category  "is_IS:2000";LC_ADDRESS
>  category  "is_IS:2000";LC_TELEPHONE
> -
> +category  "is_IS:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2245,8 +2245,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH
> index 5702e44..f135fbb 100644
> --- a/localedata/locales/it_CH
> +++ b/localedata/locales/it_CH
> @@ -36,7 +36,7 @@ category  "it_CH:2000";LC_PAPER
>  category  "it_CH:2000";LC_NAME
>  category  "it_CH:2000";LC_ADDRESS
>  category  "it_CH:2000";LC_TELEPHONE
> -
> +category  "it_CH:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -116,8 +116,8 @@ int_prefix     "<U0034><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
> index 498010d..1a4fdd1 100644
> --- a/localedata/locales/it_IT
> +++ b/localedata/locales/it_IT
> @@ -42,7 +42,7 @@ category  "it_IT:2000";LC_PAPER
>  category  "it_IT:2000";LC_NAME
>  category  "it_IT:2000";LC_ADDRESS
>  category  "it_IT:2000";LC_TELEPHONE
> -
> +category  "it_IT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -142,8 +142,8 @@ int_prefix     "<U0033><U0039>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/it_IT@euro b/localedata/locales/it_IT@euro
> index e34a8d5..fb9114c 100644
> --- a/localedata/locales/it_IT@euro
> +++ b/localedata/locales/it_IT@euro
> @@ -35,7 +35,7 @@ category  "it_IT@euro:2000";LC_PAPER
>  category  "it_IT@euro:2000";LC_NAME
>  category  "it_IT@euro:2000";LC_ADDRESS
>  category  "it_IT@euro:2000";LC_TELEPHONE
> -
> +category  "it_IT@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -71,7 +71,8 @@ copy "it_IT"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "it_IT"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
> index 3146568..e2300bf 100644
> --- a/localedata/locales/iu_CA
> +++ b/localedata/locales/iu_CA
> @@ -132,8 +132,8 @@ LC_NAME
>  copy "en_CA"
>  END LC_NAME
>
> -% Metric System (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
> index 53b11e9..51b8a08 100644
> --- a/localedata/locales/ja_JP
> +++ b/localedata/locales/ja_JP
> @@ -31,7 +31,7 @@ category  "ja_JP:2000";LC_PAPER
>  category  "ja_JP:2000";LC_NAME
>  category  "ja_JP:2000";LC_ADDRESS
>  category  "ja_JP:2000";LC_TELEPHONE
> -
> +category  "ja_JP:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -15064,8 +15064,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ka_GE b/localedata/locales/ka_GE
> index 0b71142..583e08c 100644
> --- a/localedata/locales/ka_GE
> +++ b/localedata/locales/ka_GE
> @@ -145,8 +145,8 @@ yesexpr
> "<U005E><U005B><U0031><U0079><U0059><U006B><U004B><U0078><U0058><U10EE>
>  noexpr   "<U005E><U005B><U0030><U006E><U004E><U0061><U0041><U10D0><U005D><U002E><U002A>"
>  END LC_MESSAGES
>
> -% Metric Measurement system (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ
> index 9fe0488..89b303b 100644
> --- a/localedata/locales/kk_KZ
> +++ b/localedata/locales/kk_KZ
> @@ -42,7 +42,7 @@ category  "kk_KZ:2000";LC_PAPER
>  category  "kk_KZ:2000";LC_NAME
>  category  "kk_KZ:2000";LC_ADDRESS
>  category  "kk_KZ:2000";LC_TELEPHONE
> -
> +category  "kk_KZ:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -246,8 +246,8 @@ int_prefix     "<U0037>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
> index 217ba6b..002d8cf 100644
> --- a/localedata/locales/kl_GL
> +++ b/localedata/locales/kl_GL
> @@ -47,7 +47,7 @@ category  "kl_GL:2000";LC_PAPER
>  category  "kl_GL:2000";LC_NAME
>  category  "kl_GL:2000";LC_ADDRESS
>  category  "kl_GL:2000";LC_TELEPHONE
> -
> +category  "kl_GL:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -125,8 +125,8 @@ int_prefix     "<U0032><U0039><U0039>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
> index c314cb5..5563659 100644
> --- a/localedata/locales/km_KH
> +++ b/localedata/locales/km_KH
> @@ -63,7 +63,7 @@ category  "km_KH:2000";LC_PAPER
>  category  "km_KH:2000";LC_NAME
>  category  "km_KH:2000";LC_ADDRESS
>  category  "km_KH:2000";LC_TELEPHONE
> -
> +category  "km_KH:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -1869,8 +1869,8 @@ int_prefix     "<U0038><U0035><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN
> index aa6ea38..c500330 100644
> --- a/localedata/locales/kn_IN
> +++ b/localedata/locales/kn_IN
> @@ -30,7 +30,7 @@ category  "kn_IN:2000";LC_PAPER
>  category  "kn_IN:2000";LC_NAME
>  category  "kn_IN:2000";LC_ADDRESS
>  category  "kn_IN:2000";LC_TELEPHONE
> -
> +category  "kn_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -236,5 +236,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR
> index fea519e..7be5214 100644
> --- a/localedata/locales/ko_KR
> +++ b/localedata/locales/ko_KR
> @@ -63,7 +63,7 @@ category  "ko_KR:2000";LC_PAPER
>  category  "ko_KR:2000";LC_NAME
>  category  "ko_KR:2000";LC_ADDRESS
>  category  "ko_KR:2000";LC_TELEPHONE
> -
> +category  "ko_KR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -6229,8 +6229,8 @@ int_prefix     "<U0038><U0032>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN
> index fb7aa9e..6c49ace 100644
> --- a/localedata/locales/kok_IN
> +++ b/localedata/locales/kok_IN
> @@ -28,7 +28,7 @@ category  "kok_IN:2009";LC_PAPER
>  category  "kok_IN:2009";LC_NAME
>  category  "kok_IN:2009";LC_ADDRESS
>  category  "kok_IN:2009";LC_TELEPHONE
> -
> +category  "kok_IN:2009";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -211,5 +211,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN
> index ad6eafe..2222782 100644
> --- a/localedata/locales/ks_IN
> +++ b/localedata/locales/ks_IN
> @@ -29,8 +29,7 @@ category  "ks_IN:2009";LC_PAPER
>  category  "ks_IN:2009";LC_NAME
>  category  "ks_IN:2009";LC_ADDRESS
>  category  "ks_IN:2009";LC_TELEPHONE
> -
> -
> +category  "ks_IN:2009";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -214,5 +213,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ks_IN@devanagari
> b/localedata/locales/ks_IN@devanagari
> index e1f6290..a591d2d 100644
> --- a/localedata/locales/ks_IN@devanagari
> +++ b/localedata/locales/ks_IN@devanagari
> @@ -28,7 +28,7 @@ category  "ks_IN@devanagari:2008";LC_PAPER
>  category  "ks_IN@devanagari:2008";LC_NAME
>  category  "ks_IN@devanagari:2008";LC_ADDRESS
>  category  "ks_IN@devanagari:2008";LC_TELEPHONE
> -
> +category  "ks_IN@devanagari:2008";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -164,5 +164,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR
> index ddd671d..d974bfb 100644
> --- a/localedata/locales/ku_TR
> +++ b/localedata/locales/ku_TR
> @@ -174,7 +174,8 @@ copy "tr_TR"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "tr_TR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB
> index 35b21e5..1eb641a 100644
> --- a/localedata/locales/kw_GB
> +++ b/localedata/locales/kw_GB
> @@ -46,7 +46,7 @@ category  "kw_GB:2000";LC_PAPER
>  category  "kw_GB:2000";LC_NAME
>  category  "kw_GB:2000";LC_ADDRESS
>  category  "kw_GB:2000";LC_TELEPHONE
> -
> +category  "kw_GB:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -146,8 +146,8 @@ int_prefix     "<U0034><U0034>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ky_KG b/localedata/locales/ky_KG
> index 107b2a4..6e0a666 100644
> --- a/localedata/locales/ky_KG
> +++ b/localedata/locales/ky_KG
> @@ -30,7 +30,7 @@ category  "ky_KG:2000";LC_PAPER
>  category  "ky_KG:2000";LC_NAME
>  category  "ky_KG:2000";LC_ADDRESS
>  category  "ky_KG:2000";LC_TELEPHONE
> -
> +category  "ky_KG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -187,7 +187,8 @@ int_prefix     "<U0039><U0039><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU
> index b62196e..a74e162 100644
> --- a/localedata/locales/lb_LU
> +++ b/localedata/locales/lb_LU
> @@ -192,5 +192,6 @@ int_select    "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG
> index f75e07b..0e511d3 100644
> --- a/localedata/locales/lg_UG
> +++ b/localedata/locales/lg_UG
> @@ -43,7 +43,7 @@ category  "lg_UG:2001";LC_PAPER
>  category  "lg_UG:2001";LC_NAME
>  category  "lg_UG:2001";LC_ADDRESS
>  category  "lg_UG:2001";LC_TELEPHONE
> -
> +category  "lg_UG:2001";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -260,7 +260,8 @@ int_prefix     "<U0032><U0035><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/li_BE b/localedata/locales/li_BE
> index 3a13dbb..652ff63 100644
> --- a/localedata/locales/li_BE
> +++ b/localedata/locales/li_BE
> @@ -84,7 +84,8 @@ copy "nl_BE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "nl_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NUMERIC
> diff --git a/localedata/locales/li_NL b/localedata/locales/li_NL
> index 0588cb8..6613b15 100644
> --- a/localedata/locales/li_NL
> +++ b/localedata/locales/li_NL
> @@ -84,7 +84,8 @@ copy "nl_NL"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "nl_NL"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NUMERIC
> diff --git a/localedata/locales/lij_IT b/localedata/locales/lij_IT
> index 6475280..553f2a5 100644
> --- a/localedata/locales/lij_IT
> +++ b/localedata/locales/lij_IT
> @@ -27,7 +27,7 @@ category  "lij_IT:2000";LC_PAPER
>  category  "lij_IT:2000";LC_NAME
>  category  "lij_IT:2000";LC_ADDRESS
>  category  "lij_IT:2000";LC_TELEPHONE
> -
> +category  "lij_IT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>  %
>  LC_COLLATE
> @@ -111,8 +111,8 @@ int_prefix     "<U0033><U0039>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
> index 29ab3f3..c584877 100644
> --- a/localedata/locales/lo_LA
> +++ b/localedata/locales/lo_LA
> @@ -66,7 +66,7 @@ category  "lo_LA:2000";LC_PAPER
>  category  "lo_LA:2000";LC_NAME
>  category  "lo_LA:2000";LC_ADDRESS
>  category  "lo_LA:2000";LC_TELEPHONE
> -
> +category  "lo_LA:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -748,8 +748,8 @@ int_prefix     "<U0038><U0035><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT
> index 49aff85..6b4e2a6 100644
> --- a/localedata/locales/lt_LT
> +++ b/localedata/locales/lt_LT
> @@ -54,7 +54,7 @@ category  "lt_LT:2000";LC_PAPER
>  category  "lt_LT:2000";LC_NAME
>  category  "lt_LT:2000";LC_ADDRESS
>  category  "lt_LT:2000";LC_TELEPHONE
> -
> +category  "lt_LT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2214,8 +2214,8 @@ int_prefix     "<U0033><U0037><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV
> index 4ae623c..52d5440 100644
> --- a/localedata/locales/lv_LV
> +++ b/localedata/locales/lv_LV
> @@ -46,7 +46,7 @@ category  "lv_LV:2000";LC_PAPER
>  category  "lv_LV:2000";LC_NAME
>  category  "lv_LV:2000";LC_ADDRESS
>  category  "lv_LV:2000";LC_TELEPHONE
> -
> +category  "lv_LV:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2206,8 +2206,8 @@ int_prefix     "<U0033><U0037><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
> index 785d73a..73b4897 100644
> --- a/localedata/locales/lzh_TW
> +++ b/localedata/locales/lzh_TW
> @@ -196,6 +196,7 @@ width  210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/mag_IN b/localedata/locales/mag_IN
> index 098002e..c9663dc 100644
> --- a/localedata/locales/mag_IN
> +++ b/localedata/locales/mag_IN
> @@ -29,7 +29,7 @@ category  "mag_IN:2012";LC_PAPER
>  category  "mag_IN:2012";LC_NAME
>  category  "mag_IN:2012";LC_ADDRESS
>  category  "mag_IN:2012";LC_TELEPHONE
> -
> +category  "mag_IN:2012";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -176,5 +176,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN
> index 7d01817..addf33d 100644
> --- a/localedata/locales/mai_IN
> +++ b/localedata/locales/mai_IN
> @@ -28,7 +28,7 @@ category  "mai_IN:2006";LC_PAPER
>  category  "mai_IN:2006";LC_NAME
>  category  "mai_IN:2006";LC_ADDRESS
>  category  "mai_IN:2006";LC_TELEPHONE
> -
> +category  "mai_IN:2006";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -92,5 +92,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/mg_MG b/localedata/locales/mg_MG
> index 14a8658..3391b15 100644
> --- a/localedata/locales/mg_MG
> +++ b/localedata/locales/mg_MG
> @@ -39,7 +39,7 @@ category  "mg_MG:2000";LC_PAPER
>  category  "mg_MG:2000";LC_NAME
>  category  "mg_MG:2000";LC_ADDRESS
>  category  "mg_MG:2000";LC_TELEPHONE
> -
> +category  "mg_MG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -159,7 +159,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/mhr_RU b/localedata/locales/mhr_RU
> index 7fa34f3..4b79dc0 100644
> --- a/localedata/locales/mhr_RU
> +++ b/localedata/locales/mhr_RU
> @@ -41,7 +41,7 @@ category  "mhr_RU:2000";LC_PAPER
>  category  "mhr_RU:2000";LC_NAME
>  category  "mhr_RU:2000";LC_ADDRESS
>  category  "mhr_RU:2000";LC_TELEPHONE
> -
> +category  "mhr_RU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -142,7 +142,8 @@ copy "ru_RU"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "ru_RU"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/mi_NZ b/localedata/locales/mi_NZ
> index d4cf2a3..c898a01 100644
> --- a/localedata/locales/mi_NZ
> +++ b/localedata/locales/mi_NZ
> @@ -150,6 +150,7 @@ copy "en_NZ"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK
> index 8c137a6..35f2d1e 100644
> --- a/localedata/locales/mk_MK
> +++ b/localedata/locales/mk_MK
> @@ -31,7 +31,7 @@ category  "mk_MK:2000";LC_PAPER
>  category  "mk_MK:2000";LC_NAME
>  category  "mk_MK:2000";LC_ADDRESS
>  category  "mk_MK:2000";LC_TELEPHONE
> -
> +category  "mk_MK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -166,5 +166,6 @@ width    210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN
> index 8dc65f4..f64b846 100644
> --- a/localedata/locales/ml_IN
> +++ b/localedata/locales/ml_IN
> @@ -224,6 +224,6 @@ copy "hi_IN"
>  END LC_TELEPHONE
>  %
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> -%
> diff --git a/localedata/locales/mn_MN b/localedata/locales/mn_MN
> index 8da3878..763fe06 100644
> --- a/localedata/locales/mn_MN
> +++ b/localedata/locales/mn_MN
> @@ -33,7 +33,7 @@ category  "mn_MN:2000";LC_PAPER
>  category  "mn_MN:2000";LC_NAME
>  category  "mn_MN:2000";LC_ADDRESS
>  category  "mn_MN:2000";LC_TELEPHONE
> -
> +category  "mn_MN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -269,5 +269,6 @@ int_prefix     "<U0039><U0037><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/mni_IN b/localedata/locales/mni_IN
> index d12b782..8c12c0e 100644
> --- a/localedata/locales/mni_IN
> +++ b/localedata/locales/mni_IN
> @@ -27,7 +27,7 @@ category  "mni_IN:2012";LC_PAPER
>  category  "mni_IN:2012";LC_NAME
>  category  "mni_IN:2012";LC_ADDRESS
>  category  "mni_IN:2012";LC_TELEPHONE
> -
> +category  "mni_IN:2012";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -178,5 +178,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "bn_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
> index 09b9c37..3d03d14 100644
> --- a/localedata/locales/mr_IN
> +++ b/localedata/locales/mr_IN
> @@ -27,7 +27,7 @@ category  "mr_IN:2000";LC_PAPER
>  category  "mr_IN:2000";LC_NAME
>  category  "mr_IN:2000";LC_ADDRESS
>  category  "mr_IN:2000";LC_TELEPHONE
> -
> +category  "mr_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -236,5 +236,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY
> index e8535ac..722188a 100644
> --- a/localedata/locales/ms_MY
> +++ b/localedata/locales/ms_MY
> @@ -30,7 +30,7 @@ category  "ms_MY:2000";LC_PAPER
>  category  "ms_MY:2000";LC_NAME
>  category  "ms_MY:2000";LC_ADDRESS
>  category  "ms_MY:2000";LC_TELEPHONE
> -
> +category  "ms_MY:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -222,8 +222,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT
> index 6107766..8c16f55 100644
> --- a/localedata/locales/mt_MT
> +++ b/localedata/locales/mt_MT
> @@ -31,7 +31,7 @@ category  "mt_MT:2000";LC_PAPER
>  category  "mt_MT:2000";LC_NAME
>  category  "mt_MT:2000";LC_ADDRESS
>  category  "mt_MT:2000";LC_TELEPHONE
> -
> +category  "mt_MT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -311,8 +311,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
> index 261019a..d9a2db1 100644
> --- a/localedata/locales/my_MM
> +++ b/localedata/locales/my_MM
> @@ -274,8 +274,9 @@ nostr
> "<U1019><U101F><U102F><U1010><U103A><U1018><U1030><U1038>"
>  END LC_MESSAGES
>
>
> -% Metric Measurement system (ISO 1000)
>  LC_MEASUREMENT
> +% http://en.wikipedia.org/wiki/Burmese_units_of_measurement
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
> index 475e582..0c11174 100644
> --- a/localedata/locales/nan_TW
> +++ b/localedata/locales/nan_TW
> @@ -162,6 +162,7 @@ width  210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
> index bf8a6cd..a1e7d49 100644
> --- a/localedata/locales/nan_TW@latin
> +++ b/localedata/locales/nan_TW@latin
> @@ -162,6 +162,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO
> index 07df38c..d3d6c75 100644
> --- a/localedata/locales/nb_NO
> +++ b/localedata/locales/nb_NO
> @@ -42,7 +42,7 @@ category  "nb_NO:2000";LC_PAPER
>  category  "nb_NO:2000";LC_NAME
>  category  "nb_NO:2000";LC_ADDRESS
>  category  "nb_NO:2000";LC_TELEPHONE
> -
> +category  "nb_NO:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -224,7 +224,8 @@ int_prefix     "<U0034><U0037>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/nds_DE b/localedata/locales/nds_DE
> index 02c1b1a..e1ab6e0 100644
> --- a/localedata/locales/nds_DE
> +++ b/localedata/locales/nds_DE
> @@ -83,7 +83,8 @@ copy "de_DE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_DE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NUMERIC
> diff --git a/localedata/locales/nds_NL b/localedata/locales/nds_NL
> index 3857947..14051f6 100644
> --- a/localedata/locales/nds_NL
> +++ b/localedata/locales/nds_NL
> @@ -82,7 +82,8 @@ copy "nl_NL"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "nl_NL"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NUMERIC
> diff --git a/localedata/locales/ne_NP b/localedata/locales/ne_NP
> index 9ee000a..4f7f2cd 100644
> --- a/localedata/locales/ne_NP
> +++ b/localedata/locales/ne_NP
> @@ -27,7 +27,7 @@ category  "ne_NP:2003";LC_PAPER
>  category  "ne_NP:2003";LC_NAME
>  category  "ne_NP:2003";LC_ADDRESS
>  category  "ne_NP:2003";LC_TELEPHONE
> -
> +category  "ne_NP:2003";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -217,8 +217,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/nhn_MX b/localedata/locales/nhn_MX
> index 6534b78..a181f29 100644
> --- a/localedata/locales/nhn_MX
> +++ b/localedata/locales/nhn_MX
> @@ -132,7 +132,8 @@ copy "es_MX"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU
> index 440b497..3a4f02e 100644
> --- a/localedata/locales/niu_NU
> +++ b/localedata/locales/niu_NU
> @@ -148,6 +148,7 @@ copy "en_NZ"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ
> index 0afacda..eb746f2 100644
> --- a/localedata/locales/niu_NZ
> +++ b/localedata/locales/niu_NZ
> @@ -149,6 +149,7 @@ copy "en_NZ"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
> index 3da454b..6d12896 100644
> --- a/localedata/locales/nl_AW
> +++ b/localedata/locales/nl_AW
> @@ -27,7 +27,7 @@ category  "nl_AW:2008";LC_PAPER
>  category  "nl_AW:2008";LC_NAME
>  category  "nl_AW:2008";LC_ADDRESS
>  category  "nl_AW:2008";LC_TELEPHONE
> -
> +category  "nl_AW:2008";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -99,5 +99,6 @@ int_select     "<U0030><U0031><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_US"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
> index 3d1615b..fdd8433 100644
> --- a/localedata/locales/nl_BE
> +++ b/localedata/locales/nl_BE
> @@ -43,7 +43,7 @@ category  "nl_BE:2000";LC_PAPER
>  category  "nl_BE:2000";LC_NAME
>  category  "nl_BE:2000";LC_ADDRESS
>  category  "nl_BE:2000";LC_TELEPHONE
> -
> +category  "nl_BE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -117,7 +117,8 @@ copy "fr_BE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "fr_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/nl_BE@euro b/localedata/locales/nl_BE@euro
> index 413e8de..df36cee 100644
> --- a/localedata/locales/nl_BE@euro
> +++ b/localedata/locales/nl_BE@euro
> @@ -35,7 +35,7 @@ category  "nl_BE@euro:2000";LC_PAPER
>  category  "nl_BE@euro:2000";LC_NAME
>  category  "nl_BE@euro:2000";LC_ADDRESS
>  category  "nl_BE@euro:2000";LC_TELEPHONE
> -
> +category  "nl_BE@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "nl_BE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "nl_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL
> index 6f83292..ccb58ac 100644
> --- a/localedata/locales/nl_NL
> +++ b/localedata/locales/nl_NL
> @@ -42,7 +42,7 @@ category  "nl_NL:2000";LC_PAPER
>  category  "nl_NL:2000";LC_NAME
>  category  "nl_NL:2000";LC_ADDRESS
>  category  "nl_NL:2000";LC_TELEPHONE
> -
> +category  "nl_NL:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -143,8 +143,8 @@ int_prefix     "<U0033><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/nl_NL@euro b/localedata/locales/nl_NL@euro
> index b0cc689..e6af083 100644
> --- a/localedata/locales/nl_NL@euro
> +++ b/localedata/locales/nl_NL@euro
> @@ -35,7 +35,7 @@ category  "nl_NL@euro:2000";LC_PAPER
>  category  "nl_NL@euro:2000";LC_NAME
>  category  "nl_NL@euro:2000";LC_ADDRESS
>  category  "nl_NL@euro:2000";LC_TELEPHONE
> -
> +category  "nl_NL@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "nl_NL"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "nl_NL"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO
> index b1a829f..bbcd9a5 100644
> --- a/localedata/locales/nn_NO
> +++ b/localedata/locales/nn_NO
> @@ -28,7 +28,7 @@ category  "nn_NO:2000";LC_PAPER
>  category  "nn_NO:2000";LC_NAME
>  category  "nn_NO:2000";LC_ADDRESS
>  category  "nn_NO:2000";LC_TELEPHONE
> -
> +category  "nn_NO:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -176,5 +176,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "nb_NO"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
> index 62d7567..ae27bcc 100644
> --- a/localedata/locales/nr_ZA
> +++ b/localedata/locales/nr_ZA
> @@ -184,7 +184,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
> index abe2be2..df8eb75 100644
> --- a/localedata/locales/nso_ZA
> +++ b/localedata/locales/nso_ZA
> @@ -179,7 +179,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR
> index dfdc095..b95d1d6 100644
> --- a/localedata/locales/oc_FR
> +++ b/localedata/locales/oc_FR
> @@ -84,7 +84,8 @@ copy "fr_FR"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "fr_FR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_TELEPHONE
> diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
> index e241b97..b46544a 100644
> --- a/localedata/locales/om_ET
> +++ b/localedata/locales/om_ET
> @@ -77,7 +77,8 @@ END LC_CTYPE
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE
> index 1a94bbb..eaa189e 100644
> --- a/localedata/locales/om_KE
> +++ b/localedata/locales/om_KE
> @@ -56,7 +56,7 @@ END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Qubee Specifc Data:
> +%  Qubee Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
> @@ -141,17 +141,14 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Kenya Specifc and Shared Data:
> +%  Kenya Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>
>  LC_MEASUREMENT
> -%
> -% This is the ISO_IEC TR14652 Locale definition for the
> LC_MEASUREMENT category.
> -%
> +% metric
>  measurement 1
> -%
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
> index 15ed7ce..97e9479 100644
> --- a/localedata/locales/or_IN
> +++ b/localedata/locales/or_IN
> @@ -29,6 +29,7 @@ category  "or_IN:2004";LC_PAPER
>  category  "or_IN:2004";LC_NAME
>  category  "or_IN:2004";LC_ADDRESS
>  category  "or_IN:2004";LC_TELEPHONE
> +category  "or_IN:2004";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%
> @@ -833,5 +834,6 @@ END LC_TELEPHONE
>
>  %%%%%%%%%%%%%
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU
> index 91743dd..3686bfa 100644
> --- a/localedata/locales/os_RU
> +++ b/localedata/locales/os_RU
> @@ -42,7 +42,7 @@ category  "os_RU:2000";LC_PAPER
>  category  "os_RU:2000";LC_NAME
>  category  "os_RU:2000";LC_ADDRESS
>  category  "os_RU:2000";LC_TELEPHONE
> -
> +category  "os_RU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -158,7 +158,8 @@ copy "ru_RU"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "ru_RU"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
> index a3f8ef4..8c7d3e0 100644
> --- a/localedata/locales/pa_IN
> +++ b/localedata/locales/pa_IN
> @@ -27,7 +27,7 @@ category  "pa_IN:2000";LC_PAPER
>  category  "pa_IN:2000";LC_NAME
>  category  "pa_IN:2000";LC_ADDRESS
>  category  "pa_IN:2000";LC_TELEPHONE
> -
> +category  "pa_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -225,5 +225,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK
> index 122113a..082e924 100644
> --- a/localedata/locales/pa_PK
> +++ b/localedata/locales/pa_PK
> @@ -38,7 +38,7 @@ category  "pa_PK:2000";LC_PAPER
>  category  "pa_PK:2000";LC_NAME
>  category  "pa_PK:2000";LC_ADDRESS
>  category  "pa_PK:2000";LC_TELEPHONE
> -
> +category  "pa_PK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -158,7 +158,8 @@ copy "ur_PK"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "ur_PK"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/pap_AN b/localedata/locales/pap_AN
> index 45696cd..c949b45 100644
> --- a/localedata/locales/pap_AN
> +++ b/localedata/locales/pap_AN
> @@ -136,8 +136,8 @@ thousands_sep             ""
>  grouping                  0;0
>  END LC_NUMERIC
>
> -% Metric Measurement system (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/pap_AW b/localedata/locales/pap_AW
> index 115fa3d..98a6d9f 100644
> --- a/localedata/locales/pap_AW
> +++ b/localedata/locales/pap_AW
> @@ -146,8 +146,8 @@ thousands_sep             ""
>  grouping                  0;0
>  END LC_NUMERIC
>
> -% Metric Measurement system (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/pap_CW b/localedata/locales/pap_CW
> index dc10c83..4493e73 100644
> --- a/localedata/locales/pap_CW
> +++ b/localedata/locales/pap_CW
> @@ -146,8 +146,8 @@ thousands_sep             ""
>  grouping                  0;0
>  END LC_NUMERIC
>
> -% Metric Measurement system (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
> index 1431614..5af7af5 100644
> --- a/localedata/locales/pl_PL
> +++ b/localedata/locales/pl_PL
> @@ -44,7 +44,7 @@ category  "pl_PL:2000";LC_PAPER
>  category  "pl_PL:2000";LC_NAME
>  category  "pl_PL:2000";LC_ADDRESS
>  category  "pl_PL:2000";LC_TELEPHONE
> -
> +category  "pl_PL:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2215,8 +2215,8 @@ int_prefix     "<U0034><U0038>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
> index 87ce5a6..858c50d 100644
> --- a/localedata/locales/ps_AF
> +++ b/localedata/locales/ps_AF
> @@ -229,7 +229,8 @@ LC_MESSAGES
>  END LC_MESSAGES
>
>  LC_MEASUREMENT
> -    measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_PAPER
> diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
> index acc9897..388cb3e 100644
> --- a/localedata/locales/pt_BR
> +++ b/localedata/locales/pt_BR
> @@ -42,7 +42,7 @@ category  "pt_BR:2000";LC_PAPER
>  category  "pt_BR:2000";LC_NAME
>  category  "pt_BR:2000";LC_ADDRESS
>  category  "pt_BR:2000";LC_TELEPHONE
> -
> +category  "pt_BR:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -137,8 +137,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
> index 7417b34..d5461c9 100644
> --- a/localedata/locales/pt_PT
> +++ b/localedata/locales/pt_PT
> @@ -42,7 +42,7 @@ category  "pt_PT:2000";LC_PAPER
>  category  "pt_PT:2000";LC_NAME
>  category  "pt_PT:2000";LC_ADDRESS
>  category  "pt_PT:2000";LC_TELEPHONE
> -
> +category  "pt_PT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -139,7 +139,8 @@ int_prefix     "<U0033><U0035><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/pt_PT@euro b/localedata/locales/pt_PT@euro
> index f0a5c27..16bcb14 100644
> --- a/localedata/locales/pt_PT@euro
> +++ b/localedata/locales/pt_PT@euro
> @@ -35,7 +35,7 @@ category  "pt_PT@euro:2000";LC_PAPER
>  category  "pt_PT@euro:2000";LC_NAME
>  category  "pt_PT@euro:2000";LC_ADDRESS
>  category  "pt_PT@euro:2000";LC_TELEPHONE
> -
> +category  "pt_PT@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -71,7 +71,8 @@ copy "pt_PT"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "pt_PT"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/quz_PE b/localedata/locales/quz_PE
> index 6521fec..8e75526 100644
> --- a/localedata/locales/quz_PE
> +++ b/localedata/locales/quz_PE
> @@ -141,7 +141,7 @@ END LC_PAPER
>
>  LC_MEASUREMENT
>  % metric
> -measurement    1
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
> index b895328..610f071 100644
> --- a/localedata/locales/ro_RO
> +++ b/localedata/locales/ro_RO
> @@ -47,7 +47,7 @@ category  "ro_RO:2000";LC_PAPER
>  category  "ro_RO:2000";LC_NAME
>  category  "ro_RO:2000";LC_ADDRESS
>  category  "ro_RO:2000";LC_TELEPHONE
> -
> +category  "ro_RO:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -289,7 +289,8 @@ END LC_TELEPHONE
>
>  % Romania uses the metric system
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>
> diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
> index 0cb3a11..2e51a4d 100644
> --- a/localedata/locales/ru_RU
> +++ b/localedata/locales/ru_RU
> @@ -43,7 +43,7 @@ category  "ru_RU:2000";LC_PAPER
>  category  "ru_RU:2000";LC_NAME
>  category  "ru_RU:2000";LC_ADDRESS
>  category  "ru_RU:2000";LC_TELEPHONE
> -
> +category  "ru_RU:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -168,8 +168,8 @@ int_select     "<U0030><U007E><U0031><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA
> index 6764249..29c4522 100644
> --- a/localedata/locales/ru_UA
> +++ b/localedata/locales/ru_UA
> @@ -39,7 +39,7 @@ category  "ru_UA:2000";LC_PAPER
>  category  "ru_UA:2000";LC_NAME
>  category  "ru_UA:2000";LC_ADDRESS
>  category  "ru_UA:2000";LC_TELEPHONE
> -
> +category  "ru_UA:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -159,8 +159,8 @@ int_prefix     "<U0033><U0038><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/rw_RW b/localedata/locales/rw_RW
> index e4e6c87..1f50300 100644
> --- a/localedata/locales/rw_RW
> +++ b/localedata/locales/rw_RW
> @@ -151,5 +151,6 @@ int_prefix     "<U0032><U0035><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN
> index 41651ca..1ffa5f9 100644
> --- a/localedata/locales/sa_IN
> +++ b/localedata/locales/sa_IN
> @@ -28,7 +28,7 @@ category  "sa_IN:2000";LC_PAPER
>  category  "sa_IN:2000";LC_NAME
>  category  "sa_IN:2000";LC_ADDRESS
>  category  "sa_IN:2000";LC_TELEPHONE
> -
> +category  "sa_IN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -256,7 +256,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN
> index b334b88..455b0e6 100644
> --- a/localedata/locales/sat_IN
> +++ b/localedata/locales/sat_IN
> @@ -27,7 +27,7 @@ category  "sat_IN:2012";LC_PAPER
>  category  "sat_IN:2012";LC_NAME
>  category  "sat_IN:2012";LC_ADDRESS
>  category  "sat_IN:2012";LC_TELEPHONE
> -
> +category  "sat_IN:2012";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -192,5 +192,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sc_IT b/localedata/locales/sc_IT
> index 065ad61..c6ffc98 100644
> --- a/localedata/locales/sc_IT
> +++ b/localedata/locales/sc_IT
> @@ -35,7 +35,7 @@ category  "sc_IT:2000";LC_PAPER
>  category  "sc_IT:2000";LC_NAME
>  category  "sc_IT:2000";LC_ADDRESS
>  category  "sc_IT:2000";LC_TELEPHONE
> -
> +category  "sc_IT:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -124,7 +124,8 @@ copy  "it_IT"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy  "it_IT"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN
> index 866cc8d..e57edf5 100644
> --- a/localedata/locales/sd_IN
> +++ b/localedata/locales/sd_IN
> @@ -29,8 +29,7 @@ category  "sd_IN:2008";LC_PAPER
>  category  "sd_IN:2008";LC_NAME
>  category  "sd_IN:2008";LC_ADDRESS
>  category  "sd_IN:2008";LC_TELEPHONE
> -
> -
> +category  "sd_IN:2008";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -209,5 +208,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sd_IN@devanagari
> b/localedata/locales/sd_IN@devanagari
> index 66b1f9e..6e7549b 100644
> --- a/localedata/locales/sd_IN@devanagari
> +++ b/localedata/locales/sd_IN@devanagari
> @@ -28,7 +28,7 @@ category  "sd_IN@devanagari:2008";LC_PAPER
>  category  "sd_IN@devanagari:2008";LC_NAME
>  category  "sd_IN@devanagari:2008";LC_ADDRESS
>  category  "sd_IN@devanagari:2008";LC_TELEPHONE
> -
> +category  "sd_IN@devanagari:2008";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -209,5 +209,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO
> index 53ee33f..2944e74 100644
> --- a/localedata/locales/se_NO
> +++ b/localedata/locales/se_NO
> @@ -297,7 +297,8 @@ int_prefix     "<U0034><U0037>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/shs_CA b/localedata/locales/shs_CA
> index d90b28c..6b72fb1 100644
> --- a/localedata/locales/shs_CA
> +++ b/localedata/locales/shs_CA
> @@ -43,7 +43,7 @@ category  "shs_CA:2000";LC_PAPER
>  category  "shs_CA:2000";LC_NAME
>  category  "shs_CA:2000";LC_ADDRESS
>  category  "shs_CA:2000";LC_TELEPHONE
> -
> +category  "shs_CA:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -138,7 +138,8 @@ copy "en_CA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_CA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/si_LK b/localedata/locales/si_LK
> index cc75c49..efecce7 100644
> --- a/localedata/locales/si_LK
> +++ b/localedata/locales/si_LK
> @@ -29,7 +29,7 @@ category  "i18n:2002";LC_PAPER
>  category  "i18n:2002";LC_NAME
>  category  "i18n:2002";LC_ADDRESS
>  category  "i18n:2002";LC_TELEPHONE
> -
> +category  "i18n:2002";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -222,9 +222,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% 1 is ISO 1000 (metric)
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
> index 3de8390..86ba9e1 100644
> --- a/localedata/locales/sid_ET
> +++ b/localedata/locales/sid_ET
> @@ -68,12 +68,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopia Specifc and Shared Data:
> +%  Ethiopia Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
> index 8ba797a..dbfcfe9 100644
> --- a/localedata/locales/sk_SK
> +++ b/localedata/locales/sk_SK
> @@ -55,7 +55,7 @@ category  "sk_SK:2000";LC_PAPER
>  category  "sk_SK:2000";LC_NAME
>  category  "sk_SK:2000";LC_ADDRESS
>  category  "sk_SK:2000";LC_TELEPHONE
> -
> +category  "sk_SK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -206,8 +206,8 @@ int_prefix     "<U0034><U0032><U0031>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI
> index 353933e..a250d64 100644
> --- a/localedata/locales/sl_SI
> +++ b/localedata/locales/sl_SI
> @@ -44,7 +44,7 @@ category  "sl_SI:2000";LC_PAPER
>  category  "sl_SI:2000";LC_NAME
>  category  "sl_SI:2000";LC_ADDRESS
>  category  "sl_SI:2000";LC_TELEPHONE
> -
> +category  "sl_SI:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -2205,8 +2205,8 @@ int_prefix     "<U0033><U0038><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
> index f6d5cb2..00ddf69 100644
> --- a/localedata/locales/so_DJ
> +++ b/localedata/locales/so_DJ
> @@ -67,12 +67,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Djibouti Specifc and Shared Data:
> +%  Djibouti Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "aa_DJ"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
> index 00b61b4..79941e7 100644
> --- a/localedata/locales/so_ET
> +++ b/localedata/locales/so_ET
> @@ -52,7 +52,7 @@ END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopic Specifc Data:
> +%  Ethiopic Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
> @@ -67,12 +67,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopia Specifc and Shared Data:
> +%  Ethiopia Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
> index 49c108a..0a1e978 100644
> --- a/localedata/locales/so_KE
> +++ b/localedata/locales/so_KE
> @@ -66,28 +66,29 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Kenya Specifc and Shared Data:
> +%  Kenya Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "om_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> -copy "om_ET"
> +copy "om_KE"
>  END LC_MONETARY
>
>  LC_NUMERIC
> -copy "om_ET"
> +copy "om_KE"
>  END LC_NUMERIC
>
>  LC_PAPER
> -copy "om_ET"
> +copy "om_KE"
>  END LC_PAPER
>
>  LC_TELEPHONE
> -copy "om_ET"
> +copy "om_KE"
>  END LC_TELEPHONE
>
>
> diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
> index 7531639..4d6a24b 100644
> --- a/localedata/locales/so_SO
> +++ b/localedata/locales/so_SO
> @@ -71,16 +71,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Somalia Specifc and Shared Data:
> +%  Somalia Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -%
> -% This is the ISO_IEC TR14652 Locale definition for the
> LC_MEASUREMENT category.
> -%
> +% metric
>  measurement 1
> -%
>  END LC_MEASUREMENT
>
>
> diff --git a/localedata/locales/sq_AL b/localedata/locales/sq_AL
> index 09873c0..f82de83 100644
> --- a/localedata/locales/sq_AL
> +++ b/localedata/locales/sq_AL
> @@ -29,7 +29,7 @@ category  "sq_AL:2000";LC_PAPER
>  category  "sq_AL:2000";LC_NAME
>  category  "sq_AL:2000";LC_ADDRESS
>  category  "sq_AL:2000";LC_TELEPHONE
> -
> +category  "sq_AL:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -355,8 +355,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sq_MK b/localedata/locales/sq_MK
> index 7bac02e..9a273b3 100644
> --- a/localedata/locales/sq_MK
> +++ b/localedata/locales/sq_MK
> @@ -27,7 +27,7 @@ category  "sq_MK:2000";LC_PAPER
>  category  "sq_MK:2000";LC_NAME
>  category  "sq_MK:2000";LC_ADDRESS
>  category  "sq_MK:2000";LC_TELEPHONE
> -
> +category  "sq_MK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME
> index 231efb1..c0aa4a4 100644
> --- a/localedata/locales/sr_ME
> +++ b/localedata/locales/sr_ME
> @@ -161,5 +161,6 @@ copy "sr_RS"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "sr_RS"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
> index 3028e35..b2b8577 100644
> --- a/localedata/locales/sr_RS
> +++ b/localedata/locales/sr_RS
> @@ -356,5 +356,6 @@ int_select     "<U0039><U0039>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
> index 6bc402a..7b28302 100644
> --- a/localedata/locales/sr_RS@latin
> +++ b/localedata/locales/sr_RS@latin
> @@ -170,5 +170,6 @@ copy "sr_RS"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "sr_RS"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA
> index d33683c..b296451 100644
> --- a/localedata/locales/ss_ZA
> +++ b/localedata/locales/ss_ZA
> @@ -189,7 +189,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
> index c29bb7d..dcf3e72 100644
> --- a/localedata/locales/st_ZA
> +++ b/localedata/locales/st_ZA
> @@ -186,7 +186,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI
> index 1fcb63b..258178f 100644
> --- a/localedata/locales/sv_FI
> +++ b/localedata/locales/sv_FI
> @@ -122,7 +122,8 @@ copy "fi_FI"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/sv_FI@euro b/localedata/locales/sv_FI@euro
> index 7e174a7..dcd9b75 100644
> --- a/localedata/locales/sv_FI@euro
> +++ b/localedata/locales/sv_FI@euro
> @@ -72,7 +72,8 @@ copy "sv_FI"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "sv_FI"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
> index d0e5986..ead5d36 100644
> --- a/localedata/locales/sv_SE
> +++ b/localedata/locales/sv_SE
> @@ -50,7 +50,7 @@ category  "sv_SE:2000";LC_PAPER
>  category  "sv_SE:2000";LC_NAME
>  category  "sv_SE:2000";LC_ADDRESS
>  category  "sv_SE:2000";LC_TELEPHONE
> -
> +category  "sv_SE:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -200,7 +200,8 @@ int_prefix     "<U0034><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/sw_KE b/localedata/locales/sw_KE
> index de91d37..9412648 100644
> --- a/localedata/locales/sw_KE
> +++ b/localedata/locales/sw_KE
> @@ -118,7 +118,8 @@ copy "om_KE"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "om_KE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/sw_TZ b/localedata/locales/sw_TZ
> index 1ae73fb..a2faf07 100644
> --- a/localedata/locales/sw_TZ
> +++ b/localedata/locales/sw_TZ
> @@ -77,7 +77,8 @@ copy "sw_KE"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -measurement  1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MESSAGES
> diff --git a/localedata/locales/szl_PL b/localedata/locales/szl_PL
> index 3323430..e9cddd2 100644
> --- a/localedata/locales/szl_PL
> +++ b/localedata/locales/szl_PL
> @@ -199,7 +199,8 @@ copy "pl_PL"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "pl_PL"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
> index 75f6324..70c624e 100644
> --- a/localedata/locales/ta_IN
> +++ b/localedata/locales/ta_IN
> @@ -221,5 +221,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK
> index 7051e3b..e1af5f9 100644
> --- a/localedata/locales/ta_LK
> +++ b/localedata/locales/ta_LK
> @@ -37,7 +37,7 @@ category  "ta_LK:2000";LC_PAPER
>  category  "ta_LK:2000";LC_NAME
>  category  "ta_LK:2000";LC_ADDRESS
>  category  "ta_LK:2000";LC_TELEPHONE
> -
> +category  "ta_LK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -73,7 +73,8 @@ copy "si_LK"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "si_LK"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN
> index f2ab1b6..d42088f 100644
> --- a/localedata/locales/te_IN
> +++ b/localedata/locales/te_IN
> @@ -30,7 +30,7 @@ category  "i18n:2003";LC_PAPER
>  category  "i18n:2003";LC_NAME
>  category  "i18n:2003";LC_ADDRESS
>  category  "i18n:2003";LC_TELEPHONE
> -
> +category  "i18n:2003";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -239,5 +239,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ
> index 3350881..c783625 100644
> --- a/localedata/locales/tg_TJ
> +++ b/localedata/locales/tg_TJ
> @@ -206,6 +206,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
> index 05575dc..88c3637 100644
> --- a/localedata/locales/th_TH
> +++ b/localedata/locales/th_TH
> @@ -68,7 +68,7 @@ category  "th_TH:2000";LC_PAPER
>  category  "th_TH:2000";LC_NAME
>  category  "th_TH:2000";LC_ADDRESS
>  category  "th_TH:2000";LC_TELEPHONE
> -
> +category  "th_TH:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -943,8 +943,8 @@ int_prefix     "<U0036><U0036>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -% FIXME
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
> index 103244f..570130b 100644
> --- a/localedata/locales/ti_ER
> +++ b/localedata/locales/ti_ER
> @@ -50,7 +50,7 @@ END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopic Specifc Data:
> +%  Ethiopic Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
> @@ -65,16 +65,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Eritrea Specifc Data:
> +%  Eritrea Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -%
> -% This is the ISO_IEC TR14652 Locale definition for the
> LC_MEASUREMENT category.
> -%
> +% metric
>  measurement 1
> -%
>  END LC_MEASUREMENT
>
>
> diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
> index 1f2353f..cdb6b0a 100644
> --- a/localedata/locales/ti_ET
> +++ b/localedata/locales/ti_ET
> @@ -50,7 +50,7 @@ END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopic Specifc Data:
> +%  Tigrigna Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
> @@ -868,16 +868,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopia Specifc and Shared Data:
> +%  Ethiopia Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -%
> -% This is the ISO_IEC TR14652 Locale definition for the
> LC_MEASUREMENT category.
> -%
> +% metric
>  measurement 1
> -%
>  END LC_MEASUREMENT
>
>
> diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
> index 417ab72..cf4b665 100644
> --- a/localedata/locales/tig_ER
> +++ b/localedata/locales/tig_ER
> @@ -48,7 +48,7 @@ END LC_IDENTIFICATION
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopic Specifc Data:
> +%  Tigre Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
> @@ -63,12 +63,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Eritrea Specifc Data:
> +%  Eritrea Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ER"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM
> index d764507..3d2decd 100644
> --- a/localedata/locales/tk_TM
> +++ b/localedata/locales/tk_TM
> @@ -389,6 +389,7 @@ n_sign_posn               1
>  END LC_MONETARY
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH
> index ae30aee..a01ef8b 100644
> --- a/localedata/locales/tl_PH
> +++ b/localedata/locales/tl_PH
> @@ -149,6 +149,7 @@ width    216
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA
> index 1a3fd82..f2a85ed 100644
> --- a/localedata/locales/tn_ZA
> +++ b/localedata/locales/tn_ZA
> @@ -191,7 +191,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
> index 1c2c3f3..e2e6936 100644
> --- a/localedata/locales/tr_CY
> +++ b/localedata/locales/tr_CY
> @@ -77,7 +77,8 @@ copy "tr_TR"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "tr_TR"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
> index 1893633..f54be2c 100644
> --- a/localedata/locales/tr_TR
> +++ b/localedata/locales/tr_TR
> @@ -3558,7 +3558,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ts_ZA b/localedata/locales/ts_ZA
> index c7b5643..b8225fc 100644
> --- a/localedata/locales/ts_ZA
> +++ b/localedata/locales/ts_ZA
> @@ -186,7 +186,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU
> index 520c6eb..804f7f0 100644
> --- a/localedata/locales/tt_RU
> +++ b/localedata/locales/tt_RU
> @@ -304,7 +304,8 @@ copy "ru_RU"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "ru_RU"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif
> index 4aac636..8e455d6 100644
> --- a/localedata/locales/tt_RU@iqtelif
> +++ b/localedata/locales/tt_RU@iqtelif
> @@ -161,6 +161,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
> index 462f42b..e25d528 100644
> --- a/localedata/locales/ug_CN
> +++ b/localedata/locales/ug_CN
> @@ -302,8 +302,8 @@ height 297
>  width  210
>  END LC_PAPER
>
> -% Metric System (ISO 1000)
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
> index b1df630..d9194b8 100644
> --- a/localedata/locales/uk_UA
> +++ b/localedata/locales/uk_UA
> @@ -1114,10 +1114,8 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% 1 - ISO 1000
> -% 2 - U.S.A.
> -% 3 - other
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>
> diff --git a/localedata/locales/unm_US b/localedata/locales/unm_US
> index a04188e..482a7da 100644
> --- a/localedata/locales/unm_US
> +++ b/localedata/locales/unm_US
> @@ -164,5 +164,6 @@ copy "en_US"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_US"
> +% US customary units
> +measurement    2
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN
> index 85e19bf..8813b51 100644
> --- a/localedata/locales/ur_IN
> +++ b/localedata/locales/ur_IN
> @@ -29,7 +29,7 @@ category  "ur_IN:2009";LC_PAPER
>  category  "ur_IN:2009";LC_NAME
>  category  "ur_IN:2009";LC_ADDRESS
>  category  "ur_IN:2009";LC_TELEPHONE
> -
> +category  "ur_IN:2009";LC_MEASUREMENT
>
>  END LC_IDENTIFICATION
>
> @@ -193,5 +193,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -copy "hi_IN"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/ur_PK b/localedata/locales/ur_PK
> index ec1ee3b..2bc5225 100644
> --- a/localedata/locales/ur_PK
> +++ b/localedata/locales/ur_PK
> @@ -38,7 +38,7 @@ category  "ur_PK:2000";LC_PAPER
>  category  "ur_PK:2000";LC_NAME
>  category  "ur_PK:2000";LC_ADDRESS
>  category  "ur_PK:2000";LC_TELEPHONE
> -
> +category  "ur_PK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -176,6 +176,7 @@ width       210
>  END LC_PAPER
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
>
> diff --git a/localedata/locales/uz_UZ b/localedata/locales/uz_UZ
> index 5a272a1..6e5948b 100644
> --- a/localedata/locales/uz_UZ
> +++ b/localedata/locales/uz_UZ
> @@ -283,7 +283,8 @@ int_prefix     "<U0032><U0037>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/uz_UZ@cyrillic
> b/localedata/locales/uz_UZ@cyrillic
> index c7cf51f..679b64e 100644
> --- a/localedata/locales/uz_UZ@cyrillic
> +++ b/localedata/locales/uz_UZ@cyrillic
> @@ -284,7 +284,8 @@ int_prefix     "<U0032><U0037>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
> index 43a9aed..9694401 100644
> --- a/localedata/locales/ve_ZA
> +++ b/localedata/locales/ve_ZA
> @@ -188,7 +188,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN
> index c1b9e86..0c045c6 100644
> --- a/localedata/locales/vi_VN
> +++ b/localedata/locales/vi_VN
> @@ -358,5 +358,6 @@ int_select  "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE
> index 8ca9cd8..a2fb3be 100644
> --- a/localedata/locales/wa_BE
> +++ b/localedata/locales/wa_BE
> @@ -95,9 +95,9 @@ LC_PAPER
>  copy "fr_BE"
>  END LC_PAPER
>
> -% COMINTAIRE: doet esse li minme ki po fr_BE.
>  LC_MEASUREMENT
> -copy "fr_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  % COMINTAIRE: doet esse li minme ki po fr_BE.
> diff --git a/localedata/locales/wa_BE@euro b/localedata/locales/wa_BE@euro
> index 78c6b6a..09ad80c 100644
> --- a/localedata/locales/wa_BE@euro
> +++ b/localedata/locales/wa_BE@euro
> @@ -35,7 +35,7 @@ category  "wa_BE@euro:2000";LC_PAPER
>  category  "wa_BE@euro:2000";LC_NAME
>  category  "wa_BE@euro:2000";LC_ADDRESS
>  category  "wa_BE@euro:2000";LC_TELEPHONE
> -
> +category  "wa_BE@euro:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -71,7 +71,8 @@ copy "wa_BE"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "wa_BE"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/wae_CH b/localedata/locales/wae_CH
> index bbda7b7..bdfabc3 100644
> --- a/localedata/locales/wae_CH
> +++ b/localedata/locales/wae_CH
> @@ -172,7 +172,8 @@ copy "de_CH"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "de_CH"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
> index 8408a62..5764267 100644
> --- a/localedata/locales/wal_ET
> +++ b/localedata/locales/wal_ET
> @@ -65,12 +65,13 @@ END LC_CTYPE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Ethiopia Specifc and Shared Data:
> +%  Ethiopia Specific and Shared Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>  LC_MEASUREMENT
> -copy "ti_ET"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_MONETARY
> @@ -92,7 +93,7 @@ END LC_TELEPHONE
>
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>  %
> -%  Sidama Specific Data:
> +%  Walaita Specific Data:
>  %
>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
> diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN
> index 3841e0f..44dcabd 100644
> --- a/localedata/locales/wo_SN
> +++ b/localedata/locales/wo_SN
> @@ -39,7 +39,7 @@ category  "mg_MG:2000";LC_PAPER
>  category  "mg_MG:2000";LC_NAME
>  category  "mg_MG:2000";LC_ADDRESS
>  category  "mg_MG:2000";LC_TELEPHONE
> -
> +category  "mg_MG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -157,7 +157,8 @@ int_select     "<U0030><U0030>"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA
> index 3277ca1..2a24540 100644
> --- a/localedata/locales/xh_ZA
> +++ b/localedata/locales/xh_ZA
> @@ -186,7 +186,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/yi_US b/localedata/locales/yi_US
> index 46136fb..97ed218 100644
> --- a/localedata/locales/yi_US
> +++ b/localedata/locales/yi_US
> @@ -148,7 +148,8 @@ copy "en_US"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "en_US"
> +% US customary units
> +measurement    2
>  END LC_MEASUREMENT
>
>  LC_NUMERIC
> diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
> index f0206ae..c88ca6e 100644
> --- a/localedata/locales/yo_NG
> +++ b/localedata/locales/yo_NG
> @@ -38,7 +38,7 @@ category  "yo_NG:2000";LC_PAPER
>  category  "yo_NG:2000";LC_NAME
>  category  "yo_NG:2000";LC_ADDRESS
>  category  "yo_NG:2000";LC_TELEPHONE
> -
> +category  "yo_NG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_COLLATE
> @@ -430,7 +430,8 @@ copy "en_NG"
>  END LC_PAPER
>
>  LC_MEASUREMENT
> -copy "en_NG"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK
> index fdd1528..96e9901 100644
> --- a/localedata/locales/yue_HK
> +++ b/localedata/locales/yue_HK
> @@ -29,7 +29,7 @@ category  "yue_HK:2010";LC_PAPER
>  category  "yue_HK:2010";LC_NAME
>  category  "yue_HK:2010";LC_ADDRESS
>  category  "yue_HK:2010";LC_TELEPHONE
> -
> +category  "yue_HK:2010";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -164,7 +164,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
> index 1ed9d25..ff21c85 100644
> --- a/localedata/locales/zh_CN
> +++ b/localedata/locales/zh_CN
> @@ -39,7 +39,7 @@ category  "zh_CN:2000";LC_PAPER
>  category  "zh_CN:2000";LC_NAME
>  category  "zh_CN:2000";LC_ADDRESS
>  category  "zh_CN:2000";LC_TELEPHONE
> -
> +category  "zh_CN:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>
> @@ -188,5 +188,6 @@ lang_lib    "<U0063><U0068><U0069>"
>  END LC_ADDRESS
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
> index 6c7d793..77a6f8c 100644
> --- a/localedata/locales/zh_HK
> +++ b/localedata/locales/zh_HK
> @@ -28,7 +28,7 @@ category  "zh_HK:2000";LC_PAPER
>  category  "zh_HK:2000";LC_NAME
>  category  "zh_HK:2000";LC_ADDRESS
>  category  "zh_HK:2000";LC_TELEPHONE
> -
> +category  "zh_HK:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -201,8 +201,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the
> -%
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/zh_SG b/localedata/locales/zh_SG
> index cf7a2f6..da9d64e 100644
> --- a/localedata/locales/zh_SG
> +++ b/localedata/locales/zh_SG
> @@ -28,7 +28,7 @@ category  "zh_SG:2000";LC_PAPER
>  category  "zh_SG:2000";LC_NAME
>  category  "zh_SG:2000";LC_ADDRESS
>  category  "zh_SG:2000";LC_TELEPHONE
> -
> +category  "zh_SG:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -211,8 +211,6 @@ END LC_TELEPHONE
>
>
>  LC_MEASUREMENT
> -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT
> -% category generated by IBM Basic CountryPack Transformer.
> +% metric
>  measurement 1
> -
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
> index eac0228..e3eeb4d 100644
> --- a/localedata/locales/zh_TW
> +++ b/localedata/locales/zh_TW
> @@ -40,6 +40,7 @@ category  "zh_TW:2000";LC_PAPER
>  category  "zh_TW:2000";LC_NAME
>  category  "zh_TW:2000";LC_ADDRESS
>  category  "zh_TW:2000";LC_TELEPHONE
> +category  "zh_TW:2000";LC_MEASUREMENT
>  END LC_IDENTIFICATION
>
>  LC_CTYPE
> @@ -206,5 +207,6 @@ lang_lib    "<U0063><U0068><U0069>"
>  END LC_ADDRESS
>
>  LC_MEASUREMENT
> -measurement    1
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
> diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA
> index b74e6e8..2c78e51 100644
> --- a/localedata/locales/zu_ZA
> +++ b/localedata/locales/zu_ZA
> @@ -192,7 +192,8 @@ copy "en_ZA"
>  END LC_TELEPHONE
>
>  LC_MEASUREMENT
> -copy "en_ZA"
> +% metric
> +measurement 1
>  END LC_MEASUREMENT
>
>  LC_NAME
> --
> 1.7.11.7


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