[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r24534 - in /fsf/trunk/libc: ./ locale/ localedata/ localedata/locales/



Author: eglibc
Date: Fri Nov 15 00:02:09 2013
New Revision: 24534

Log:
Import glibc-mainline for 2013-11-15

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/locale/C-address.c
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/locales/aa_DJ
    fsf/trunk/libc/localedata/locales/aa_ER
    fsf/trunk/libc/localedata/locales/aa_ER@saaho
    fsf/trunk/libc/localedata/locales/aa_ET
    fsf/trunk/libc/localedata/locales/af_ZA
    fsf/trunk/libc/localedata/locales/ak_GH
    fsf/trunk/libc/localedata/locales/am_ET
    fsf/trunk/libc/localedata/locales/an_ES
    fsf/trunk/libc/localedata/locales/anp_IN
    fsf/trunk/libc/localedata/locales/ar_AE
    fsf/trunk/libc/localedata/locales/ar_BH
    fsf/trunk/libc/localedata/locales/ar_DZ
    fsf/trunk/libc/localedata/locales/ar_EG
    fsf/trunk/libc/localedata/locales/ar_IN
    fsf/trunk/libc/localedata/locales/ar_IQ
    fsf/trunk/libc/localedata/locales/ar_JO
    fsf/trunk/libc/localedata/locales/ar_KW
    fsf/trunk/libc/localedata/locales/ar_LB
    fsf/trunk/libc/localedata/locales/ar_LY
    fsf/trunk/libc/localedata/locales/ar_MA
    fsf/trunk/libc/localedata/locales/ar_OM
    fsf/trunk/libc/localedata/locales/ar_QA
    fsf/trunk/libc/localedata/locales/ar_SA
    fsf/trunk/libc/localedata/locales/ar_SD
    fsf/trunk/libc/localedata/locales/ar_SS
    fsf/trunk/libc/localedata/locales/ar_SY
    fsf/trunk/libc/localedata/locales/ar_TN
    fsf/trunk/libc/localedata/locales/ar_YE
    fsf/trunk/libc/localedata/locales/as_IN
    fsf/trunk/libc/localedata/locales/ast_ES
    fsf/trunk/libc/localedata/locales/ayc_PE
    fsf/trunk/libc/localedata/locales/az_AZ
    fsf/trunk/libc/localedata/locales/be_BY
    fsf/trunk/libc/localedata/locales/be_BY@latin
    fsf/trunk/libc/localedata/locales/bem_ZM
    fsf/trunk/libc/localedata/locales/ber_DZ
    fsf/trunk/libc/localedata/locales/ber_MA
    fsf/trunk/libc/localedata/locales/bg_BG
    fsf/trunk/libc/localedata/locales/bho_IN
    fsf/trunk/libc/localedata/locales/bn_BD
    fsf/trunk/libc/localedata/locales/bn_IN
    fsf/trunk/libc/localedata/locales/bo_CN
    fsf/trunk/libc/localedata/locales/bo_IN
    fsf/trunk/libc/localedata/locales/br_FR
    fsf/trunk/libc/localedata/locales/br_FR@euro
    fsf/trunk/libc/localedata/locales/brx_IN
    fsf/trunk/libc/localedata/locales/bs_BA
    fsf/trunk/libc/localedata/locales/byn_ER
    fsf/trunk/libc/localedata/locales/ca_AD
    fsf/trunk/libc/localedata/locales/ca_ES
    fsf/trunk/libc/localedata/locales/ca_ES@euro
    fsf/trunk/libc/localedata/locales/ca_FR
    fsf/trunk/libc/localedata/locales/ca_IT
    fsf/trunk/libc/localedata/locales/cmn_TW
    fsf/trunk/libc/localedata/locales/crh_UA
    fsf/trunk/libc/localedata/locales/cs_CZ
    fsf/trunk/libc/localedata/locales/csb_PL
    fsf/trunk/libc/localedata/locales/cv_RU
    fsf/trunk/libc/localedata/locales/cy_GB
    fsf/trunk/libc/localedata/locales/da_DK
    fsf/trunk/libc/localedata/locales/de_AT
    fsf/trunk/libc/localedata/locales/de_AT@euro
    fsf/trunk/libc/localedata/locales/de_BE
    fsf/trunk/libc/localedata/locales/de_BE@euro
    fsf/trunk/libc/localedata/locales/de_CH
    fsf/trunk/libc/localedata/locales/de_DE
    fsf/trunk/libc/localedata/locales/de_DE@euro
    fsf/trunk/libc/localedata/locales/de_LU
    fsf/trunk/libc/localedata/locales/de_LU@euro
    fsf/trunk/libc/localedata/locales/doi_IN
    fsf/trunk/libc/localedata/locales/dv_MV
    fsf/trunk/libc/localedata/locales/dz_BT
    fsf/trunk/libc/localedata/locales/el_CY
    fsf/trunk/libc/localedata/locales/el_GR
    fsf/trunk/libc/localedata/locales/el_GR@euro
    fsf/trunk/libc/localedata/locales/en_AG
    fsf/trunk/libc/localedata/locales/en_AU
    fsf/trunk/libc/localedata/locales/en_BW
    fsf/trunk/libc/localedata/locales/en_CA
    fsf/trunk/libc/localedata/locales/en_DK
    fsf/trunk/libc/localedata/locales/en_GB
    fsf/trunk/libc/localedata/locales/en_HK
    fsf/trunk/libc/localedata/locales/en_IE
    fsf/trunk/libc/localedata/locales/en_IE@euro
    fsf/trunk/libc/localedata/locales/en_IN
    fsf/trunk/libc/localedata/locales/en_NG
    fsf/trunk/libc/localedata/locales/en_NZ
    fsf/trunk/libc/localedata/locales/en_PH
    fsf/trunk/libc/localedata/locales/en_SG
    fsf/trunk/libc/localedata/locales/en_US
    fsf/trunk/libc/localedata/locales/en_ZA
    fsf/trunk/libc/localedata/locales/en_ZM
    fsf/trunk/libc/localedata/locales/en_ZW
    fsf/trunk/libc/localedata/locales/es_AR
    fsf/trunk/libc/localedata/locales/es_BO
    fsf/trunk/libc/localedata/locales/es_CL
    fsf/trunk/libc/localedata/locales/es_CO
    fsf/trunk/libc/localedata/locales/es_CR
    fsf/trunk/libc/localedata/locales/es_CU
    fsf/trunk/libc/localedata/locales/es_DO
    fsf/trunk/libc/localedata/locales/es_EC
    fsf/trunk/libc/localedata/locales/es_ES
    fsf/trunk/libc/localedata/locales/es_ES@euro
    fsf/trunk/libc/localedata/locales/es_GT
    fsf/trunk/libc/localedata/locales/es_HN
    fsf/trunk/libc/localedata/locales/es_MX
    fsf/trunk/libc/localedata/locales/es_NI
    fsf/trunk/libc/localedata/locales/es_PA
    fsf/trunk/libc/localedata/locales/es_PE
    fsf/trunk/libc/localedata/locales/es_PR
    fsf/trunk/libc/localedata/locales/es_PY
    fsf/trunk/libc/localedata/locales/es_SV
    fsf/trunk/libc/localedata/locales/es_US
    fsf/trunk/libc/localedata/locales/es_UY
    fsf/trunk/libc/localedata/locales/es_VE
    fsf/trunk/libc/localedata/locales/et_EE
    fsf/trunk/libc/localedata/locales/eu_ES
    fsf/trunk/libc/localedata/locales/eu_ES@euro
    fsf/trunk/libc/localedata/locales/fa_IR
    fsf/trunk/libc/localedata/locales/ff_SN
    fsf/trunk/libc/localedata/locales/fi_FI
    fsf/trunk/libc/localedata/locales/fi_FI@euro
    fsf/trunk/libc/localedata/locales/fil_PH
    fsf/trunk/libc/localedata/locales/fo_FO
    fsf/trunk/libc/localedata/locales/fr_BE
    fsf/trunk/libc/localedata/locales/fr_BE@euro
    fsf/trunk/libc/localedata/locales/fr_CA
    fsf/trunk/libc/localedata/locales/fr_CH
    fsf/trunk/libc/localedata/locales/fr_FR
    fsf/trunk/libc/localedata/locales/fr_FR@euro
    fsf/trunk/libc/localedata/locales/fr_LU
    fsf/trunk/libc/localedata/locales/fr_LU@euro
    fsf/trunk/libc/localedata/locales/fur_IT
    fsf/trunk/libc/localedata/locales/fy_DE
    fsf/trunk/libc/localedata/locales/fy_NL
    fsf/trunk/libc/localedata/locales/ga_IE
    fsf/trunk/libc/localedata/locales/ga_IE@euro
    fsf/trunk/libc/localedata/locales/gd_GB
    fsf/trunk/libc/localedata/locales/gez_ER
    fsf/trunk/libc/localedata/locales/gez_ER@abegede
    fsf/trunk/libc/localedata/locales/gez_ET
    fsf/trunk/libc/localedata/locales/gez_ET@abegede
    fsf/trunk/libc/localedata/locales/gl_ES
    fsf/trunk/libc/localedata/locales/gl_ES@euro
    fsf/trunk/libc/localedata/locales/gu_IN
    fsf/trunk/libc/localedata/locales/gv_GB
    fsf/trunk/libc/localedata/locales/ha_NG
    fsf/trunk/libc/localedata/locales/hak_TW
    fsf/trunk/libc/localedata/locales/he_IL
    fsf/trunk/libc/localedata/locales/hi_IN
    fsf/trunk/libc/localedata/locales/hne_IN
    fsf/trunk/libc/localedata/locales/hr_HR
    fsf/trunk/libc/localedata/locales/hsb_DE
    fsf/trunk/libc/localedata/locales/hu_HU
    fsf/trunk/libc/localedata/locales/hy_AM
    fsf/trunk/libc/localedata/locales/ia_FR
    fsf/trunk/libc/localedata/locales/id_ID
    fsf/trunk/libc/localedata/locales/ig_NG
    fsf/trunk/libc/localedata/locales/ik_CA
    fsf/trunk/libc/localedata/locales/is_IS
    fsf/trunk/libc/localedata/locales/it_CH
    fsf/trunk/libc/localedata/locales/it_IT
    fsf/trunk/libc/localedata/locales/it_IT@euro
    fsf/trunk/libc/localedata/locales/iu_CA
    fsf/trunk/libc/localedata/locales/ja_JP
    fsf/trunk/libc/localedata/locales/ka_GE
    fsf/trunk/libc/localedata/locales/kk_KZ
    fsf/trunk/libc/localedata/locales/kl_GL
    fsf/trunk/libc/localedata/locales/km_KH
    fsf/trunk/libc/localedata/locales/kn_IN
    fsf/trunk/libc/localedata/locales/ko_KR
    fsf/trunk/libc/localedata/locales/kok_IN
    fsf/trunk/libc/localedata/locales/ks_IN
    fsf/trunk/libc/localedata/locales/ks_IN@devanagari
    fsf/trunk/libc/localedata/locales/ku_TR
    fsf/trunk/libc/localedata/locales/kw_GB
    fsf/trunk/libc/localedata/locales/ky_KG
    fsf/trunk/libc/localedata/locales/lb_LU
    fsf/trunk/libc/localedata/locales/lg_UG
    fsf/trunk/libc/localedata/locales/li_BE
    fsf/trunk/libc/localedata/locales/li_NL
    fsf/trunk/libc/localedata/locales/lij_IT
    fsf/trunk/libc/localedata/locales/lo_LA
    fsf/trunk/libc/localedata/locales/lt_LT
    fsf/trunk/libc/localedata/locales/lv_LV
    fsf/trunk/libc/localedata/locales/lzh_TW
    fsf/trunk/libc/localedata/locales/mag_IN
    fsf/trunk/libc/localedata/locales/mai_IN
    fsf/trunk/libc/localedata/locales/mg_MG
    fsf/trunk/libc/localedata/locales/mhr_RU
    fsf/trunk/libc/localedata/locales/mi_NZ
    fsf/trunk/libc/localedata/locales/mk_MK
    fsf/trunk/libc/localedata/locales/ml_IN
    fsf/trunk/libc/localedata/locales/mn_MN
    fsf/trunk/libc/localedata/locales/mni_IN
    fsf/trunk/libc/localedata/locales/mr_IN
    fsf/trunk/libc/localedata/locales/ms_MY
    fsf/trunk/libc/localedata/locales/mt_MT
    fsf/trunk/libc/localedata/locales/my_MM
    fsf/trunk/libc/localedata/locales/nan_TW
    fsf/trunk/libc/localedata/locales/nan_TW@latin
    fsf/trunk/libc/localedata/locales/nb_NO
    fsf/trunk/libc/localedata/locales/nds_DE
    fsf/trunk/libc/localedata/locales/nds_NL
    fsf/trunk/libc/localedata/locales/ne_NP
    fsf/trunk/libc/localedata/locales/nhn_MX
    fsf/trunk/libc/localedata/locales/niu_NU
    fsf/trunk/libc/localedata/locales/niu_NZ
    fsf/trunk/libc/localedata/locales/nl_AW
    fsf/trunk/libc/localedata/locales/nl_BE
    fsf/trunk/libc/localedata/locales/nl_BE@euro
    fsf/trunk/libc/localedata/locales/nl_NL
    fsf/trunk/libc/localedata/locales/nl_NL@euro
    fsf/trunk/libc/localedata/locales/nn_NO
    fsf/trunk/libc/localedata/locales/nr_ZA
    fsf/trunk/libc/localedata/locales/nso_ZA
    fsf/trunk/libc/localedata/locales/oc_FR
    fsf/trunk/libc/localedata/locales/om_ET
    fsf/trunk/libc/localedata/locales/om_KE
    fsf/trunk/libc/localedata/locales/or_IN
    fsf/trunk/libc/localedata/locales/os_RU
    fsf/trunk/libc/localedata/locales/pa_IN
    fsf/trunk/libc/localedata/locales/pa_PK
    fsf/trunk/libc/localedata/locales/pap_AN
    fsf/trunk/libc/localedata/locales/pap_AW
    fsf/trunk/libc/localedata/locales/pap_CW
    fsf/trunk/libc/localedata/locales/pl_PL
    fsf/trunk/libc/localedata/locales/ps_AF
    fsf/trunk/libc/localedata/locales/pt_BR
    fsf/trunk/libc/localedata/locales/pt_PT
    fsf/trunk/libc/localedata/locales/pt_PT@euro
    fsf/trunk/libc/localedata/locales/quz_PE
    fsf/trunk/libc/localedata/locales/ro_RO
    fsf/trunk/libc/localedata/locales/ru_RU
    fsf/trunk/libc/localedata/locales/ru_UA
    fsf/trunk/libc/localedata/locales/rw_RW
    fsf/trunk/libc/localedata/locales/sa_IN
    fsf/trunk/libc/localedata/locales/sat_IN
    fsf/trunk/libc/localedata/locales/sc_IT
    fsf/trunk/libc/localedata/locales/sd_IN
    fsf/trunk/libc/localedata/locales/sd_IN@devanagari
    fsf/trunk/libc/localedata/locales/se_NO
    fsf/trunk/libc/localedata/locales/shs_CA
    fsf/trunk/libc/localedata/locales/si_LK
    fsf/trunk/libc/localedata/locales/sid_ET
    fsf/trunk/libc/localedata/locales/sk_SK
    fsf/trunk/libc/localedata/locales/sl_SI
    fsf/trunk/libc/localedata/locales/so_DJ
    fsf/trunk/libc/localedata/locales/so_ET
    fsf/trunk/libc/localedata/locales/so_KE
    fsf/trunk/libc/localedata/locales/so_SO
    fsf/trunk/libc/localedata/locales/sq_AL
    fsf/trunk/libc/localedata/locales/sq_MK
    fsf/trunk/libc/localedata/locales/sr_ME
    fsf/trunk/libc/localedata/locales/sr_RS
    fsf/trunk/libc/localedata/locales/sr_RS@latin
    fsf/trunk/libc/localedata/locales/ss_ZA
    fsf/trunk/libc/localedata/locales/st_ZA
    fsf/trunk/libc/localedata/locales/sv_FI
    fsf/trunk/libc/localedata/locales/sv_FI@euro
    fsf/trunk/libc/localedata/locales/sv_SE
    fsf/trunk/libc/localedata/locales/sw_KE
    fsf/trunk/libc/localedata/locales/sw_TZ
    fsf/trunk/libc/localedata/locales/szl_PL
    fsf/trunk/libc/localedata/locales/ta_IN
    fsf/trunk/libc/localedata/locales/ta_LK
    fsf/trunk/libc/localedata/locales/te_IN
    fsf/trunk/libc/localedata/locales/tg_TJ
    fsf/trunk/libc/localedata/locales/th_TH
    fsf/trunk/libc/localedata/locales/ti_ER
    fsf/trunk/libc/localedata/locales/ti_ET
    fsf/trunk/libc/localedata/locales/tig_ER
    fsf/trunk/libc/localedata/locales/tk_TM
    fsf/trunk/libc/localedata/locales/tl_PH
    fsf/trunk/libc/localedata/locales/tn_ZA
    fsf/trunk/libc/localedata/locales/tr_CY
    fsf/trunk/libc/localedata/locales/tr_TR
    fsf/trunk/libc/localedata/locales/ts_ZA
    fsf/trunk/libc/localedata/locales/tt_RU
    fsf/trunk/libc/localedata/locales/tt_RU@iqtelif
    fsf/trunk/libc/localedata/locales/ug_CN
    fsf/trunk/libc/localedata/locales/uk_UA
    fsf/trunk/libc/localedata/locales/unm_US
    fsf/trunk/libc/localedata/locales/ur_IN
    fsf/trunk/libc/localedata/locales/ur_PK
    fsf/trunk/libc/localedata/locales/uz_UZ
    fsf/trunk/libc/localedata/locales/uz_UZ@cyrillic
    fsf/trunk/libc/localedata/locales/ve_ZA
    fsf/trunk/libc/localedata/locales/vi_VN
    fsf/trunk/libc/localedata/locales/wa_BE
    fsf/trunk/libc/localedata/locales/wa_BE@euro
    fsf/trunk/libc/localedata/locales/wae_CH
    fsf/trunk/libc/localedata/locales/wal_ET
    fsf/trunk/libc/localedata/locales/wo_SN
    fsf/trunk/libc/localedata/locales/xh_ZA
    fsf/trunk/libc/localedata/locales/yi_US
    fsf/trunk/libc/localedata/locales/yo_NG
    fsf/trunk/libc/localedata/locales/yue_HK
    fsf/trunk/libc/localedata/locales/zh_CN
    fsf/trunk/libc/localedata/locales/zh_HK
    fsf/trunk/libc/localedata/locales/zh_SG
    fsf/trunk/libc/localedata/locales/zh_TW
    fsf/trunk/libc/localedata/locales/zu_ZA

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Nov 15 00:02:09 2013
@@ -1,3 +1,8 @@
+2013-11-14  Andreas Schwab  <schwab@xxxxxxx>
+
+	* locale/C-address.c (_nl_C_LC_ADDRESS): Set country_num to zero
+	word instead of empty string.
+
 2013-11-13  Adhemerval Zanella  <azanella@xxxxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Fri Nov 15 00:02:09 2013
@@ -17,8 +17,8 @@
   15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886,
   15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15917, 15919,
   15921, 15923, 15939, 15948, 15963, 15966, 15985, 15988, 15997, 16032,
-  16034, 16036, 16037, 16041, 16071, 16072, 16074, 16078, 16112, 16150,
-  16151, 16153.
+  16034, 16036, 16037, 16041, 16071, 16072, 16074, 16078, 16103, 16112,
+  16143, 16150, 16151, 16153.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

Modified: fsf/trunk/libc/locale/C-address.c
==============================================================================
--- fsf/trunk/libc/locale/C-address.c (original)
+++ fsf/trunk/libc/locale/C-address.c Fri Nov 15 00:02:09 2013
@@ -38,7 +38,7 @@
     { .string = "" },
     { .string = "" },
     { .string = "" },
-    { .string = "" },
+    { .word = 0 },
     { .string = "" },
     { .string = "" },
     { .string = "" },

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Fri Nov 15 00:02:09 2013
@@ -1,3 +1,317 @@
+2013-11-14  Chris Leonard  <cjl@xxxxxxxxxxxxx>
+
+	[BZ #16143]
+	* locales/pap_AN: pap_* locales have duplicated LC_NUMERIC section.
+	* locales/pap_AW: Likewise.
+	* locales/pap_CW: Likewise.
+
+2013-11-08  Chris Leonard  <cjl@xxxxxxxxxxxxx>
+
+	[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.
+
 2013-11-04  Chris Leonard  <cjl@xxxxxxxxxxxxx>
 
 	* locales/unm_US: Adjust language-code fields of LC_ADDRESS.

Modified: fsf/trunk/libc/localedata/locales/aa_DJ
==============================================================================
--- fsf/trunk/libc/localedata/locales/aa_DJ (original)
+++ fsf/trunk/libc/localedata/locales/aa_DJ Fri Nov 15 00:02:09 2013
@@ -76,11 +76,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-%
-% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT category.
-%
+% metric
 measurement 1
-%
 END LC_MEASUREMENT
 
 

Modified: fsf/trunk/libc/localedata/locales/aa_ER
==============================================================================
--- fsf/trunk/libc/localedata/locales/aa_ER (original)
+++ fsf/trunk/libc/localedata/locales/aa_ER Fri Nov 15 00:02:09 2013
@@ -72,7 +72,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-copy "ti_ER"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

Modified: fsf/trunk/libc/localedata/locales/aa_ER@saaho
==============================================================================
--- fsf/trunk/libc/localedata/locales/aa_ER@saaho (original)
+++ fsf/trunk/libc/localedata/locales/aa_ER@saaho Fri Nov 15 00:02:09 2013
@@ -72,7 +72,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-copy "aa_ER"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

Modified: fsf/trunk/libc/localedata/locales/aa_ET
==============================================================================
--- fsf/trunk/libc/localedata/locales/aa_ET (original)
+++ fsf/trunk/libc/localedata/locales/aa_ET Fri Nov 15 00:02:09 2013
@@ -72,7 +72,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-copy "ti_ET"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

Modified: fsf/trunk/libc/localedata/locales/af_ZA
==============================================================================
--- fsf/trunk/libc/localedata/locales/af_ZA (original)
+++ fsf/trunk/libc/localedata/locales/af_ZA Fri Nov 15 00:02:09 2013
@@ -185,7 +185,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "en_ZA"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/ak_GH
==============================================================================
--- fsf/trunk/libc/localedata/locales/ak_GH (original)
+++ fsf/trunk/libc/localedata/locales/ak_GH Fri Nov 15 00:02:09 2013
@@ -161,7 +161,7 @@
 
 LC_MEASUREMENT
 % metric
-measurement    1
+measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

Modified: fsf/trunk/libc/localedata/locales/am_ET
==============================================================================
--- fsf/trunk/libc/localedata/locales/am_ET (original)
+++ fsf/trunk/libc/localedata/locales/am_ET Fri Nov 15 00:02:09 2013
@@ -1403,7 +1403,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-copy "ti_ET"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 

Modified: fsf/trunk/libc/localedata/locales/an_ES
==============================================================================
--- fsf/trunk/libc/localedata/locales/an_ES (original)
+++ fsf/trunk/libc/localedata/locales/an_ES Fri Nov 15 00:02:09 2013
@@ -42,6 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "es_ES"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/anp_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/anp_IN (original)
+++ fsf/trunk/libc/localedata/locales/anp_IN Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_AE
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_AE (original)
+++ fsf/trunk/libc/localedata/locales/ar_AE Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_BH
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_BH (original)
+++ fsf/trunk/libc/localedata/locales/ar_BH Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_DZ
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_DZ (original)
+++ fsf/trunk/libc/localedata/locales/ar_DZ Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_EG
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_EG (original)
+++ fsf/trunk/libc/localedata/locales/ar_EG Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_IN (original)
+++ fsf/trunk/libc/localedata/locales/ar_IN Fri Nov 15 00:02:09 2013
@@ -28,7 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_IQ
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_IQ (original)
+++ fsf/trunk/libc/localedata/locales/ar_IQ Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_JO
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_JO (original)
+++ fsf/trunk/libc/localedata/locales/ar_JO Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_KW
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_KW (original)
+++ fsf/trunk/libc/localedata/locales/ar_KW Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_LB
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_LB (original)
+++ fsf/trunk/libc/localedata/locales/ar_LB Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_LY
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_LY (original)
+++ fsf/trunk/libc/localedata/locales/ar_LY Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_MA
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_MA (original)
+++ fsf/trunk/libc/localedata/locales/ar_MA Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_OM
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_OM (original)
+++ fsf/trunk/libc/localedata/locales/ar_OM Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_QA
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_QA (original)
+++ fsf/trunk/libc/localedata/locales/ar_QA Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_SA
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_SA (original)
+++ fsf/trunk/libc/localedata/locales/ar_SA Fri Nov 15 00:02:09 2013
@@ -32,6 +32,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/ar_SD
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_SD (original)
+++ fsf/trunk/libc/localedata/locales/ar_SD Fri Nov 15 00:02:09 2013
@@ -41,6 +41,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_SS
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_SS (original)
+++ fsf/trunk/libc/localedata/locales/ar_SS Fri Nov 15 00:02:09 2013
@@ -41,6 +41,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_SY
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_SY (original)
+++ fsf/trunk/libc/localedata/locales/ar_SY Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_TN
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_TN (original)
+++ fsf/trunk/libc/localedata/locales/ar_TN Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ar_YE
==============================================================================
--- fsf/trunk/libc/localedata/locales/ar_YE (original)
+++ fsf/trunk/libc/localedata/locales/ar_YE Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-% This is the ISO_IEC TR14652 Locale definition for the
-%
+% metric
 measurement 1
-
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/as_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/as_IN (original)
+++ fsf/trunk/libc/localedata/locales/as_IN Fri Nov 15 00:02:09 2013
@@ -28,6 +28,7 @@
 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 @@
 
 %%%%%%%%%%%%%
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ast_ES
==============================================================================
--- fsf/trunk/libc/localedata/locales/ast_ES (original)
+++ fsf/trunk/libc/localedata/locales/ast_ES Fri Nov 15 00:02:09 2013
@@ -41,6 +41,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "es_ES"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/ayc_PE
==============================================================================
--- fsf/trunk/libc/localedata/locales/ayc_PE (original)
+++ fsf/trunk/libc/localedata/locales/ayc_PE Fri Nov 15 00:02:09 2013
@@ -172,6 +172,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/az_AZ
==============================================================================
--- fsf/trunk/libc/localedata/locales/az_AZ (original)
+++ fsf/trunk/libc/localedata/locales/az_AZ Fri Nov 15 00:02:09 2013
@@ -283,6 +283,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/be_BY
==============================================================================
--- fsf/trunk/libc/localedata/locales/be_BY (original)
+++ fsf/trunk/libc/localedata/locales/be_BY Fri Nov 15 00:02:09 2013
@@ -39,7 +39,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/be_BY@latin
==============================================================================
--- fsf/trunk/libc/localedata/locales/be_BY@latin (original)
+++ fsf/trunk/libc/localedata/locales/be_BY@latin Fri Nov 15 00:02:09 2013
@@ -39,6 +39,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "be_BY"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/bem_ZM
==============================================================================
--- fsf/trunk/libc/localedata/locales/bem_ZM (original)
+++ fsf/trunk/libc/localedata/locales/bem_ZM Fri Nov 15 00:02:09 2013
@@ -140,7 +140,8 @@
 END LC_PAPER
 
 LC_MEASUREMENT
-measurement  1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

Modified: fsf/trunk/libc/localedata/locales/ber_DZ
==============================================================================
--- fsf/trunk/libc/localedata/locales/ber_DZ (original)
+++ fsf/trunk/libc/localedata/locales/ber_DZ Fri Nov 15 00:02:09 2013
@@ -259,6 +259,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/ber_MA
==============================================================================
--- fsf/trunk/libc/localedata/locales/ber_MA (original)
+++ fsf/trunk/libc/localedata/locales/ber_MA Fri Nov 15 00:02:09 2013
@@ -179,6 +179,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/bg_BG
==============================================================================
--- fsf/trunk/libc/localedata/locales/bg_BG (original)
+++ fsf/trunk/libc/localedata/locales/bg_BG Fri Nov 15 00:02:09 2013
@@ -37,6 +37,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/bho_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/bho_IN (original)
+++ fsf/trunk/libc/localedata/locales/bho_IN Fri Nov 15 00:02:09 2013
@@ -29,7 +29,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/bn_BD
==============================================================================
--- fsf/trunk/libc/localedata/locales/bn_BD (original)
+++ fsf/trunk/libc/localedata/locales/bn_BD Fri Nov 15 00:02:09 2013
@@ -144,8 +144,8 @@
 nostr       "<U09A8><U09BE>"
 END LC_MESSAGES
 
-% Metric Measurement system (ISO 1000)
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/bn_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/bn_IN (original)
+++ fsf/trunk/libc/localedata/locales/bn_IN Fri Nov 15 00:02:09 2013
@@ -29,7 +29,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/bo_CN
==============================================================================
--- fsf/trunk/libc/localedata/locales/bo_CN (original)
+++ fsf/trunk/libc/localedata/locales/bo_CN Fri Nov 15 00:02:09 2013
@@ -28,7 +28,7 @@
 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 @@
 END LC_PAPER
 
 LC_MEASUREMENT
-copy "zh_CN"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/bo_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/bo_IN (original)
+++ fsf/trunk/libc/localedata/locales/bo_IN Fri Nov 15 00:02:09 2013
@@ -28,7 +28,7 @@
 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 @@
 END LC_PAPER
 
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/br_FR
==============================================================================
--- fsf/trunk/libc/localedata/locales/br_FR (original)
+++ fsf/trunk/libc/localedata/locales/br_FR Fri Nov 15 00:02:09 2013
@@ -150,6 +150,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/br_FR@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/br_FR@euro (original)
+++ fsf/trunk/libc/localedata/locales/br_FR@euro Fri Nov 15 00:02:09 2013
@@ -34,7 +34,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "br_FR"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/brx_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/brx_IN (original)
+++ fsf/trunk/libc/localedata/locales/brx_IN Fri Nov 15 00:02:09 2013
@@ -28,7 +28,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/bs_BA
==============================================================================
--- fsf/trunk/libc/localedata/locales/bs_BA (original)
+++ fsf/trunk/libc/localedata/locales/bs_BA Fri Nov 15 00:02:09 2013
@@ -216,6 +216,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/byn_ER
==============================================================================
--- fsf/trunk/libc/localedata/locales/byn_ER (original)
+++ fsf/trunk/libc/localedata/locales/byn_ER Fri Nov 15 00:02:09 2013
@@ -68,7 +68,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 LC_MEASUREMENT
-copy "ti_ER"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MONETARY

Modified: fsf/trunk/libc/localedata/locales/ca_AD
==============================================================================
--- fsf/trunk/libc/localedata/locales/ca_AD (original)
+++ fsf/trunk/libc/localedata/locales/ca_AD Fri Nov 15 00:02:09 2013
@@ -37,7 +37,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "ca_ES"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/ca_ES
==============================================================================
--- fsf/trunk/libc/localedata/locales/ca_ES (original)
+++ fsf/trunk/libc/localedata/locales/ca_ES Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/ca_ES@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/ca_ES@euro (original)
+++ fsf/trunk/libc/localedata/locales/ca_ES@euro Fri Nov 15 00:02:09 2013
@@ -37,7 +37,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "ca_ES"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/ca_FR
==============================================================================
--- fsf/trunk/libc/localedata/locales/ca_FR (original)
+++ fsf/trunk/libc/localedata/locales/ca_FR Fri Nov 15 00:02:09 2013
@@ -37,7 +37,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "fr_FR"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/ca_IT
==============================================================================
--- fsf/trunk/libc/localedata/locales/ca_IT (original)
+++ fsf/trunk/libc/localedata/locales/ca_IT Fri Nov 15 00:02:09 2013
@@ -37,7 +37,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "it_IT"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/cmn_TW
==============================================================================
--- fsf/trunk/libc/localedata/locales/cmn_TW (original)
+++ fsf/trunk/libc/localedata/locales/cmn_TW Fri Nov 15 00:02:09 2013
@@ -162,6 +162,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/crh_UA
==============================================================================
--- fsf/trunk/libc/localedata/locales/crh_UA (original)
+++ fsf/trunk/libc/localedata/locales/crh_UA Fri Nov 15 00:02:09 2013
@@ -213,6 +213,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/cs_CZ
==============================================================================
--- fsf/trunk/libc/localedata/locales/cs_CZ (original)
+++ fsf/trunk/libc/localedata/locales/cs_CZ Fri Nov 15 00:02:09 2013
@@ -128,7 +128,7 @@
 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Ãadà znakÃ
@@ -2472,7 +2472,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/csb_PL
==============================================================================
--- fsf/trunk/libc/localedata/locales/csb_PL (original)
+++ fsf/trunk/libc/localedata/locales/csb_PL Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "pl_PL"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/cv_RU
==============================================================================
--- fsf/trunk/libc/localedata/locales/cv_RU (original)
+++ fsf/trunk/libc/localedata/locales/cv_RU Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "ru_RU"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/cy_GB
==============================================================================
--- fsf/trunk/libc/localedata/locales/cy_GB (original)
+++ fsf/trunk/libc/localedata/locales/cy_GB Fri Nov 15 00:02:09 2013
@@ -57,7 +57,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "en_GB"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_CTYPE

Modified: fsf/trunk/libc/localedata/locales/da_DK
==============================================================================
--- fsf/trunk/libc/localedata/locales/da_DK (original)
+++ fsf/trunk/libc/localedata/locales/da_DK Fri Nov 15 00:02:09 2013
@@ -51,7 +51,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/de_AT
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_AT (original)
+++ fsf/trunk/libc/localedata/locales/de_AT Fri Nov 15 00:02:09 2013
@@ -41,7 +41,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/de_AT@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_AT@euro (original)
+++ fsf/trunk/libc/localedata/locales/de_AT@euro Fri Nov 15 00:02:09 2013
@@ -41,7 +41,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "de_AT"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/de_BE
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_BE (original)
+++ fsf/trunk/libc/localedata/locales/de_BE Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "fr_BE"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/de_BE@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_BE@euro (original)
+++ fsf/trunk/libc/localedata/locales/de_BE@euro Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "de_BE"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/de_CH
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_CH (original)
+++ fsf/trunk/libc/localedata/locales/de_CH Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/de_DE
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_DE (original)
+++ fsf/trunk/libc/localedata/locales/de_DE Fri Nov 15 00:02:09 2013
@@ -27,7 +27,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/de_DE@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_DE@euro (original)
+++ fsf/trunk/libc/localedata/locales/de_DE@euro Fri Nov 15 00:02:09 2013
@@ -27,7 +27,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "de_DE"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/de_LU
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_LU (original)
+++ fsf/trunk/libc/localedata/locales/de_LU Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/de_LU@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_LU@euro (original)
+++ fsf/trunk/libc/localedata/locales/de_LU@euro Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "de_LU"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/doi_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/doi_IN (original)
+++ fsf/trunk/libc/localedata/locales/doi_IN Fri Nov 15 00:02:09 2013
@@ -27,7 +27,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/dv_MV
==============================================================================
--- fsf/trunk/libc/localedata/locales/dv_MV (original)
+++ fsf/trunk/libc/localedata/locales/dv_MV Fri Nov 15 00:02:09 2013
@@ -38,7 +38,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/dz_BT
==============================================================================
--- fsf/trunk/libc/localedata/locales/dz_BT (original)
+++ fsf/trunk/libc/localedata/locales/dz_BT Fri Nov 15 00:02:09 2013
@@ -31,6 +31,7 @@
 %
 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_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 @@
 END LC_PAPER
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/el_CY
==============================================================================
--- fsf/trunk/libc/localedata/locales/el_CY (original)
+++ fsf/trunk/libc/localedata/locales/el_CY Fri Nov 15 00:02:09 2013
@@ -28,7 +28,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/el_GR
==============================================================================
--- fsf/trunk/libc/localedata/locales/el_GR (original)
+++ fsf/trunk/libc/localedata/locales/el_GR Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/el_GR@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/el_GR@euro (original)
+++ fsf/trunk/libc/localedata/locales/el_GR@euro Fri Nov 15 00:02:09 2013
@@ -25,7 +25,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "el_GR"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/en_AG
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_AG (original)
+++ fsf/trunk/libc/localedata/locales/en_AG Fri Nov 15 00:02:09 2013
@@ -27,7 +27,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "en_US"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/en_AU
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_AU (original)
+++ fsf/trunk/libc/localedata/locales/en_AU Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_BW
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_BW (original)
+++ fsf/trunk/libc/localedata/locales/en_BW Fri Nov 15 00:02:09 2013
@@ -40,7 +40,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_CA
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_CA (original)
+++ fsf/trunk/libc/localedata/locales/en_CA Fri Nov 15 00:02:09 2013
@@ -45,7 +45,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_DK
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_DK (original)
+++ fsf/trunk/libc/localedata/locales/en_DK Fri Nov 15 00:02:09 2013
@@ -48,7 +48,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "da_DK"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_GB
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_GB (original)
+++ fsf/trunk/libc/localedata/locales/en_GB Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_HK
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_HK (original)
+++ fsf/trunk/libc/localedata/locales/en_HK Fri Nov 15 00:02:09 2013
@@ -32,7 +32,7 @@
 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 @@
 
 
 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

Modified: fsf/trunk/libc/localedata/locales/en_IE
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_IE (original)
+++ fsf/trunk/libc/localedata/locales/en_IE Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_IE@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_IE@euro (original)
+++ fsf/trunk/libc/localedata/locales/en_IE@euro Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "en_IE"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_IN (original)
+++ fsf/trunk/libc/localedata/locales/en_IN Fri Nov 15 00:02:09 2013
@@ -29,7 +29,7 @@
 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 @@
 
 
 LC_MEASUREMENT
-copy "hi_IN"
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/en_NG
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_NG (original)
+++ fsf/trunk/libc/localedata/locales/en_NG Fri Nov 15 00:02:09 2013
@@ -211,7 +211,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "en_DK"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_NZ
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_NZ (original)
+++ fsf/trunk/libc/localedata/locales/en_NZ Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_PH
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_PH (original)
+++ fsf/trunk/libc/localedata/locales/en_PH Fri Nov 15 00:02:09 2013
@@ -31,7 +31,7 @@
 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 @@
 
 
 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

Modified: fsf/trunk/libc/localedata/locales/en_SG
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_SG (original)
+++ fsf/trunk/libc/localedata/locales/en_SG Fri Nov 15 00:02:09 2013
@@ -29,7 +29,7 @@
 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 @@
 
 
 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

Modified: fsf/trunk/libc/localedata/locales/en_US
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_US (original)
+++ fsf/trunk/libc/localedata/locales/en_US Fri Nov 15 00:02:09 2013
@@ -27,7 +27,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
+% US customary units
 measurement    2
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/en_ZA
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_ZA (original)
+++ fsf/trunk/libc/localedata/locales/en_ZA Fri Nov 15 00:02:09 2013
@@ -248,7 +248,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/en_ZM
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_ZM (original)
+++ fsf/trunk/libc/localedata/locales/en_ZM Fri Nov 15 00:02:09 2013
@@ -60,7 +60,8 @@
 END LC_PAPER
 
 LC_MEASUREMENT
-copy "bem_ZM"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

Modified: fsf/trunk/libc/localedata/locales/en_ZW
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_ZW (original)
+++ fsf/trunk/libc/localedata/locales/en_ZW Fri Nov 15 00:02:09 2013
@@ -40,7 +40,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_AR
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_AR (original)
+++ fsf/trunk/libc/localedata/locales/es_AR Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_BO
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_BO (original)
+++ fsf/trunk/libc/localedata/locales/es_BO Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_CL
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CL (original)
+++ fsf/trunk/libc/localedata/locales/es_CL Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_CO
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CO (original)
+++ fsf/trunk/libc/localedata/locales/es_CO Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_CR
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CR (original)
+++ fsf/trunk/libc/localedata/locales/es_CR Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_CU
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CU (original)
+++ fsf/trunk/libc/localedata/locales/es_CU Fri Nov 15 00:02:09 2013
@@ -41,7 +41,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_DO
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_DO (original)
+++ fsf/trunk/libc/localedata/locales/es_DO Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_EC
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_EC (original)
+++ fsf/trunk/libc/localedata/locales/es_EC Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_ES
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_ES (original)
+++ fsf/trunk/libc/localedata/locales/es_ES Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_ES@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_ES@euro (original)
+++ fsf/trunk/libc/localedata/locales/es_ES@euro Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "es_ES"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_GT
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_GT (original)
+++ fsf/trunk/libc/localedata/locales/es_GT Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_HN
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_HN (original)
+++ fsf/trunk/libc/localedata/locales/es_HN Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_MX
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_MX (original)
+++ fsf/trunk/libc/localedata/locales/es_MX Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_NI
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_NI (original)
+++ fsf/trunk/libc/localedata/locales/es_NI Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_PA
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PA (original)
+++ fsf/trunk/libc/localedata/locales/es_PA Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_PE
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PE (original)
+++ fsf/trunk/libc/localedata/locales/es_PE Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_PR
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PR (original)
+++ fsf/trunk/libc/localedata/locales/es_PR Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
+% US customary units
 measurement    2
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/es_PY
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PY (original)
+++ fsf/trunk/libc/localedata/locales/es_PY Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_SV
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_SV (original)
+++ fsf/trunk/libc/localedata/locales/es_SV Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_US
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_US (original)
+++ fsf/trunk/libc/localedata/locales/es_US Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
+% US customary units
 measurement    2
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/es_UY
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_UY (original)
+++ fsf/trunk/libc/localedata/locales/es_UY Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/es_VE
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_VE (original)
+++ fsf/trunk/libc/localedata/locales/es_VE Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/et_EE
==============================================================================
--- fsf/trunk/libc/localedata/locales/et_EE (original)
+++ fsf/trunk/libc/localedata/locales/et_EE Fri Nov 15 00:02:09 2013
@@ -51,7 +51,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/eu_ES
==============================================================================
--- fsf/trunk/libc/localedata/locales/eu_ES (original)
+++ fsf/trunk/libc/localedata/locales/eu_ES Fri Nov 15 00:02:09 2013
@@ -47,7 +47,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/eu_ES@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/eu_ES@euro (original)
+++ fsf/trunk/libc/localedata/locales/eu_ES@euro Fri Nov 15 00:02:09 2013
@@ -36,7 +36,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "eu_ES"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fa_IR
==============================================================================
--- fsf/trunk/libc/localedata/locales/fa_IR (original)
+++ fsf/trunk/libc/localedata/locales/fa_IR Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT

Modified: fsf/trunk/libc/localedata/locales/ff_SN
==============================================================================
--- fsf/trunk/libc/localedata/locales/ff_SN (original)
+++ fsf/trunk/libc/localedata/locales/ff_SN Fri Nov 15 00:02:09 2013
@@ -137,7 +137,8 @@
 END LC_PAPER
 
 LC_MEASUREMENT
-measurement  1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

Modified: fsf/trunk/libc/localedata/locales/fi_FI
==============================================================================
--- fsf/trunk/libc/localedata/locales/fi_FI (original)
+++ fsf/trunk/libc/localedata/locales/fi_FI Fri Nov 15 00:02:09 2013
@@ -230,7 +230,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fi_FI@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/fi_FI@euro (original)
+++ fsf/trunk/libc/localedata/locales/fi_FI@euro Fri Nov 15 00:02:09 2013
@@ -72,7 +72,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "fi_FI"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fil_PH
==============================================================================
--- fsf/trunk/libc/localedata/locales/fil_PH (original)
+++ fsf/trunk/libc/localedata/locales/fil_PH Fri Nov 15 00:02:09 2013
@@ -154,6 +154,7 @@
 END LC_PAPER
 
 LC_MEASUREMENT
+% metric
 measurement 1
 END LC_MEASUREMENT
 

Modified: fsf/trunk/libc/localedata/locales/fo_FO
==============================================================================
--- fsf/trunk/libc/localedata/locales/fo_FO (original)
+++ fsf/trunk/libc/localedata/locales/fo_FO Fri Nov 15 00:02:09 2013
@@ -46,7 +46,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_BE
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_BE (original)
+++ fsf/trunk/libc/localedata/locales/fr_BE Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_BE@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_BE@euro (original)
+++ fsf/trunk/libc/localedata/locales/fr_BE@euro Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "fr_BE"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_CA
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_CA (original)
+++ fsf/trunk/libc/localedata/locales/fr_CA Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "en_CA"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_CH
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_CH (original)
+++ fsf/trunk/libc/localedata/locales/fr_CH Fri Nov 15 00:02:09 2013
@@ -43,7 +43,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_FR
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_FR (original)
+++ fsf/trunk/libc/localedata/locales/fr_FR Fri Nov 15 00:02:09 2013
@@ -44,7 +44,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_FR@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_FR@euro (original)
+++ fsf/trunk/libc/localedata/locales/fr_FR@euro Fri Nov 15 00:02:09 2013
@@ -34,7 +34,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "fr_FR"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_LU
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_LU (original)
+++ fsf/trunk/libc/localedata/locales/fr_LU Fri Nov 15 00:02:09 2013
@@ -42,7 +42,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
-measurement    1
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fr_LU@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_LU@euro (original)
+++ fsf/trunk/libc/localedata/locales/fr_LU@euro Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "fr_LU"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fur_IT
==============================================================================
--- fsf/trunk/libc/localedata/locales/fur_IT (original)
+++ fsf/trunk/libc/localedata/locales/fur_IT Fri Nov 15 00:02:09 2013
@@ -35,7 +35,7 @@
 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 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy  "it_IT"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NAME

Modified: fsf/trunk/libc/localedata/locales/fy_DE
==============================================================================
--- fsf/trunk/libc/localedata/locales/fy_DE (original)
+++ fsf/trunk/libc/localedata/locales/fy_DE Fri Nov 15 00:02:09 2013
@@ -89,7 +89,8 @@
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "de_DE"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_NUMERIC

Modified: fsf/trunk/libc/localedata/locales/fy_NL
==============================================================================
--- fsf/trunk/libc/localedata/locales/fy_NL (original)
+++ fsf/trunk/libc/localedata/locales/fy_NL Fri Nov 15 00:02:09 2013
@@ -105,7 +105,8 @@
 END LC_MONETARY
 
 LC_MEASUREMENT
-copy "nl_NL"
+% metric
+measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES

Modified: fsf/trunk/libc/localedata/locales/ga_IE
==============================================================================
--- fsf/trunk/libc/localedata/locales/ga_IE (original)
+++ fsf/trunk/libc/localedata/locales/ga_IE Fri Nov 15 00:02:09 2013
@@ -40,7 +40,7 @@
 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 @@

[... 3433 lines stripped ...]
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits