localedata: LC_MEASUREMENT: use copy directives everywhere

There are only two measurement systems that locales use: US and metric.
For the former, move to copying the en_US locale, while for the latter,
move to copying the i18n locale.  This lets us clean up all the stray
comments like FIXME.

There should be no functional differences here.

localedata/ChangeLog

@@ -1,3 +1,311 @@
+2016-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* locales/aa_DJ (LC_MEASUREMENT): Replace content with a copy directive.
+	* 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/ce_RU: 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/ht_HT: Likewise.
+	* locales/hu_HU: Likewise.
+	* locales/hy_AM: Likewise.
+	* locales/i18n: 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/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_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/the_NP: 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.
+
 2016-04-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* locales/aa_DJ (language, territory): Update.

localedata/locales/aa_DJ

@@ -82,8 +82,7 @@ END LC_CTYPE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 

localedata/locales/aa_ER

@@ -78,8 +78,7 @@ END LC_CTYPE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-% metric
+copy "ti_ER"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

localedata/locales/aa_ER@saaho

@@ -78,8 +78,7 @@ END LC_CTYPE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-% metric
+copy "aa_ER"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

localedata/locales/aa_ET

@@ -78,8 +78,7 @@ END LC_CTYPE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-% metric
+copy "ti_ET"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

localedata/locales/af_ZA

@@ -177,8 +177,7 @@ copy "en_ZA"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "en_ZA"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ak_GH

@@ -159,8 +159,7 @@ width    210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

localedata/locales/am_ET

@@ -1409,8 +1409,7 @@ END LC_CTYPE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-% metric
+copy "ti_ET"
-measurement 1
 END LC_MEASUREMENT
 
 

localedata/locales/an_ES

@@ -121,8 +121,7 @@ copy "es_ES"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "es_ES"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/anp_IN

@@ -199,6 +199,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_AE

@@ -208,6 +208,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_BH

@@ -213,6 +213,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_DZ

@@ -212,6 +212,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_EG

@@ -219,6 +219,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_IN

@@ -188,6 +188,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_IQ

@@ -211,6 +211,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_JO

@@ -229,6 +229,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_KW

@@ -211,6 +211,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_LB

@@ -228,6 +228,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_LY

@@ -211,6 +211,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_MA

@@ -211,6 +211,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_OM

@@ -209,6 +209,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_QA

@@ -211,6 +211,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_SA

@@ -371,8 +371,7 @@ int_prefix     "<U0039><U0036><U0036>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ar_SD

@@ -219,6 +219,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_SS

@@ -217,6 +217,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_SY

@@ -228,6 +228,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_TN

@@ -211,6 +211,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ar_YE

@@ -209,6 +209,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/as_IN

@@ -187,6 +187,5 @@ END LC_TELEPHONE
 
 %%%%%%%%%%%%%
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/ast_ES

@@ -127,8 +127,7 @@ copy "es_ES"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "es_ES"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ayc_PE

@@ -158,8 +158,7 @@ copy "es_PE"
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "es_PE"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

localedata/locales/az_AZ

@@ -288,8 +288,7 @@ width       210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_ADDRESS

localedata/locales/be_BY

@@ -163,8 +163,7 @@ int_select     "<U0038><U007E><U0031><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/be_BY@latin

@@ -162,6 +162,5 @@ copy "be_BY"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "be_BY"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/bem_ZM

@@ -146,8 +146,7 @@ width  210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

localedata/locales/ber_DZ

@@ -264,8 +264,7 @@ width       210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ber_MA

@@ -184,8 +184,7 @@ width       210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/bg_BG

@@ -283,6 +283,5 @@ int_select  "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/bho_IN

@@ -176,6 +176,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/bn_BD

@@ -152,8 +152,7 @@ nostr       "<U09A8><U09BE>"
 END LC_MESSAGES
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 % Default paper: A4

localedata/locales/bn_IN

@@ -207,6 +207,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/bo_CN

@@ -146,8 +146,7 @@ copy "zh_CN"
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "zh_CN"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/bo_IN

@@ -72,8 +72,7 @@ copy "hi_IN"
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/br_FR

@@ -155,8 +155,7 @@ copy "fr_FR"
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "fr_FR"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/br_FR@euro

@@ -76,8 +76,7 @@ copy "br_FR"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "br_FR"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/brx_IN

@@ -195,6 +195,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/bs_BA

@@ -221,8 +221,7 @@ width       210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/byn_ER

@@ -74,8 +74,7 @@ END LC_CTYPE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-% metric
+copy "ti_ER"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

localedata/locales/ca_AD

@@ -80,8 +80,7 @@ int_prefix     "<U0033><U0037><U0036>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "ca_ES"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ca_ES

@@ -157,8 +157,7 @@ int_prefix     "<U0033><U0034>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ca_ES@euro

@@ -78,8 +78,7 @@ copy "ca_ES"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "ca_ES"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ca_FR

@@ -78,8 +78,7 @@ copy "fr_FR"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "fr_FR"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ca_IT

@@ -78,8 +78,7 @@ copy "it_IT"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "it_IT"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/ce_RU

@@ -132,7 +132,7 @@ width  210
 END LC_PAPER
 
 LC_MEASUREMENT
-measurement 1
+copy "i18n"
 END LC_MEASUREMENT
 
 LC_MESSAGES

localedata/locales/cmn_TW

@@ -163,8 +163,7 @@ width  210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

localedata/locales/crh_UA

@@ -215,8 +215,7 @@ width       210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_ADDRESS

localedata/locales/cs_CZ

@@ -2474,8 +2474,7 @@ int_prefix     "<U0034><U0032><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/csb_PL

@@ -200,8 +200,7 @@ copy "pl_PL"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "pl_PL"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/cv_RU

@@ -228,8 +228,7 @@ copy "ru_RU"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "ru_RU"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/cy_GB

@@ -64,8 +64,7 @@ copy "en_GB"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "en_GB"
-measurement 1
 END LC_MEASUREMENT
 
 LC_CTYPE

localedata/locales/da_DK

@@ -250,8 +250,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/de_AT

@@ -140,8 +140,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/de_AT@euro

@@ -83,8 +83,7 @@ copy "de_AT"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "de_AT"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/de_BE

@@ -133,8 +133,7 @@ copy "fr_BE"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "fr_BE"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/de_BE@euro

@@ -76,8 +76,7 @@ copy "de_BE"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "de_BE"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/de_CH

@@ -141,8 +141,7 @@ int_prefix     "<U0034><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/de_DE

@@ -221,6 +221,5 @@ int_prefix     "<U0034><U0039>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/de_DE@euro

@@ -83,6 +83,5 @@ copy "de_DE"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "de_DE"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/de_LU

@@ -138,8 +138,7 @@ int_prefix     "<U0033><U0035><U0032>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/de_LU@euro

@@ -76,8 +76,7 @@ copy "de_LU"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "de_LU"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/doi_IN

@@ -188,6 +188,5 @@ copy "hi_IN"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/dv_MV

@@ -168,8 +168,7 @@ int_prefix     "<U0039><U0036><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/dz_BT

@@ -639,8 +639,7 @@ width    210
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/el_CY

@@ -90,8 +90,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "el_GR"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/el_GR

@@ -163,8 +163,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/el_GR@euro

@@ -79,6 +79,5 @@ copy "el_GR"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "el_GR"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/en_AG

@@ -111,6 +111,5 @@ int_select     "<U0030><U0031><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "en_GB"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/en_AU

@@ -140,8 +140,7 @@ int_select     "<U0030><U0030><U0031><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_BW

@@ -100,8 +100,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_CA

@@ -162,8 +162,7 @@ int_select     "<U0030><U0031><U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_DK

@@ -142,8 +142,7 @@ copy "da_DK"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "da_DK"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_GB

@@ -149,8 +149,7 @@ int_prefix     "<U0034><U0034>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_HK

@@ -225,6 +225,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/en_IE

@@ -138,8 +138,7 @@ int_prefix     "<U0033><U0035><U0033>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_IE@euro

@@ -76,8 +76,7 @@ copy "en_IE"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "en_IE"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_IN

@@ -217,6 +217,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "hi_IN"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/en_NG

@@ -201,8 +201,7 @@ int_prefix     "<U0032><U0033><U0034>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "en_DK"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_NZ

@@ -139,8 +139,7 @@ int_prefix     "<U0036><U0034>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_PH

@@ -222,6 +222,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "tl_PH"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/en_SG

@@ -224,6 +224,5 @@ END LC_TELEPHONE
 
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT

localedata/locales/en_US

@@ -187,6 +187,6 @@ int_prefix     "<U0031>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% US customary units
+% US customary units.
-measurement    2
+measurement 2
 END LC_MEASUREMENT

localedata/locales/en_ZA

@@ -237,8 +237,7 @@ int_prefix     "<U0032><U0037>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/en_ZM

@@ -66,8 +66,7 @@ copy "bem_ZM"
 END LC_PAPER
 
 LC_MEASUREMENT
-% metric
+copy "bem_ZM"
-measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

localedata/locales/en_ZW

@@ -99,8 +99,7 @@ int_prefix     "<U0032><U0036><U0033>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/es_AR

@@ -139,8 +139,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/es_BO

@@ -137,8 +137,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/es_CL

@@ -135,8 +135,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/es_CO

@@ -138,8 +138,7 @@ int_select     "<U0030><U0030><U0039>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

localedata/locales/es_CR

@@ -137,8 +137,7 @@ int_select     "<U0030><U0030>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% metric
+copy "i18n"
-measurement 1
 END LC_MEASUREMENT
 
 LC_NAME