From: Chris Leonard Date: Thu, 14 Nov 2013 22:19:35 +0000 (-0500) Subject: [BZ #16103] LC_MEASUREMENT review and standardization X-Git-Tag: glibc-2.19~517 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8f18faed2e5dd5b5861602527436cf1ee8e7230b;p=glibc.git [BZ #16103] LC_MEASUREMENT review and standardization --- diff --git a/NEWS b/NEWS index c338d398bd..7972b782a6 100644 --- a/NEWS +++ b/NEWS @@ -17,8 +17,8 @@ Version 2.19 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, + 16150, 16151, 16153. * CVE-2012-4412 The strcoll implementation caches indices and rules for large collation sequences to optimize multiple passes. This cache diff --git a/localedata/ChangeLog b/localedata/ChangeLog index e493d9d3ec..a7f5094c6f 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,310 @@ +2013-11-08 Chris Leonard + + [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 * locales/unm_US: Adjust language-code fields of LC_ADDRESS. diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ index 369caf24cc..078f2556b1 100644 --- a/localedata/locales/aa_DJ +++ b/localedata/locales/aa_DJ @@ -76,11 +76,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -% -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT category. -% +% metric measurement 1 -% END LC_MEASUREMENT diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER index 5f8a60e915..38bc073534 100644 --- a/localedata/locales/aa_ER +++ b/localedata/locales/aa_ER @@ -72,7 +72,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ER" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho index 092996729b..63c1cb9a4f 100644 --- a/localedata/locales/aa_ER@saaho +++ b/localedata/locales/aa_ER@saaho @@ -72,7 +72,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "aa_ER" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET index bc64388b97..c433fbccdb 100644 --- a/localedata/locales/aa_ET +++ b/localedata/locales/aa_ET @@ -72,7 +72,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA index e7df1c3c14..143ad7557e 100644 --- a/localedata/locales/af_ZA +++ b/localedata/locales/af_ZA @@ -185,7 +185,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ak_GH b/localedata/locales/ak_GH index b33ba6b084..159acc8c4d 100644 --- a/localedata/locales/ak_GH +++ b/localedata/locales/ak_GH @@ -161,7 +161,7 @@ END LC_PAPER LC_MEASUREMENT % metric -measurement 1 +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET index ed66cf6e1f..666e984ba3 100644 --- a/localedata/locales/am_ET +++ b/localedata/locales/am_ET @@ -1403,7 +1403,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES index e672ce9044..4dc31371e4 100644 --- a/localedata/locales/an_ES +++ b/localedata/locales/an_ES @@ -42,6 +42,7 @@ category "i18n:1999";LC_PAPER category "i18n:1999";LC_NAME category "i18n:1999";LC_ADDRESS category "i18n:1999";LC_TELEPHONE +category "i18n:1999";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -116,7 +117,8 @@ copy "es_ES" END LC_TELEPHONE LC_MEASUREMENT -copy "es_ES" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/anp_IN b/localedata/locales/anp_IN index c2400643c6..8d548905bb 100644 --- a/localedata/locales/anp_IN +++ b/localedata/locales/anp_IN @@ -42,7 +42,7 @@ category "anp_IN:2013";LC_PAPER category "anp_IN:2013";LC_NAME category "anp_IN:2013";LC_ADDRESS category "anp_IN:2013";LC_TELEPHONE - +category "anp_IN:2013";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -201,5 +201,6 @@ END LC_TELEPHONE LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE index c7f249bb4a..520245b94b 100644 --- a/localedata/locales/ar_AE +++ b/localedata/locales/ar_AE @@ -28,6 +28,7 @@ category "ar_AE:2000";LC_PAPER category "ar_AE:2000";LC_NAME category "ar_AE:2000";LC_ADDRESS category "ar_AE:2000";LC_TELEPHONE +category "ar_AE:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -203,8 +204,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH index 39e5e0d94f..558462adf7 100644 --- a/localedata/locales/ar_BH +++ b/localedata/locales/ar_BH @@ -28,6 +28,7 @@ category "ar_BH:2000";LC_PAPER category "ar_BH:2000";LC_NAME category "ar_BH:2000";LC_ADDRESS category "ar_BH:2000";LC_TELEPHONE +category "ar_BH:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -208,8 +209,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ index cda64af0c7..c91718af54 100644 --- a/localedata/locales/ar_DZ +++ b/localedata/locales/ar_DZ @@ -28,6 +28,7 @@ category "ar_DZ:2000";LC_PAPER category "ar_DZ:2000";LC_NAME category "ar_DZ:2000";LC_ADDRESS category "ar_DZ:2000";LC_TELEPHONE +category "ar_DZ:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -207,8 +208,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG index 3916ed7bac..446d7f25ae 100644 --- a/localedata/locales/ar_EG +++ b/localedata/locales/ar_EG @@ -28,6 +28,7 @@ category "ar_EG:2000";LC_PAPER category "ar_EG:2000";LC_NAME category "ar_EG:2000";LC_ADDRESS category "ar_EG:2000";LC_TELEPHONE +category "ar_EG:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -214,8 +215,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN index 819925f070..c6fe5b1496 100644 --- a/localedata/locales/ar_IN +++ b/localedata/locales/ar_IN @@ -28,7 +28,7 @@ category "ar_IN:2000";LC_PAPER category "ar_IN:2000";LC_NAME category "ar_IN:2000";LC_ADDRESS category "ar_IN:2000";LC_TELEPHONE - +category "ar_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -179,5 +179,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ index a398234d07..5519916627 100644 --- a/localedata/locales/ar_IQ +++ b/localedata/locales/ar_IQ @@ -28,6 +28,7 @@ category "ar_IQ:2000";LC_PAPER category "ar_IQ:2000";LC_NAME category "ar_IQ:2000";LC_ADDRESS category "ar_IQ:2000";LC_TELEPHONE +category "ar_IQ:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -206,8 +207,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO index 8f65c74d4e..e1137183ff 100644 --- a/localedata/locales/ar_JO +++ b/localedata/locales/ar_JO @@ -28,6 +28,7 @@ category "ar_JO:2000";LC_PAPER category "ar_JO:2000";LC_NAME category "ar_JO:2000";LC_ADDRESS category "ar_JO:2000";LC_TELEPHONE +category "ar_JO:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -224,8 +225,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW index 8bd66ada00..d27d6b55fe 100644 --- a/localedata/locales/ar_KW +++ b/localedata/locales/ar_KW @@ -28,6 +28,7 @@ category "ar_KW:2000";LC_PAPER category "ar_KW:2000";LC_NAME category "ar_KW:2000";LC_ADDRESS category "ar_KW:2000";LC_TELEPHONE +category "ar_KW:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -206,8 +207,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB index c946022ef2..5cf1e39b03 100644 --- a/localedata/locales/ar_LB +++ b/localedata/locales/ar_LB @@ -28,6 +28,7 @@ category "ar_LB:2000";LC_PAPER category "ar_LB:2000";LC_NAME category "ar_LB:2000";LC_ADDRESS category "ar_LB:2000";LC_TELEPHONE +category "ar_LB:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -223,8 +224,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY index d95255d6ab..f5956a3711 100644 --- a/localedata/locales/ar_LY +++ b/localedata/locales/ar_LY @@ -28,6 +28,7 @@ category "ar_LY:2000";LC_PAPER category "ar_LY:2000";LC_NAME category "ar_LY:2000";LC_ADDRESS category "ar_LY:2000";LC_TELEPHONE +category "ar_LY:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -206,8 +207,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA index d13dd61109..3e8125b045 100644 --- a/localedata/locales/ar_MA +++ b/localedata/locales/ar_MA @@ -28,6 +28,7 @@ category "ar_MA:2000";LC_PAPER category "ar_MA:2000";LC_NAME category "ar_MA:2000";LC_ADDRESS category "ar_MA:2000";LC_TELEPHONE +category "ar_MA:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -206,8 +207,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM index ea546bdd2f..1c25ab37c2 100644 --- a/localedata/locales/ar_OM +++ b/localedata/locales/ar_OM @@ -28,6 +28,7 @@ category "ar_OM:2000";LC_PAPER category "ar_OM:2000";LC_NAME category "ar_OM:2000";LC_ADDRESS category "ar_OM:2000";LC_TELEPHONE +category "ar_OM:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -204,8 +205,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA index 4764f696e2..18a69635c5 100644 --- a/localedata/locales/ar_QA +++ b/localedata/locales/ar_QA @@ -28,6 +28,7 @@ category "ar_QA:2000";LC_PAPER category "ar_QA:2000";LC_NAME category "ar_QA:2000";LC_ADDRESS category "ar_QA:2000";LC_TELEPHONE +category "ar_QA:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -206,8 +207,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA index 538449e53e..a8889b0433 100644 --- a/localedata/locales/ar_SA +++ b/localedata/locales/ar_SA @@ -32,6 +32,7 @@ category "ar_SA:2000";LC_PAPER category "ar_SA:2000";LC_NAME category "ar_SA:2000";LC_ADDRESS category "ar_SA:2000";LC_TELEPHONE +category "ar_SA:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -368,8 +369,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD index c8a34691da..4cdec5f877 100644 --- a/localedata/locales/ar_SD +++ b/localedata/locales/ar_SD @@ -41,6 +41,7 @@ category "ar_SD:2000";LC_PAPER category "ar_SD:2000";LC_NAME category "ar_SD:2000";LC_ADDRESS category "ar_SD:2000";LC_TELEPHONE +category "ar_SD:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -222,8 +223,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS index 8cf487ad21..fd71d6ebdf 100644 --- a/localedata/locales/ar_SS +++ b/localedata/locales/ar_SS @@ -41,6 +41,7 @@ category "ar_SS:2000";LC_PAPER category "ar_SS:2000";LC_NAME category "ar_SS:2000";LC_ADDRESS category "ar_SS:2000";LC_TELEPHONE +category "ar_SS:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -220,8 +221,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY index 9290de5954..ed901d89a1 100644 --- a/localedata/locales/ar_SY +++ b/localedata/locales/ar_SY @@ -28,6 +28,7 @@ category "ar_SY:2000";LC_PAPER category "ar_SY:2000";LC_NAME category "ar_SY:2000";LC_ADDRESS category "ar_SY:2000";LC_TELEPHONE +category "ar_SY:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -223,8 +224,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN index 9714e4e337..0ad7ec8e33 100644 --- a/localedata/locales/ar_TN +++ b/localedata/locales/ar_TN @@ -28,6 +28,7 @@ category "ar_TN:2000";LC_PAPER category "ar_TN:2000";LC_NAME category "ar_TN:2000";LC_ADDRESS category "ar_TN:2000";LC_TELEPHONE +category "ar_TN:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -206,8 +207,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE index 0413752eb2..11ea3f5a4b 100644 --- a/localedata/locales/ar_YE +++ b/localedata/locales/ar_YE @@ -28,6 +28,7 @@ category "ar_YE:2000";LC_PAPER category "ar_YE:2000";LC_NAME category "ar_YE:2000";LC_ADDRESS category "ar_YE:2000";LC_TELEPHONE +category "ar_YE:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -204,8 +205,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN index b7288b72ca..1e3e4d7340 100644 --- a/localedata/locales/as_IN +++ b/localedata/locales/as_IN @@ -28,6 +28,7 @@ category "as_IN:2000";LC_PAPER category "as_IN:2000";LC_NAME category "as_IN:2000";LC_ADDRESS category "as_IN:2000";LC_TELEPHONE +category "as_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION %%%%%%%%%%%%% @@ -177,5 +178,6 @@ END LC_TELEPHONE %%%%%%%%%%%%% LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ast_ES b/localedata/locales/ast_ES index 967f5471d4..5c7dc644ab 100644 --- a/localedata/locales/ast_ES +++ b/localedata/locales/ast_ES @@ -41,6 +41,7 @@ category "ast_ES:2000";LC_PAPER category "ast_ES:2000";LC_NAME category "ast_ES:2000";LC_ADDRESS category "ast_ES:2000";LC_TELEPHONE +category "ast_ES:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -122,7 +123,8 @@ copy "es_ES" END LC_TELEPHONE LC_MEASUREMENT -copy "es_ES" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ayc_PE b/localedata/locales/ayc_PE index a65dff0570..f77c25c768 100644 --- a/localedata/locales/ayc_PE +++ b/localedata/locales/ayc_PE @@ -172,6 +172,7 @@ copy "es_PE" END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ index 0dd3de14e2..c02c858970 100644 --- a/localedata/locales/az_AZ +++ b/localedata/locales/az_AZ @@ -283,6 +283,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY index e64867980c..df1d63c7c4 100644 --- a/localedata/locales/be_BY +++ b/localedata/locales/be_BY @@ -39,7 +39,7 @@ category "be_BY:2000";LC_PAPER category "be_BY:2000";LC_NAME category "be_BY:2000";LC_ADDRESS category "be_BY:2000";LC_TELEPHONE - +category "be_BY:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -162,8 +162,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/be_BY@latin b/localedata/locales/be_BY@latin index 6dbbfada8d..7616e5e489 100644 --- a/localedata/locales/be_BY@latin +++ b/localedata/locales/be_BY@latin @@ -39,6 +39,7 @@ category "be_BY@latin:2000";LC_PAPER category "be_BY@latin:2000";LC_NAME category "be_BY@latin:2000";LC_ADDRESS category "be_BY@latin:2000";LC_TELEPHONE +category "be_BY@latin:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -143,5 +144,6 @@ copy "be_BY" END LC_TELEPHONE LC_MEASUREMENT -copy "be_BY" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/bem_ZM b/localedata/locales/bem_ZM index ddf36a6848..9ce6c42616 100644 --- a/localedata/locales/bem_ZM +++ b/localedata/locales/bem_ZM @@ -140,7 +140,8 @@ width 210 END LC_PAPER LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ index 5c1f7d8f80..f793740fcc 100644 --- a/localedata/locales/ber_DZ +++ b/localedata/locales/ber_DZ @@ -259,6 +259,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ber_MA b/localedata/locales/ber_MA index 5f285a1736..fbafdd2b2a 100644 --- a/localedata/locales/ber_MA +++ b/localedata/locales/ber_MA @@ -179,6 +179,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG index 9316d10625..de461bdff9 100644 --- a/localedata/locales/bg_BG +++ b/localedata/locales/bg_BG @@ -37,6 +37,7 @@ category "bg_BG:2000";LC_PAPER category "bg_BG:2000";LC_NAME category "bg_BG:2000";LC_ADDRESS category "bg_BG:2000";LC_TELEPHONE +category "bg_BG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -280,5 +281,6 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN index 54028b9628..12a87dd566 100644 --- a/localedata/locales/bho_IN +++ b/localedata/locales/bho_IN @@ -29,7 +29,7 @@ category "bho_IN:2011";LC_PAPER category "bho_IN:2011";LC_NAME category "bho_IN:2011";LC_ADDRESS category "bho_IN:2011";LC_TELEPHONE - +category "bho_IN:2011";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -170,5 +170,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD index 58842d6bd4..b684aa07d5 100644 --- a/localedata/locales/bn_BD +++ b/localedata/locales/bn_BD @@ -144,8 +144,8 @@ yesstr "" nostr "" END LC_MESSAGES -% Metric Measurement system (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN index ddf3cf2513..5f99da4dff 100644 --- a/localedata/locales/bn_IN +++ b/localedata/locales/bn_IN @@ -29,7 +29,7 @@ category "bn_IN:2000";LC_PAPER category "bn_IN:2000";LC_NAME category "bn_IN:2000";LC_ADDRESS category "bn_IN:2000";LC_TELEPHONE - +category "bn_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -198,5 +198,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN index fab02ae0a3..d813c103ae 100644 --- a/localedata/locales/bo_CN +++ b/localedata/locales/bo_CN @@ -28,7 +28,7 @@ category "bo_CN:2007";LC_PAPER category "bo_CN:2007";LC_NAME category "bo_CN:2007";LC_ADDRESS category "bo_CN:2007";LC_TELEPHONE - +category "bo_CN:2007";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -139,7 +139,8 @@ copy "zh_CN" END LC_PAPER LC_MEASUREMENT -copy "zh_CN" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN index 73a9084ddb..8ab793c833 100644 --- a/localedata/locales/bo_IN +++ b/localedata/locales/bo_IN @@ -28,7 +28,7 @@ category "bo_IN:2007";LC_PAPER category "bo_IN:2007";LC_NAME category "bo_IN:2007";LC_ADDRESS category "bo_IN:2007";LC_TELEPHONE - +category "bo_IN:2007";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -65,7 +65,8 @@ copy "hi_IN" END LC_PAPER LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR index 564212de6e..6a4b66608f 100644 --- a/localedata/locales/br_FR +++ b/localedata/locales/br_FR @@ -150,6 +150,7 @@ copy "fr_FR" END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/br_FR@euro b/localedata/locales/br_FR@euro index a28fcf61d2..db20b80e83 100644 --- a/localedata/locales/br_FR@euro +++ b/localedata/locales/br_FR@euro @@ -34,7 +34,7 @@ category "br_FR@euro:2000";LC_PAPER category "br_FR@euro:2000";LC_NAME category "br_FR@euro:2000";LC_ADDRESS category "br_FR@euro:2000";LC_TELEPHONE - +category "br_FR@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "br_FR" END LC_TELEPHONE LC_MEASUREMENT -copy "br_FR" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN index ed79fe4f46..98b7f44a60 100644 --- a/localedata/locales/brx_IN +++ b/localedata/locales/brx_IN @@ -28,7 +28,7 @@ category "brx_IN:2011";LC_PAPER category "brx_IN:2011";LC_NAME category "brx_IN:2011";LC_ADDRESS category "brx_IN:2011";LC_TELEPHONE - +category "brx_IN:2011";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -192,5 +192,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA index c4d37d7dc7..dfa339c7d6 100644 --- a/localedata/locales/bs_BA +++ b/localedata/locales/bs_BA @@ -216,6 +216,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER index ff4061f921..299a36ab8b 100644 --- a/localedata/locales/byn_ER +++ b/localedata/locales/byn_ER @@ -68,7 +68,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ER" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD index 4edb85a8bd..c97ce89b2c 100644 --- a/localedata/locales/ca_AD +++ b/localedata/locales/ca_AD @@ -37,7 +37,7 @@ category "ca_AD:2000";LC_PAPER category "ca_AD:2000";LC_NAME category "ca_AD:2000";LC_ADDRESS category "ca_AD:2000";LC_TELEPHONE - +category "ca_AD:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -75,7 +75,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -copy "ca_ES" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES index 68ffd47766..b8f58757ac 100644 --- a/localedata/locales/ca_ES +++ b/localedata/locales/ca_ES @@ -42,7 +42,7 @@ category "ca_ES:2000";LC_PAPER category "ca_ES:2000";LC_NAME category "ca_ES:2000";LC_ADDRESS category "ca_ES:2000";LC_TELEPHONE - +category "ca_ES:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -156,8 +156,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro index b3e6ecb676..ecccc23f22 100644 --- a/localedata/locales/ca_ES@euro +++ b/localedata/locales/ca_ES@euro @@ -37,7 +37,7 @@ category "ca_ES@euro:2000";LC_PAPER category "ca_ES@euro:2000";LC_NAME category "ca_ES@euro:2000";LC_ADDRESS category "ca_ES@euro:2000";LC_TELEPHONE - +category "ca_ES@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -73,7 +73,8 @@ copy "ca_ES" END LC_TELEPHONE LC_MEASUREMENT -copy "ca_ES" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ca_FR b/localedata/locales/ca_FR index aac4eacbb7..efc2386974 100644 --- a/localedata/locales/ca_FR +++ b/localedata/locales/ca_FR @@ -37,7 +37,7 @@ category "ca_FR:2000";LC_PAPER category "ca_FR:2000";LC_NAME category "ca_FR:2000";LC_ADDRESS category "ca_FR:2000";LC_TELEPHONE - +category "ca_FR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -73,7 +73,8 @@ copy "fr_FR" END LC_TELEPHONE LC_MEASUREMENT -copy "fr_FR" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT index 3865b8809f..1836588d78 100644 --- a/localedata/locales/ca_IT +++ b/localedata/locales/ca_IT @@ -37,7 +37,7 @@ category "ca_IT:2000";LC_PAPER category "ca_IT:2000";LC_NAME category "ca_IT:2000";LC_ADDRESS category "ca_IT:2000";LC_TELEPHONE - +category "ca_IT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -73,7 +73,8 @@ copy "it_IT" END LC_TELEPHONE LC_MEASUREMENT -copy "it_IT" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW index 1ac117cbaa..a332659c1e 100644 --- a/localedata/locales/cmn_TW +++ b/localedata/locales/cmn_TW @@ -162,6 +162,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA index 7bf156d56d..9b701b7521 100644 --- a/localedata/locales/crh_UA +++ b/localedata/locales/crh_UA @@ -213,6 +213,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ index 12fe5008e6..2a7b4fa5af 100644 --- a/localedata/locales/cs_CZ +++ b/localedata/locales/cs_CZ @@ -128,7 +128,7 @@ category "cs_CZ:2000";LC_PAPER category "cs_CZ:2000";LC_NAME category "cs_CZ:2000";LC_ADDRESS category "cs_CZ:2000";LC_TELEPHONE - +category "cs_CZ:2000";LC_MEASUREMENT END LC_IDENTIFICATION %% Poøadí znakù @@ -2472,7 +2472,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/csb_PL b/localedata/locales/csb_PL index 1ee9494d88..27b08b3715 100644 --- a/localedata/locales/csb_PL +++ b/localedata/locales/csb_PL @@ -44,7 +44,7 @@ category "csb_PL:2000";LC_PAPER category "csb_PL:2000";LC_NAME category "csb_PL:2000";LC_ADDRESS category "csb_PL:2000";LC_TELEPHONE - +category "csb_PL:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -198,7 +198,8 @@ copy "pl_PL" END LC_TELEPHONE LC_MEASUREMENT -copy "pl_PL" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU index 0d04cfb39e..120e0d78fc 100644 --- a/localedata/locales/cv_RU +++ b/localedata/locales/cv_RU @@ -42,7 +42,7 @@ category "cv_RU:2000";LC_PAPER category "cv_RU:2000";LC_NAME category "cv_RU:2000";LC_ADDRESS category "cv_RU:2000";LC_TELEPHONE - +category "cv_RU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -226,7 +226,8 @@ copy "ru_RU" END LC_TELEPHONE LC_MEASUREMENT -copy "ru_RU" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB index 3005a63e0a..66298e03ea 100644 --- a/localedata/locales/cy_GB +++ b/localedata/locales/cy_GB @@ -57,7 +57,8 @@ copy "en_GB" END LC_TELEPHONE LC_MEASUREMENT -copy "en_GB" +% metric +measurement 1 END LC_MEASUREMENT LC_CTYPE diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK index 2694a91e16..670e209f67 100644 --- a/localedata/locales/da_DK +++ b/localedata/locales/da_DK @@ -51,7 +51,7 @@ category "da_DK:2000";LC_PAPER category "da_DK:2000";LC_NAME category "da_DK:2000";LC_ADDRESS category "da_DK:2000";LC_TELEPHONE - +category "da_DK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -234,8 +234,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT index 185da1aa86..802e8651cb 100644 --- a/localedata/locales/de_AT +++ b/localedata/locales/de_AT @@ -41,7 +41,7 @@ category "de_AT:2000";LC_PAPER category "de_AT:2000";LC_NAME category "de_AT:2000";LC_ADDRESS category "de_AT:2000";LC_TELEPHONE - +category "de_AT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -138,7 +138,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/de_AT@euro b/localedata/locales/de_AT@euro index 9604b255c5..2a2d47f39b 100644 --- a/localedata/locales/de_AT@euro +++ b/localedata/locales/de_AT@euro @@ -41,7 +41,7 @@ category "de_AT@euro:2000";LC_PAPER category "de_AT@euro:2000";LC_NAME category "de_AT@euro:2000";LC_ADDRESS category "de_AT@euro:2000";LC_TELEPHONE - +category "de_AT@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -78,7 +78,8 @@ copy "de_AT" END LC_TELEPHONE LC_MEASUREMENT -copy "de_AT" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE index d7001e0258..3f50dec77d 100644 --- a/localedata/locales/de_BE +++ b/localedata/locales/de_BE @@ -43,7 +43,7 @@ category "de_BE:2000";LC_PAPER category "de_BE:2000";LC_NAME category "de_BE:2000";LC_ADDRESS category "de_BE:2000";LC_TELEPHONE - +category "de_BE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -132,7 +132,8 @@ copy "fr_BE" END LC_TELEPHONE LC_MEASUREMENT -copy "fr_BE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro index d9c4188e7a..a0d299c912 100644 --- a/localedata/locales/de_BE@euro +++ b/localedata/locales/de_BE@euro @@ -35,7 +35,7 @@ category "de_BE@euro:2000";LC_PAPER category "de_BE@euro:2000";LC_NAME category "de_BE@euro:2000";LC_ADDRESS category "de_BE@euro:2000";LC_TELEPHONE - +category "de_BE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -71,7 +71,8 @@ copy "de_BE" END LC_TELEPHONE LC_MEASUREMENT -copy "de_BE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH index 0e437674b7..456eae6231 100644 --- a/localedata/locales/de_CH +++ b/localedata/locales/de_CH @@ -42,7 +42,7 @@ category "de_CH:2000";LC_PAPER category "de_CH:2000";LC_NAME category "de_CH:2000";LC_ADDRESS category "de_CH:2000";LC_TELEPHONE - +category "de_CH:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -140,8 +140,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE index bfa7fc07b0..8d8a3b8e38 100644 --- a/localedata/locales/de_DE +++ b/localedata/locales/de_DE @@ -27,7 +27,7 @@ category "de_DE:2000";LC_PAPER category "de_DE:2000";LC_NAME category "de_DE:2000";LC_ADDRESS category "de_DE:2000";LC_TELEPHONE - +category "de_DE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -212,5 +212,6 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/de_DE@euro b/localedata/locales/de_DE@euro index 7e9c97a733..cc7e073385 100644 --- a/localedata/locales/de_DE@euro +++ b/localedata/locales/de_DE@euro @@ -27,7 +27,7 @@ category "de_DE@euro:2000";LC_PAPER category "de_DE@euro:2000";LC_NAME category "de_DE@euro:2000";LC_ADDRESS category "de_DE@euro:2000";LC_TELEPHONE - +category "de_DE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -75,5 +75,6 @@ copy "de_DE" END LC_TELEPHONE LC_MEASUREMENT -copy "de_DE" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU index 5f80739ee1..d25ce1b241 100644 --- a/localedata/locales/de_LU +++ b/localedata/locales/de_LU @@ -43,7 +43,7 @@ category "de_LU:2000";LC_PAPER category "de_LU:2000";LC_NAME category "de_LU:2000";LC_ADDRESS category "de_LU:2000";LC_TELEPHONE - +category "de_LU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -137,8 +137,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro index caff758712..c267677f60 100644 --- a/localedata/locales/de_LU@euro +++ b/localedata/locales/de_LU@euro @@ -35,7 +35,7 @@ category "de_LU:2000@euro";LC_PAPER category "de_LU:2000@euro";LC_NAME category "de_LU:2000@euro";LC_ADDRESS category "de_LU:2000@euro";LC_TELEPHONE - +category "de_LU:2000@euro";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -71,7 +71,8 @@ copy "de_LU" END LC_TELEPHONE LC_MEASUREMENT -copy "de_LU" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN index 47e90792bd..6ae0ffb78e 100644 --- a/localedata/locales/doi_IN +++ b/localedata/locales/doi_IN @@ -27,7 +27,7 @@ category "doi_IN:2012";LC_PAPER category "doi_IN:2012";LC_NAME category "doi_IN:2012";LC_ADDRESS category "doi_IN:2012";LC_TELEPHONE - +category "doi_IN:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -182,5 +182,6 @@ copy "hi_IN" END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV index 4876d14903..b0e9ef25f0 100644 --- a/localedata/locales/dv_MV +++ b/localedata/locales/dv_MV @@ -38,7 +38,7 @@ category "dv_MV:2006";LC_PAPER category "dv_MV:2006";LC_NAME category "dv_MV:2006";LC_ADDRESS category "dv_MV:2006";LC_TELEPHONE - +category "dv_MV:2006";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -163,7 +163,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT index 84743465ad..d6443b49de 100644 --- a/localedata/locales/dz_BT +++ b/localedata/locales/dz_BT @@ -31,6 +31,7 @@ date "2004-09-03" % category "dz_BT:2004";LC_IDENTIFICATION category "dz_BT:2004";LC_CTYPE +category "dz_BT:2004";LC_TIME category "dz_BT:2004";LC_COLLATE category "dz_BT:2004";LC_NUMERIC category "dz_BT:2004";LC_MONETARY @@ -39,7 +40,7 @@ category "dz_BT:2004";LC_PAPER category "dz_BT:2004";LC_NAME category "dz_BT:2004";LC_ADDRESS category "dz_BT:2004";LC_TELEPHONE - +category "dz_BT:2004";LC_MEASUREMENT END LC_IDENTIFICATION %%%%%%%%%%%%%%%% @@ -631,8 +632,8 @@ width 210 END LC_PAPER LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY index 58cbb14473..a7c671c13b 100644 --- a/localedata/locales/el_CY +++ b/localedata/locales/el_CY @@ -28,7 +28,7 @@ category "el_CY:2000";LC_PAPER category "el_CY:2000";LC_NAME category "el_CY:2000";LC_ADDRESS category "el_CY:2000";LC_TELEPHONE - +category "el_CY:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -83,8 +83,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR index ad18cef7e3..53d2ec41dd 100644 --- a/localedata/locales/el_GR +++ b/localedata/locales/el_GR @@ -42,7 +42,7 @@ category "el_GR:2000";LC_PAPER category "el_GR:2000";LC_NAME category "el_GR:2000";LC_ADDRESS category "el_GR:2000";LC_TELEPHONE - +category "el_GR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -158,8 +158,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/el_GR@euro b/localedata/locales/el_GR@euro index 2a37cf640d..3045829b9f 100644 --- a/localedata/locales/el_GR@euro +++ b/localedata/locales/el_GR@euro @@ -25,7 +25,7 @@ category "el_GR@euro:2000";LC_PAPER category "el_GR@euro:2000";LC_NAME category "el_GR@euro:2000";LC_ADDRESS category "el_GR@euro:2000";LC_TELEPHONE - +category "el_GR@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -73,5 +73,6 @@ copy "el_GR" END LC_TELEPHONE LC_MEASUREMENT -copy "el_GR" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG index 043d2a2300..52efb358bf 100644 --- a/localedata/locales/en_AG +++ b/localedata/locales/en_AG @@ -27,7 +27,7 @@ category "en_AG:2008";LC_PAPER category "en_AG:2008";LC_NAME category "en_AG:2008";LC_ADDRESS category "en_AG:2008";LC_TELEPHONE - +category "en_AG:2008";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -101,5 +101,6 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -copy "en_US" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU index eeeeef2e79..4c86de2225 100644 --- a/localedata/locales/en_AU +++ b/localedata/locales/en_AU @@ -43,7 +43,7 @@ category "en_AU:2000";LC_PAPER category "en_AU:2000";LC_NAME category "en_AU:2000";LC_ADDRESS category "en_AU:2000";LC_TELEPHONE - +category "en_AU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -139,8 +139,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW index f3b0f02b27..59ac215772 100644 --- a/localedata/locales/en_BW +++ b/localedata/locales/en_BW @@ -40,7 +40,7 @@ category "en_BW:2000";LC_PAPER category "en_BW:2000";LC_NAME category "en_BW:2000";LC_ADDRESS category "en_BW:2000";LC_TELEPHONE - +category "en_BW:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -96,8 +96,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA index 74717c6686..a04e96c1b6 100644 --- a/localedata/locales/en_CA +++ b/localedata/locales/en_CA @@ -45,7 +45,7 @@ category "en_CA:2000";LC_PAPER category "en_CA:2000";LC_NAME category "en_CA:2000";LC_ADDRESS category "en_CA:2000";LC_TELEPHONE - +category "en_CA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -161,8 +161,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK index 160097445a..da639dd85a 100644 --- a/localedata/locales/en_DK +++ b/localedata/locales/en_DK @@ -48,7 +48,7 @@ category "en_DK:2000";LC_PAPER category "en_DK:2000";LC_NAME category "en_DK:2000";LC_ADDRESS category "en_DK:2000";LC_TELEPHONE - +category "en_DK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -141,7 +141,8 @@ copy "da_DK" END LC_TELEPHONE LC_MEASUREMENT -copy "da_DK" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB index 88f440a22d..a66e9a1587 100644 --- a/localedata/locales/en_GB +++ b/localedata/locales/en_GB @@ -43,7 +43,7 @@ category "en_GB:2000";LC_PAPER category "en_GB:2000";LC_NAME category "en_GB:2000";LC_ADDRESS category "en_GB:2000";LC_TELEPHONE - +category "en_GB:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -145,7 +145,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK index 653543a33d..bc9b2e429e 100644 --- a/localedata/locales/en_HK +++ b/localedata/locales/en_HK @@ -32,7 +32,7 @@ category "en_HK:2000";LC_PAPER category "en_HK:2000";LC_NAME category "en_HK:2000";LC_ADDRESS category "en_HK:2000";LC_TELEPHONE - +category "en_HK:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -216,8 +216,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE index 568a7e9c40..e2f0fc0e61 100644 --- a/localedata/locales/en_IE +++ b/localedata/locales/en_IE @@ -43,7 +43,7 @@ category "en_IE:2000";LC_PAPER category "en_IE:2000";LC_NAME category "en_IE:2000";LC_ADDRESS category "en_IE:2000";LC_TELEPHONE - +category "en_IE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -137,8 +137,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_IE@euro b/localedata/locales/en_IE@euro index 7f5d518b1c..1d3c5b376d 100644 --- a/localedata/locales/en_IE@euro +++ b/localedata/locales/en_IE@euro @@ -35,7 +35,7 @@ category "en_IE@euro:2000";LC_PAPER category "en_IE@euro:2000";LC_NAME category "en_IE@euro:2000";LC_ADDRESS category "en_IE@euro:2000";LC_TELEPHONE - +category "en_IE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "en_IE" END LC_TELEPHONE LC_MEASUREMENT -copy "en_IE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN index 9205a7b30b..f8f0db5e91 100644 --- a/localedata/locales/en_IN +++ b/localedata/locales/en_IN @@ -29,7 +29,7 @@ category "en_IN:2000";LC_PAPER category "en_IN:2000";LC_NAME category "en_IN:2000";LC_ADDRESS category "en_IN:2000";LC_TELEPHONE - +category "en_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -208,5 +208,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG index f98251e579..364b549a90 100644 --- a/localedata/locales/en_NG +++ b/localedata/locales/en_NG @@ -211,7 +211,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -copy "en_DK" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ index e786f21e0a..9208299543 100644 --- a/localedata/locales/en_NZ +++ b/localedata/locales/en_NZ @@ -43,7 +43,7 @@ category "en_NZ:2000";LC_PAPER category "en_NZ:2000";LC_NAME category "en_NZ:2000";LC_ADDRESS category "en_NZ:2000";LC_TELEPHONE - +category "en_NZ:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -138,8 +138,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH index d8d87bae3f..8badc18f4c 100644 --- a/localedata/locales/en_PH +++ b/localedata/locales/en_PH @@ -31,7 +31,7 @@ category "en_PH:2000";LC_PAPER category "en_PH:2000";LC_NAME category "en_PH:2000";LC_ADDRESS category "en_PH:2000";LC_TELEPHONE - +category "en_PH:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -212,8 +212,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/en_SG b/localedata/locales/en_SG index 467dfa0448..7228582c37 100644 --- a/localedata/locales/en_SG +++ b/localedata/locales/en_SG @@ -29,7 +29,7 @@ category "en_SG:2000";LC_PAPER category "en_SG:2000";LC_NAME category "en_SG:2000";LC_ADDRESS category "en_SG:2000";LC_TELEPHONE - +category "en_SG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -215,8 +215,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/en_US b/localedata/locales/en_US index 4c5fa34de9..fe33d47b2d 100644 --- a/localedata/locales/en_US +++ b/localedata/locales/en_US @@ -27,7 +27,7 @@ category "en_US:2000";LC_PAPER category "en_US:2000";LC_NAME category "en_US:2000";LC_ADDRESS category "en_US:2000";LC_TELEPHONE - +category "en_US:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -183,5 +183,6 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT +% US customary units measurement 2 END LC_MEASUREMENT diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA index 2a6b2ba67d..294b0a3104 100644 --- a/localedata/locales/en_ZA +++ b/localedata/locales/en_ZA @@ -248,7 +248,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/en_ZM b/localedata/locales/en_ZM index 8277032528..e3f811defc 100644 --- a/localedata/locales/en_ZM +++ b/localedata/locales/en_ZM @@ -60,7 +60,8 @@ copy "bem_ZM" END LC_PAPER LC_MEASUREMENT -copy "bem_ZM" +% metric +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW index 24558ed884..431dfd2529 100644 --- a/localedata/locales/en_ZW +++ b/localedata/locales/en_ZW @@ -40,7 +40,7 @@ category "en_ZW:2000";LC_PAPER category "en_ZW:2000";LC_NAME category "en_ZW:2000";LC_ADDRESS category "en_ZW:2000";LC_TELEPHONE - +category "en_ZW:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -95,8 +95,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR index 3eaabd3f95..3acba034c3 100644 --- a/localedata/locales/es_AR +++ b/localedata/locales/es_AR @@ -44,7 +44,7 @@ category "es_AR:2000";LC_PAPER category "es_AR:2000";LC_NAME category "es_AR:2000";LC_ADDRESS category "es_AR:2000";LC_TELEPHONE - +category "es_AR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -138,8 +138,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO index b3544d9e0a..79b37da326 100644 --- a/localedata/locales/es_BO +++ b/localedata/locales/es_BO @@ -44,7 +44,7 @@ category "es_BO:2000";LC_PAPER category "es_BO:2000";LC_NAME category "es_BO:2000";LC_ADDRESS category "es_BO:2000";LC_TELEPHONE - +category "es_BO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -136,8 +136,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL index a40b361b29..f36ece7ab0 100644 --- a/localedata/locales/es_CL +++ b/localedata/locales/es_CL @@ -44,7 +44,7 @@ category "es_CL:2000";LC_PAPER category "es_CL:2000";LC_NAME category "es_CL:2000";LC_ADDRESS category "es_CL:2000";LC_TELEPHONE - +category "es_CL:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -134,8 +134,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO index 31a28e708a..aa0ecaa542 100644 --- a/localedata/locales/es_CO +++ b/localedata/locales/es_CO @@ -44,7 +44,7 @@ category "es_CO:2000";LC_PAPER category "es_CO:2000";LC_NAME category "es_CO:2000";LC_ADDRESS category "es_CO:2000";LC_TELEPHONE - +category "es_CO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -137,8 +137,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR index e42dce27c0..ec478bfab8 100644 --- a/localedata/locales/es_CR +++ b/localedata/locales/es_CR @@ -35,7 +35,7 @@ category "es_CR:2000";LC_PAPER category "es_CR:2000";LC_NAME category "es_CR:2000";LC_ADDRESS category "es_CR:2000";LC_TELEPHONE - +category "es_CR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -132,7 +132,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_CU b/localedata/locales/es_CU index 86de054e7d..66d8867ff8 100644 --- a/localedata/locales/es_CU +++ b/localedata/locales/es_CU @@ -41,7 +41,7 @@ category "es_CU:2000";LC_PAPER category "es_CU:2000";LC_NAME category "es_CU:2000";LC_ADDRESS category "es_CU:2000";LC_TELEPHONE - +category "es_CU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -101,8 +101,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO index 15da7d3d30..41c8f8b76c 100644 --- a/localedata/locales/es_DO +++ b/localedata/locales/es_DO @@ -44,7 +44,7 @@ category "es_DO:2000";LC_PAPER category "es_DO:2000";LC_NAME category "es_DO:2000";LC_ADDRESS category "es_DO:2000";LC_TELEPHONE - +category "es_DO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -138,8 +138,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC index 8292308393..541fe08872 100644 --- a/localedata/locales/es_EC +++ b/localedata/locales/es_EC @@ -44,7 +44,7 @@ category "es_EC:2000";LC_PAPER category "es_EC:2000";LC_NAME category "es_EC:2000";LC_ADDRESS category "es_EC:2000";LC_TELEPHONE - +category "es_EC:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -136,8 +136,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES index a75c01f8f7..095fea8f58 100644 --- a/localedata/locales/es_ES +++ b/localedata/locales/es_ES @@ -44,7 +44,7 @@ category "es_ES:2000";LC_PAPER category "es_ES:2000";LC_NAME category "es_ES:2000";LC_ADDRESS category "es_ES:2000";LC_TELEPHONE - +category "es_ES:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -150,8 +150,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro index 721738e5b7..8ffc7cc1e1 100644 --- a/localedata/locales/es_ES@euro +++ b/localedata/locales/es_ES@euro @@ -35,7 +35,7 @@ category "es_ES@euro:2000";LC_PAPER category "es_ES@euro:2000";LC_NAME category "es_ES@euro:2000";LC_ADDRESS category "es_ES@euro:2000";LC_TELEPHONE - +category "es_ES@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -71,7 +71,8 @@ copy "es_ES" END LC_TELEPHONE LC_MEASUREMENT -copy "es_ES" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT index e17e70e7bd..e4a40f5f17 100644 --- a/localedata/locales/es_GT +++ b/localedata/locales/es_GT @@ -43,7 +43,7 @@ category "es_GT:2000";LC_PAPER category "es_GT:2000";LC_NAME category "es_GT:2000";LC_ADDRESS category "es_GT:2000";LC_TELEPHONE - +category "es_GT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -135,8 +135,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN index 6e0def2e30..e9d69e9798 100644 --- a/localedata/locales/es_HN +++ b/localedata/locales/es_HN @@ -44,7 +44,7 @@ category "es_HN:2000";LC_PAPER category "es_HN:2000";LC_NAME category "es_HN:2000";LC_ADDRESS category "es_HN:2000";LC_TELEPHONE - +category "es_HN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -138,8 +138,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX index faf9626fbb..c82190df2c 100644 --- a/localedata/locales/es_MX +++ b/localedata/locales/es_MX @@ -44,7 +44,7 @@ category "es_MX:2000";LC_PAPER category "es_MX:2000";LC_NAME category "es_MX:2000";LC_ADDRESS category "es_MX:2000";LC_TELEPHONE - +category "es_MX:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -135,8 +135,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI index 7e109b32bf..29f42cba6a 100644 --- a/localedata/locales/es_NI +++ b/localedata/locales/es_NI @@ -35,7 +35,7 @@ category "es_NI:2000";LC_PAPER category "es_NI:2000";LC_NAME category "es_NI:2000";LC_ADDRESS category "es_NI:2000";LC_TELEPHONE - +category "es_NI:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -129,8 +129,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA index 702af0bc95..ae3be46fbe 100644 --- a/localedata/locales/es_PA +++ b/localedata/locales/es_PA @@ -44,7 +44,7 @@ category "es_PA:2000";LC_PAPER category "es_PA:2000";LC_NAME category "es_PA:2000";LC_ADDRESS category "es_PA:2000";LC_TELEPHONE - +category "es_PA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -135,8 +135,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE index e3ab3d6ed0..f2095e3219 100644 --- a/localedata/locales/es_PE +++ b/localedata/locales/es_PE @@ -44,7 +44,7 @@ category "es_PE:2000";LC_PAPER category "es_PE:2000";LC_NAME category "es_PE:2000";LC_ADDRESS category "es_PE:2000";LC_TELEPHONE - +category "es_PE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -136,8 +136,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR index 3f1368456f..7cc1197d06 100644 --- a/localedata/locales/es_PR +++ b/localedata/locales/es_PR @@ -35,7 +35,7 @@ category "es_PR:2000";LC_PAPER category "es_PR:2000";LC_NAME category "es_PR:2000";LC_ADDRESS category "es_PR:2000";LC_TELEPHONE - +category "es_PR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -126,6 +126,7 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT +% US customary units measurement 2 END LC_MEASUREMENT diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY index 11916c4a71..51740079be 100644 --- a/localedata/locales/es_PY +++ b/localedata/locales/es_PY @@ -44,7 +44,7 @@ category "es_PY:2000";LC_PAPER category "es_PY:2000";LC_NAME category "es_PY:2000";LC_ADDRESS category "es_PY:2000";LC_TELEPHONE - +category "es_PY:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -135,8 +135,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV index 8b30284d2d..4099974d0e 100644 --- a/localedata/locales/es_SV +++ b/localedata/locales/es_SV @@ -44,7 +44,7 @@ category "es_SV:2000";LC_PAPER category "es_SV:2000";LC_NAME category "es_SV:2000";LC_ADDRESS category "es_SV:2000";LC_TELEPHONE - +category "es_SV:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -136,8 +136,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_US b/localedata/locales/es_US index 5c1b74028e..49407df9f2 100644 --- a/localedata/locales/es_US +++ b/localedata/locales/es_US @@ -44,7 +44,7 @@ category "es_US:2000";LC_PAPER category "es_US:2000";LC_NAME category "es_US:2000";LC_ADDRESS category "es_US:2000";LC_TELEPHONE - +category "es_US:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -187,6 +187,7 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT +% US customary units measurement 2 END LC_MEASUREMENT diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY index 980ae94ffd..fb44ef6199 100644 --- a/localedata/locales/es_UY +++ b/localedata/locales/es_UY @@ -44,7 +44,7 @@ category "es_UY:2000";LC_PAPER category "es_UY:2000";LC_NAME category "es_UY:2000";LC_ADDRESS category "es_UY:2000";LC_TELEPHONE - +category "es_UY:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -135,8 +135,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE index 2784cb5fff..f5a9a28656 100644 --- a/localedata/locales/es_VE +++ b/localedata/locales/es_VE @@ -44,7 +44,7 @@ category "es_VE:2000";LC_PAPER category "es_VE:2000";LC_NAME category "es_VE:2000";LC_ADDRESS category "es_VE:2000";LC_TELEPHONE - +category "es_VE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -135,8 +135,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE index c8bdc6b93d..dd905b9d7d 100644 --- a/localedata/locales/et_EE +++ b/localedata/locales/et_EE @@ -51,7 +51,7 @@ category "et_EE:2000";LC_PAPER category "et_EE:2000";LC_NAME category "et_EE:2000";LC_ADDRESS category "et_EE:2000";LC_TELEPHONE - +category "et_EE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2221,8 +2221,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES index 7c5621024a..cd07cb3d46 100644 --- a/localedata/locales/eu_ES +++ b/localedata/locales/eu_ES @@ -47,7 +47,7 @@ category "eu_ES:2000";LC_PAPER category "eu_ES:2000";LC_NAME category "eu_ES:2000";LC_ADDRESS category "eu_ES:2000";LC_TELEPHONE - +category "eu_ES:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -149,8 +149,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro index 356bf622d7..1d2ac5a0dc 100644 --- a/localedata/locales/eu_ES@euro +++ b/localedata/locales/eu_ES@euro @@ -36,7 +36,7 @@ category "eu_ES@euro:2000";LC_PAPER category "eu_ES@euro:2000";LC_NAME category "eu_ES@euro:2000";LC_ADDRESS category "eu_ES@euro:2000";LC_TELEPHONE - +category "eu_ES@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -86,7 +86,8 @@ copy "eu_ES" END LC_TELEPHONE LC_MEASUREMENT -copy "eu_ES" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR index 242978774f..c2e493e053 100644 --- a/localedata/locales/fa_IR +++ b/localedata/locales/fa_IR @@ -42,7 +42,7 @@ category "fa_IR:2005";LC_PAPER category "fa_IR:2005";LC_NAME category "fa_IR:2005";LC_ADDRESS category "fa_IR:2005";LC_TELEPHONE - +category "fa_IR:2005";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -488,5 +488,6 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ff_SN b/localedata/locales/ff_SN index 0c68401d7b..d3adda290c 100644 --- a/localedata/locales/ff_SN +++ b/localedata/locales/ff_SN @@ -137,7 +137,8 @@ width 210 END LC_PAPER LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI index bd6805a257..bc79487939 100644 --- a/localedata/locales/fi_FI +++ b/localedata/locales/fi_FI @@ -230,7 +230,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro index 8c610ccc61..76f78ee0af 100644 --- a/localedata/locales/fi_FI@euro +++ b/localedata/locales/fi_FI@euro @@ -72,7 +72,8 @@ copy "fi_FI" END LC_TELEPHONE LC_MEASUREMENT -copy "fi_FI" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH index b2c70a53cd..158b133244 100644 --- a/localedata/locales/fil_PH +++ b/localedata/locales/fil_PH @@ -154,6 +154,7 @@ copy "tl_PH" END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO index 0a84b2b4eb..e447a2a8a3 100644 --- a/localedata/locales/fo_FO +++ b/localedata/locales/fo_FO @@ -46,7 +46,7 @@ category "fo_FO:2000";LC_PAPER category "fo_FO:2000";LC_NAME category "fo_FO:2000";LC_ADDRESS category "fo_FO:2000";LC_TELEPHONE - +category "fo_FO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -124,8 +124,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE index 9ac30a283a..5759d1edd0 100644 --- a/localedata/locales/fr_BE +++ b/localedata/locales/fr_BE @@ -42,7 +42,7 @@ category "fr_BE:2000";LC_PAPER category "fr_BE:2000";LC_NAME category "fr_BE:2000";LC_ADDRESS category "fr_BE:2000";LC_TELEPHONE - +category "fr_BE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -141,8 +141,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_BE@euro b/localedata/locales/fr_BE@euro index 08f9298a9a..4c8590568e 100644 --- a/localedata/locales/fr_BE@euro +++ b/localedata/locales/fr_BE@euro @@ -35,7 +35,7 @@ category "fr_BE@euro:2000";LC_PAPER category "fr_BE@euro:2000";LC_NAME category "fr_BE@euro:2000";LC_ADDRESS category "fr_BE@euro:2000";LC_TELEPHONE - +category "fr_BE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "fr_BE" END LC_TELEPHONE LC_MEASUREMENT -copy "fr_BE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA index a86f603c8b..2d8715d147 100644 --- a/localedata/locales/fr_CA +++ b/localedata/locales/fr_CA @@ -43,7 +43,7 @@ category "fr_CA:2000";LC_PAPER category "fr_CA:2000";LC_NAME category "fr_CA:2000";LC_ADDRESS category "fr_CA:2000";LC_TELEPHONE - +category "fr_CA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -129,7 +129,8 @@ copy "en_CA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_CA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH index da8dd76c86..972a16c0d2 100644 --- a/localedata/locales/fr_CH +++ b/localedata/locales/fr_CH @@ -43,7 +43,7 @@ category "fr_CH:2000";LC_PAPER category "fr_CH:2000";LC_NAME category "fr_CH:2000";LC_ADDRESS category "fr_CH:2000";LC_TELEPHONE - +category "fr_CH:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -121,8 +121,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR index f5b5b04d07..b654df1098 100644 --- a/localedata/locales/fr_FR +++ b/localedata/locales/fr_FR @@ -44,7 +44,7 @@ category "fr_FR:2000";LC_PAPER category "fr_FR:2000";LC_NAME category "fr_FR:2000";LC_ADDRESS category "fr_FR:2000";LC_TELEPHONE - +category "fr_FR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -160,7 +160,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_FR@euro b/localedata/locales/fr_FR@euro index 5f858fdddd..c1ae9d8245 100644 --- a/localedata/locales/fr_FR@euro +++ b/localedata/locales/fr_FR@euro @@ -34,7 +34,7 @@ category "fr_FR@euro:2000";LC_PAPER category "fr_FR@euro:2000";LC_NAME category "fr_FR@euro:2000";LC_ADDRESS category "fr_FR@euro:2000";LC_TELEPHONE - +category "fr_FR@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "fr_FR" END LC_TELEPHONE LC_MEASUREMENT -copy "fr_FR" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU index 5d76dc7461..228878c111 100644 --- a/localedata/locales/fr_LU +++ b/localedata/locales/fr_LU @@ -42,7 +42,7 @@ category "fr_LU:2000";LC_PAPER category "fr_LU:2000";LC_NAME category "fr_LU:2000";LC_ADDRESS category "fr_LU:2000";LC_TELEPHONE - +category "fr_LU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -138,8 +138,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro index 014ff1d5c4..1c2828ee8a 100644 --- a/localedata/locales/fr_LU@euro +++ b/localedata/locales/fr_LU@euro @@ -35,7 +35,7 @@ category "fr_LU@euro:2000";LC_PAPER category "fr_LU@euro:2000";LC_NAME category "fr_LU@euro:2000";LC_ADDRESS category "fr_LU@euro:2000";LC_TELEPHONE - +category "fr_LU@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "fr_LU" END LC_TELEPHONE LC_MEASUREMENT -copy "fr_LU" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fur_IT b/localedata/locales/fur_IT index df51976fca..544aa4559a 100644 --- a/localedata/locales/fur_IT +++ b/localedata/locales/fur_IT @@ -35,7 +35,7 @@ category "fur_IT:2000";LC_PAPER category "fur_IT:2000";LC_NAME category "fur_IT:2000";LC_ADDRESS category "fur_IT:2000";LC_TELEPHONE - +category "fur_IT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -124,7 +124,8 @@ copy "it_IT" END LC_TELEPHONE LC_MEASUREMENT -copy "it_IT" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE index d4a861470f..e8f1a9a539 100644 --- a/localedata/locales/fy_DE +++ b/localedata/locales/fy_DE @@ -89,7 +89,8 @@ copy "de_DE" END LC_TELEPHONE LC_MEASUREMENT -copy "de_DE" +% metric +measurement 1 END LC_MEASUREMENT LC_NUMERIC diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL index c6be0b1f24..5d8afbcc32 100644 --- a/localedata/locales/fy_NL +++ b/localedata/locales/fy_NL @@ -105,7 +105,8 @@ copy "nl_NL" END LC_MONETARY LC_MEASUREMENT -copy "nl_NL" +% metric +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE index dda0009301..5ee2380ae8 100644 --- a/localedata/locales/ga_IE +++ b/localedata/locales/ga_IE @@ -40,7 +40,7 @@ category "ga_IE:2000";LC_PAPER category "ga_IE:2000";LC_NAME category "ga_IE:2000";LC_ADDRESS category "ga_IE:2000";LC_TELEPHONE - +category "ga_IE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -140,8 +140,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ga_IE@euro b/localedata/locales/ga_IE@euro index c9474a594d..99422e31d0 100644 --- a/localedata/locales/ga_IE@euro +++ b/localedata/locales/ga_IE@euro @@ -34,7 +34,7 @@ category "ga_IE@euro:2000";LC_PAPER category "ga_IE@euro:2000";LC_NAME category "ga_IE@euro:2000";LC_ADDRESS category "ga_IE@euro:2000";LC_TELEPHONE - +category "ga_IE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -70,7 +70,8 @@ copy "ga_IE" END LC_TELEPHONE LC_MEASUREMENT -copy "ga_IE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB index f2d9e81be4..41943f522f 100644 --- a/localedata/locales/gd_GB +++ b/localedata/locales/gd_GB @@ -121,7 +121,8 @@ copy "en_GB" END LC_PAPER LC_MEASUREMENT -copy "en_GB" +% metric +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER index 5baff5c357..fb8f7ca7d1 100644 --- a/localedata/locales/gez_ER +++ b/localedata/locales/gez_ER @@ -70,7 +70,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ER" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/gez_ER@abegede b/localedata/locales/gez_ER@abegede index 9b938f6276..f3e0b9afc4 100644 --- a/localedata/locales/gez_ER@abegede +++ b/localedata/locales/gez_ER@abegede @@ -115,7 +115,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "gez_ER" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET index b5a6cc6a4b..13cd5f4e63 100644 --- a/localedata/locales/gez_ET +++ b/localedata/locales/gez_ET @@ -70,7 +70,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/gez_ET@abegede b/localedata/locales/gez_ET@abegede index 3a97c55b72..3377c1e550 100644 --- a/localedata/locales/gez_ET@abegede +++ b/localedata/locales/gez_ET@abegede @@ -71,7 +71,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "gez_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES index 6acf5050b2..20ee0c2e61 100644 --- a/localedata/locales/gl_ES +++ b/localedata/locales/gl_ES @@ -43,7 +43,7 @@ category "gl_ES:2000";LC_PAPER category "gl_ES:2000";LC_NAME category "gl_ES:2000";LC_ADDRESS category "gl_ES:2000";LC_TELEPHONE - +category "gl_ES:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -139,8 +139,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/gl_ES@euro b/localedata/locales/gl_ES@euro index 534a092bf4..20a3341969 100644 --- a/localedata/locales/gl_ES@euro +++ b/localedata/locales/gl_ES@euro @@ -36,7 +36,7 @@ category "gl_ES@euro:2000";LC_PAPER category "gl_ES@euro:2000";LC_NAME category "gl_ES@euro:2000";LC_ADDRESS category "gl_ES@euro:2000";LC_TELEPHONE - +category "gl_ES@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -72,7 +72,8 @@ copy "gl_ES" END LC_TELEPHONE LC_MEASUREMENT -copy "gl_ES" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN index 4e4f5c647c..0fae48c6d3 100644 --- a/localedata/locales/gu_IN +++ b/localedata/locales/gu_IN @@ -29,7 +29,7 @@ category "gu_IN:2000";LC_PAPER category "gu_IN:2000";LC_NAME category "gu_IN:2000";LC_ADDRESS category "gu_IN:2000";LC_TELEPHONE - +category "gu_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -232,5 +232,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB index 40ab187538..11c59e66eb 100644 --- a/localedata/locales/gv_GB +++ b/localedata/locales/gv_GB @@ -45,7 +45,7 @@ category "gv_GB:2000";LC_PAPER category "gv_GB:2000";LC_NAME category "gv_GB:2000";LC_ADDRESS category "gv_GB:2000";LC_TELEPHONE - +category "gv_GB:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -154,8 +154,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG index 8c431cc8e9..6ea1a88a4b 100644 --- a/localedata/locales/ha_NG +++ b/localedata/locales/ha_NG @@ -38,7 +38,7 @@ category "ha_NG:2000";LC_PAPER category "ha_NG:2000";LC_NAME category "ha_NG:2000";LC_ADDRESS category "ha_NG:2000";LC_TELEPHONE - +category "ha_NG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -227,7 +227,8 @@ copy "en_NG" END LC_PAPER LC_MEASUREMENT -copy "en_NG" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW index 1886e5a359..454ebadda6 100644 --- a/localedata/locales/hak_TW +++ b/localedata/locales/hak_TW @@ -161,6 +161,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL index b2539a1c25..fe8125bed9 100644 --- a/localedata/locales/he_IL +++ b/localedata/locales/he_IL @@ -47,7 +47,7 @@ category "he_IL:2000";LC_PAPER category "he_IL:2000";LC_NAME category "he_IL:2000";LC_ADDRESS category "he_IL:2000";LC_TELEPHONE - +category "he_IL:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -144,8 +144,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN index 047f47f21d..c41a26418b 100644 --- a/localedata/locales/hi_IN +++ b/localedata/locales/hi_IN @@ -28,7 +28,7 @@ category "hi_IN:2000";LC_PAPER category "hi_IN:2000";LC_NAME category "hi_IN:2000";LC_ADDRESS category "hi_IN:2000";LC_TELEPHONE - +category "hi_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -236,7 +236,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN index 6a80b69401..c9f8163bfd 100644 --- a/localedata/locales/hne_IN +++ b/localedata/locales/hne_IN @@ -28,7 +28,7 @@ category "hne_IN:2008";LC_PAPER category "hne_IN:2008";LC_NAME category "hne_IN:2008";LC_ADDRESS category "hne_IN:2008";LC_TELEPHONE - +category "hne_IN:2008";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -176,5 +176,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR index 7dccab38ca..5d29968d4a 100644 --- a/localedata/locales/hr_HR +++ b/localedata/locales/hr_HR @@ -44,7 +44,7 @@ category "hr_HR:2000";LC_PAPER category "hr_HR:2000";LC_NAME category "hr_HR:2000";LC_ADDRESS category "hr_HR:2000";LC_TELEPHONE - +category "hr_HR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2229,8 +2229,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE index fd3217af73..db130fd9e1 100644 --- a/localedata/locales/hsb_DE +++ b/localedata/locales/hsb_DE @@ -31,7 +31,7 @@ category "i18n:1997";LC_PAPER category "i18n:1997";LC_NAME category "i18n:1997";LC_ADDRESS category "i18n:1997";LC_TELEPHONE - +category "i18n:1997";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2187,7 +2187,8 @@ copy "de_DE" END LC_TELEPHONE LC_MEASUREMENT -copy "de_DE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU index a6169d7396..0dfae822fa 100644 --- a/localedata/locales/hu_HU +++ b/localedata/locales/hu_HU @@ -55,7 +55,7 @@ category "hu_HU:2000";LC_PAPER category "hu_HU:2000";LC_NAME category "hu_HU:2000";LC_ADDRESS category "hu_HU:2000";LC_TELEPHONE - +category "hu_HU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -566,8 +566,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM index 1e4649a34f..5610889d6d 100644 --- a/localedata/locales/hy_AM +++ b/localedata/locales/hy_AM @@ -156,8 +156,8 @@ yesexpr "" noexpr "" END LC_MESSAGES -% Metric Measurement system (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ia_FR b/localedata/locales/ia_FR index b6cd1fcba6..722cc6e796 100644 --- a/localedata/locales/ia_FR +++ b/localedata/locales/ia_FR @@ -106,7 +106,8 @@ nostr "" END LC_MESSAGES LC_MEASUREMENT -copy "fr_FR" +% metric +measurement 1 END LC_MEASUREMENT LC_PAPER diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID index 35cf7b1a19..668f25d079 100644 --- a/localedata/locales/id_ID +++ b/localedata/locales/id_ID @@ -43,7 +43,7 @@ category "id_ID:2000";LC_PAPER category "id_ID:2000";LC_NAME category "id_ID:2000";LC_ADDRESS category "id_ID:2000";LC_TELEPHONE - +category "id_ID:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -141,8 +141,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG index eb6fc3872d..8b1a48ba85 100644 --- a/localedata/locales/ig_NG +++ b/localedata/locales/ig_NG @@ -38,7 +38,7 @@ category "ig_NG:2000";LC_PAPER category "ig_NG:2000";LC_NAME category "ig_NG:2000";LC_ADDRESS category "ig_NG:2000";LC_TELEPHONE - +category "ig_NG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -424,7 +424,8 @@ copy "en_NG" END LC_PAPER LC_MEASUREMENT -copy "en_NG" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA index 3ca018a2e5..1826ca733b 100644 --- a/localedata/locales/ik_CA +++ b/localedata/locales/ik_CA @@ -38,7 +38,7 @@ category "ik_CA:2000";LC_PAPER category "ik_CA:2000";LC_NAME category "ik_CA:2000";LC_ADDRESS category "ik_CA:2000";LC_TELEPHONE - +category "ik_CA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -211,8 +211,8 @@ LC_PAPER copy "en_CA" END LC_PAPER -% Metric System (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS index 1e2dff02df..299c4aae76 100644 --- a/localedata/locales/is_IS +++ b/localedata/locales/is_IS @@ -44,7 +44,7 @@ category "is_IS:2000";LC_PAPER category "is_IS:2000";LC_NAME category "is_IS:2000";LC_ADDRESS category "is_IS:2000";LC_TELEPHONE - +category "is_IS:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2245,8 +2245,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH index 5702e44e68..f135fbb004 100644 --- a/localedata/locales/it_CH +++ b/localedata/locales/it_CH @@ -36,7 +36,7 @@ category "it_CH:2000";LC_PAPER category "it_CH:2000";LC_NAME category "it_CH:2000";LC_ADDRESS category "it_CH:2000";LC_TELEPHONE - +category "it_CH:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -116,8 +116,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT index 498010dfd6..1a4fdd1b82 100644 --- a/localedata/locales/it_IT +++ b/localedata/locales/it_IT @@ -42,7 +42,7 @@ category "it_IT:2000";LC_PAPER category "it_IT:2000";LC_NAME category "it_IT:2000";LC_ADDRESS category "it_IT:2000";LC_TELEPHONE - +category "it_IT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -142,8 +142,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/it_IT@euro b/localedata/locales/it_IT@euro index e34a8d55f6..fb9114c7fb 100644 --- a/localedata/locales/it_IT@euro +++ b/localedata/locales/it_IT@euro @@ -35,7 +35,7 @@ category "it_IT@euro:2000";LC_PAPER category "it_IT@euro:2000";LC_NAME category "it_IT@euro:2000";LC_ADDRESS category "it_IT@euro:2000";LC_TELEPHONE - +category "it_IT@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -71,7 +71,8 @@ copy "it_IT" END LC_TELEPHONE LC_MEASUREMENT -copy "it_IT" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA index 3146568b1d..e2300bf5e4 100644 --- a/localedata/locales/iu_CA +++ b/localedata/locales/iu_CA @@ -132,8 +132,8 @@ LC_NAME copy "en_CA" END LC_NAME -% Metric System (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP index 53b11e997d..51b8a083a8 100644 --- a/localedata/locales/ja_JP +++ b/localedata/locales/ja_JP @@ -31,7 +31,7 @@ category "ja_JP:2000";LC_PAPER category "ja_JP:2000";LC_NAME category "ja_JP:2000";LC_ADDRESS category "ja_JP:2000";LC_TELEPHONE - +category "ja_JP:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -15064,8 +15064,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/ka_GE b/localedata/locales/ka_GE index 0b71142600..583e08c72e 100644 --- a/localedata/locales/ka_GE +++ b/localedata/locales/ka_GE @@ -145,8 +145,8 @@ yesexpr " noexpr "" END LC_MESSAGES -% Metric Measurement system (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ index 9fe04881ad..89b303be9d 100644 --- a/localedata/locales/kk_KZ +++ b/localedata/locales/kk_KZ @@ -42,7 +42,7 @@ category "kk_KZ:2000";LC_PAPER category "kk_KZ:2000";LC_NAME category "kk_KZ:2000";LC_ADDRESS category "kk_KZ:2000";LC_TELEPHONE - +category "kk_KZ:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -246,8 +246,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL index 217ba6bf90..002d8cf9a9 100644 --- a/localedata/locales/kl_GL +++ b/localedata/locales/kl_GL @@ -47,7 +47,7 @@ category "kl_GL:2000";LC_PAPER category "kl_GL:2000";LC_NAME category "kl_GL:2000";LC_ADDRESS category "kl_GL:2000";LC_TELEPHONE - +category "kl_GL:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -125,8 +125,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH index c314cb5636..5563659e5a 100644 --- a/localedata/locales/km_KH +++ b/localedata/locales/km_KH @@ -63,7 +63,7 @@ category "km_KH:2000";LC_PAPER category "km_KH:2000";LC_NAME category "km_KH:2000";LC_ADDRESS category "km_KH:2000";LC_TELEPHONE - +category "km_KH:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -1869,8 +1869,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN index aa6ea38b25..c500330b92 100644 --- a/localedata/locales/kn_IN +++ b/localedata/locales/kn_IN @@ -30,7 +30,7 @@ category "kn_IN:2000";LC_PAPER category "kn_IN:2000";LC_NAME category "kn_IN:2000";LC_ADDRESS category "kn_IN:2000";LC_TELEPHONE - +category "kn_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -236,5 +236,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR index fea519eb9e..7be5214efb 100644 --- a/localedata/locales/ko_KR +++ b/localedata/locales/ko_KR @@ -63,7 +63,7 @@ category "ko_KR:2000";LC_PAPER category "ko_KR:2000";LC_NAME category "ko_KR:2000";LC_ADDRESS category "ko_KR:2000";LC_TELEPHONE - +category "ko_KR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -6229,8 +6229,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN index fb7aa9e6ee..6c49aced7e 100644 --- a/localedata/locales/kok_IN +++ b/localedata/locales/kok_IN @@ -28,7 +28,7 @@ category "kok_IN:2009";LC_PAPER category "kok_IN:2009";LC_NAME category "kok_IN:2009";LC_ADDRESS category "kok_IN:2009";LC_TELEPHONE - +category "kok_IN:2009";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -211,5 +211,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN index ad6eafef7f..2222782ba7 100644 --- a/localedata/locales/ks_IN +++ b/localedata/locales/ks_IN @@ -29,8 +29,7 @@ category "ks_IN:2009";LC_PAPER category "ks_IN:2009";LC_NAME category "ks_IN:2009";LC_ADDRESS category "ks_IN:2009";LC_TELEPHONE - - +category "ks_IN:2009";LC_MEASUREMENT END LC_IDENTIFICATION @@ -214,5 +213,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ks_IN@devanagari b/localedata/locales/ks_IN@devanagari index e1f629024f..a591d2d842 100644 --- a/localedata/locales/ks_IN@devanagari +++ b/localedata/locales/ks_IN@devanagari @@ -28,7 +28,7 @@ category "ks_IN@devanagari:2008";LC_PAPER category "ks_IN@devanagari:2008";LC_NAME category "ks_IN@devanagari:2008";LC_ADDRESS category "ks_IN@devanagari:2008";LC_TELEPHONE - +category "ks_IN@devanagari:2008";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -164,5 +164,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR index ddd671d97a..d974bfb09e 100644 --- a/localedata/locales/ku_TR +++ b/localedata/locales/ku_TR @@ -174,7 +174,8 @@ copy "tr_TR" END LC_TELEPHONE LC_MEASUREMENT -copy "tr_TR" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB index 35b21e50b4..1eb641adcb 100644 --- a/localedata/locales/kw_GB +++ b/localedata/locales/kw_GB @@ -46,7 +46,7 @@ category "kw_GB:2000";LC_PAPER category "kw_GB:2000";LC_NAME category "kw_GB:2000";LC_ADDRESS category "kw_GB:2000";LC_TELEPHONE - +category "kw_GB:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -146,8 +146,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ky_KG b/localedata/locales/ky_KG index 107b2a43c4..6e0a666a47 100644 --- a/localedata/locales/ky_KG +++ b/localedata/locales/ky_KG @@ -30,7 +30,7 @@ category "ky_KG:2000";LC_PAPER category "ky_KG:2000";LC_NAME category "ky_KG:2000";LC_ADDRESS category "ky_KG:2000";LC_TELEPHONE - +category "ky_KG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -187,7 +187,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU index b62196e1e4..a74e1629b2 100644 --- a/localedata/locales/lb_LU +++ b/localedata/locales/lb_LU @@ -192,5 +192,6 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG index f75e07ba29..0e511d33b8 100644 --- a/localedata/locales/lg_UG +++ b/localedata/locales/lg_UG @@ -43,7 +43,7 @@ category "lg_UG:2001";LC_PAPER category "lg_UG:2001";LC_NAME category "lg_UG:2001";LC_ADDRESS category "lg_UG:2001";LC_TELEPHONE - +category "lg_UG:2001";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -260,7 +260,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/li_BE b/localedata/locales/li_BE index 3a13dbbc5e..652ff63f22 100644 --- a/localedata/locales/li_BE +++ b/localedata/locales/li_BE @@ -84,7 +84,8 @@ copy "nl_BE" END LC_TELEPHONE LC_MEASUREMENT -copy "nl_BE" +% metric +measurement 1 END LC_MEASUREMENT LC_NUMERIC diff --git a/localedata/locales/li_NL b/localedata/locales/li_NL index 0588cb85a2..6613b1555a 100644 --- a/localedata/locales/li_NL +++ b/localedata/locales/li_NL @@ -84,7 +84,8 @@ copy "nl_NL" END LC_TELEPHONE LC_MEASUREMENT -copy "nl_NL" +% metric +measurement 1 END LC_MEASUREMENT LC_NUMERIC diff --git a/localedata/locales/lij_IT b/localedata/locales/lij_IT index 647528011e..553f2a58a8 100644 --- a/localedata/locales/lij_IT +++ b/localedata/locales/lij_IT @@ -27,7 +27,7 @@ category "lij_IT:2000";LC_PAPER category "lij_IT:2000";LC_NAME category "lij_IT:2000";LC_ADDRESS category "lij_IT:2000";LC_TELEPHONE - +category "lij_IT:2000";LC_MEASUREMENT END LC_IDENTIFICATION % LC_COLLATE @@ -111,8 +111,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA index 29ab3f322b..c584877d23 100644 --- a/localedata/locales/lo_LA +++ b/localedata/locales/lo_LA @@ -66,7 +66,7 @@ category "lo_LA:2000";LC_PAPER category "lo_LA:2000";LC_NAME category "lo_LA:2000";LC_ADDRESS category "lo_LA:2000";LC_TELEPHONE - +category "lo_LA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -748,8 +748,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT index 49aff858ea..6b4e2a6bc0 100644 --- a/localedata/locales/lt_LT +++ b/localedata/locales/lt_LT @@ -54,7 +54,7 @@ category "lt_LT:2000";LC_PAPER category "lt_LT:2000";LC_NAME category "lt_LT:2000";LC_ADDRESS category "lt_LT:2000";LC_TELEPHONE - +category "lt_LT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2214,8 +2214,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV index 4ae623cfa6..52d5440182 100644 --- a/localedata/locales/lv_LV +++ b/localedata/locales/lv_LV @@ -46,7 +46,7 @@ category "lv_LV:2000";LC_PAPER category "lv_LV:2000";LC_NAME category "lv_LV:2000";LC_ADDRESS category "lv_LV:2000";LC_TELEPHONE - +category "lv_LV:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2206,8 +2206,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW index 785d73ad51..73b4897631 100644 --- a/localedata/locales/lzh_TW +++ b/localedata/locales/lzh_TW @@ -196,6 +196,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/mag_IN b/localedata/locales/mag_IN index 098002ee89..c9663dc637 100644 --- a/localedata/locales/mag_IN +++ b/localedata/locales/mag_IN @@ -29,7 +29,7 @@ category "mag_IN:2012";LC_PAPER category "mag_IN:2012";LC_NAME category "mag_IN:2012";LC_ADDRESS category "mag_IN:2012";LC_TELEPHONE - +category "mag_IN:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -176,5 +176,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN index 7d01817a80..addf33d1c6 100644 --- a/localedata/locales/mai_IN +++ b/localedata/locales/mai_IN @@ -28,7 +28,7 @@ category "mai_IN:2006";LC_PAPER category "mai_IN:2006";LC_NAME category "mai_IN:2006";LC_ADDRESS category "mai_IN:2006";LC_TELEPHONE - +category "mai_IN:2006";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -92,5 +92,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/mg_MG b/localedata/locales/mg_MG index 14a8658de8..3391b159c2 100644 --- a/localedata/locales/mg_MG +++ b/localedata/locales/mg_MG @@ -39,7 +39,7 @@ category "mg_MG:2000";LC_PAPER category "mg_MG:2000";LC_NAME category "mg_MG:2000";LC_ADDRESS category "mg_MG:2000";LC_TELEPHONE - +category "mg_MG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -159,7 +159,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/mhr_RU b/localedata/locales/mhr_RU index 7fa34f30c6..4b79dc0e90 100644 --- a/localedata/locales/mhr_RU +++ b/localedata/locales/mhr_RU @@ -41,7 +41,7 @@ category "mhr_RU:2000";LC_PAPER category "mhr_RU:2000";LC_NAME category "mhr_RU:2000";LC_ADDRESS category "mhr_RU:2000";LC_TELEPHONE - +category "mhr_RU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -142,7 +142,8 @@ copy "ru_RU" END LC_TELEPHONE LC_MEASUREMENT -copy "ru_RU" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/mi_NZ b/localedata/locales/mi_NZ index d4cf2a37e6..c898a01722 100644 --- a/localedata/locales/mi_NZ +++ b/localedata/locales/mi_NZ @@ -150,6 +150,7 @@ copy "en_NZ" END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK index 8c137a6502..35f2d1ecbf 100644 --- a/localedata/locales/mk_MK +++ b/localedata/locales/mk_MK @@ -31,7 +31,7 @@ category "mk_MK:2000";LC_PAPER category "mk_MK:2000";LC_NAME category "mk_MK:2000";LC_ADDRESS category "mk_MK:2000";LC_TELEPHONE - +category "mk_MK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -166,5 +166,6 @@ width 210 END LC_PAPER LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN index 8dc65f47a0..f64b846de2 100644 --- a/localedata/locales/ml_IN +++ b/localedata/locales/ml_IN @@ -224,6 +224,6 @@ copy "hi_IN" END LC_TELEPHONE % LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT -% diff --git a/localedata/locales/mn_MN b/localedata/locales/mn_MN index 8da3878209..763fe06d8e 100644 --- a/localedata/locales/mn_MN +++ b/localedata/locales/mn_MN @@ -33,7 +33,7 @@ category "mn_MN:2000";LC_PAPER category "mn_MN:2000";LC_NAME category "mn_MN:2000";LC_ADDRESS category "mn_MN:2000";LC_TELEPHONE - +category "mn_MN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -269,5 +269,6 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/mni_IN b/localedata/locales/mni_IN index d12b782b49..8c12c0e3eb 100644 --- a/localedata/locales/mni_IN +++ b/localedata/locales/mni_IN @@ -27,7 +27,7 @@ category "mni_IN:2012";LC_PAPER category "mni_IN:2012";LC_NAME category "mni_IN:2012";LC_ADDRESS category "mni_IN:2012";LC_TELEPHONE - +category "mni_IN:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -178,5 +178,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "bn_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN index 09b9c37364..3d03d14332 100644 --- a/localedata/locales/mr_IN +++ b/localedata/locales/mr_IN @@ -27,7 +27,7 @@ category "mr_IN:2000";LC_PAPER category "mr_IN:2000";LC_NAME category "mr_IN:2000";LC_ADDRESS category "mr_IN:2000";LC_TELEPHONE - +category "mr_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -236,5 +236,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY index e8535ace0f..722188ab15 100644 --- a/localedata/locales/ms_MY +++ b/localedata/locales/ms_MY @@ -30,7 +30,7 @@ category "ms_MY:2000";LC_PAPER category "ms_MY:2000";LC_NAME category "ms_MY:2000";LC_ADDRESS category "ms_MY:2000";LC_TELEPHONE - +category "ms_MY:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -222,8 +222,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT index 61077665f7..8c16f55cc9 100644 --- a/localedata/locales/mt_MT +++ b/localedata/locales/mt_MT @@ -31,7 +31,7 @@ category "mt_MT:2000";LC_PAPER category "mt_MT:2000";LC_NAME category "mt_MT:2000";LC_ADDRESS category "mt_MT:2000";LC_TELEPHONE - +category "mt_MT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -311,8 +311,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM index 261019ab1d..d9a2db197f 100644 --- a/localedata/locales/my_MM +++ b/localedata/locales/my_MM @@ -274,8 +274,9 @@ nostr "" END LC_MESSAGES -% Metric Measurement system (ISO 1000) LC_MEASUREMENT +% http://en.wikipedia.org/wiki/Burmese_units_of_measurement +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW index 475e582c53..0c11174085 100644 --- a/localedata/locales/nan_TW +++ b/localedata/locales/nan_TW @@ -162,6 +162,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin index bf8a6cd903..a1e7d499f7 100644 --- a/localedata/locales/nan_TW@latin +++ b/localedata/locales/nan_TW@latin @@ -162,6 +162,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO index 07df38cc8b..d3d6c75216 100644 --- a/localedata/locales/nb_NO +++ b/localedata/locales/nb_NO @@ -42,7 +42,7 @@ category "nb_NO:2000";LC_PAPER category "nb_NO:2000";LC_NAME category "nb_NO:2000";LC_ADDRESS category "nb_NO:2000";LC_TELEPHONE - +category "nb_NO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -224,7 +224,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/nds_DE b/localedata/locales/nds_DE index 02c1b1a451..e1ab6e03f6 100644 --- a/localedata/locales/nds_DE +++ b/localedata/locales/nds_DE @@ -83,7 +83,8 @@ copy "de_DE" END LC_TELEPHONE LC_MEASUREMENT -copy "de_DE" +% metric +measurement 1 END LC_MEASUREMENT LC_NUMERIC diff --git a/localedata/locales/nds_NL b/localedata/locales/nds_NL index 38579472df..14051f6722 100644 --- a/localedata/locales/nds_NL +++ b/localedata/locales/nds_NL @@ -82,7 +82,8 @@ copy "nl_NL" END LC_TELEPHONE LC_MEASUREMENT -copy "nl_NL" +% metric +measurement 1 END LC_MEASUREMENT LC_NUMERIC diff --git a/localedata/locales/ne_NP b/localedata/locales/ne_NP index 9ee000a948..4f7f2cdf04 100644 --- a/localedata/locales/ne_NP +++ b/localedata/locales/ne_NP @@ -27,7 +27,7 @@ category "ne_NP:2003";LC_PAPER category "ne_NP:2003";LC_NAME category "ne_NP:2003";LC_ADDRESS category "ne_NP:2003";LC_TELEPHONE - +category "ne_NP:2003";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -217,8 +217,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/nhn_MX b/localedata/locales/nhn_MX index 6534b78a8d..a181f29503 100644 --- a/localedata/locales/nhn_MX +++ b/localedata/locales/nhn_MX @@ -132,7 +132,8 @@ copy "es_MX" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU index 440b497f8a..3a4f02e303 100644 --- a/localedata/locales/niu_NU +++ b/localedata/locales/niu_NU @@ -148,6 +148,7 @@ copy "en_NZ" END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ index 0afacda7e0..eb746f25fa 100644 --- a/localedata/locales/niu_NZ +++ b/localedata/locales/niu_NZ @@ -149,6 +149,7 @@ copy "en_NZ" END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW index 3da454b657..6d128961a6 100644 --- a/localedata/locales/nl_AW +++ b/localedata/locales/nl_AW @@ -27,7 +27,7 @@ category "nl_AW:2008";LC_PAPER category "nl_AW:2008";LC_NAME category "nl_AW:2008";LC_ADDRESS category "nl_AW:2008";LC_TELEPHONE - +category "nl_AW:2008";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -99,5 +99,6 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -copy "en_US" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE index 3d1615b6ca..fdd8433eb6 100644 --- a/localedata/locales/nl_BE +++ b/localedata/locales/nl_BE @@ -43,7 +43,7 @@ category "nl_BE:2000";LC_PAPER category "nl_BE:2000";LC_NAME category "nl_BE:2000";LC_ADDRESS category "nl_BE:2000";LC_TELEPHONE - +category "nl_BE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -117,7 +117,8 @@ copy "fr_BE" END LC_TELEPHONE LC_MEASUREMENT -copy "fr_BE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/nl_BE@euro b/localedata/locales/nl_BE@euro index 413e8def48..df36cee192 100644 --- a/localedata/locales/nl_BE@euro +++ b/localedata/locales/nl_BE@euro @@ -35,7 +35,7 @@ category "nl_BE@euro:2000";LC_PAPER category "nl_BE@euro:2000";LC_NAME category "nl_BE@euro:2000";LC_ADDRESS category "nl_BE@euro:2000";LC_TELEPHONE - +category "nl_BE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "nl_BE" END LC_TELEPHONE LC_MEASUREMENT -copy "nl_BE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL index 6f832927a3..ccb58acde7 100644 --- a/localedata/locales/nl_NL +++ b/localedata/locales/nl_NL @@ -42,7 +42,7 @@ category "nl_NL:2000";LC_PAPER category "nl_NL:2000";LC_NAME category "nl_NL:2000";LC_ADDRESS category "nl_NL:2000";LC_TELEPHONE - +category "nl_NL:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -143,8 +143,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/nl_NL@euro b/localedata/locales/nl_NL@euro index b0cc689d10..e6af083d99 100644 --- a/localedata/locales/nl_NL@euro +++ b/localedata/locales/nl_NL@euro @@ -35,7 +35,7 @@ category "nl_NL@euro:2000";LC_PAPER category "nl_NL@euro:2000";LC_NAME category "nl_NL@euro:2000";LC_ADDRESS category "nl_NL@euro:2000";LC_TELEPHONE - +category "nl_NL@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "nl_NL" END LC_TELEPHONE LC_MEASUREMENT -copy "nl_NL" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO index b1a829fa68..bbcd9a5470 100644 --- a/localedata/locales/nn_NO +++ b/localedata/locales/nn_NO @@ -28,7 +28,7 @@ category "nn_NO:2000";LC_PAPER category "nn_NO:2000";LC_NAME category "nn_NO:2000";LC_ADDRESS category "nn_NO:2000";LC_TELEPHONE - +category "nn_NO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -176,5 +176,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "nb_NO" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA index 62d7567c12..ae27bcc3bc 100644 --- a/localedata/locales/nr_ZA +++ b/localedata/locales/nr_ZA @@ -184,7 +184,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA index abe2be23e5..df8eb75b4d 100644 --- a/localedata/locales/nso_ZA +++ b/localedata/locales/nso_ZA @@ -179,7 +179,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR index dfdc095079..b95d1d6c87 100644 --- a/localedata/locales/oc_FR +++ b/localedata/locales/oc_FR @@ -84,7 +84,8 @@ copy "fr_FR" END LC_PAPER LC_MEASUREMENT -copy "fr_FR" +% metric +measurement 1 END LC_MEASUREMENT LC_TELEPHONE diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET index e241b9763c..b46544a6db 100644 --- a/localedata/locales/om_ET +++ b/localedata/locales/om_ET @@ -77,7 +77,8 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE index 1a94bbbc83..eaa189e63d 100644 --- a/localedata/locales/om_KE +++ b/localedata/locales/om_KE @@ -56,7 +56,7 @@ END LC_IDENTIFICATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Qubee Specifc Data: +% Qubee Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -141,17 +141,14 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Kenya Specifc and Shared Data: +% Kenya Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -% -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT category. -% +% metric measurement 1 -% END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN index 15ed7ce4c6..97e9479a96 100644 --- a/localedata/locales/or_IN +++ b/localedata/locales/or_IN @@ -29,6 +29,7 @@ category "or_IN:2004";LC_PAPER category "or_IN:2004";LC_NAME category "or_IN:2004";LC_ADDRESS category "or_IN:2004";LC_TELEPHONE +category "or_IN:2004";LC_MEASUREMENT END LC_IDENTIFICATION %%%%%%%%%%%%% @@ -833,5 +834,6 @@ END LC_TELEPHONE %%%%%%%%%%%%% LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU index 91743dd651..3686bfaaf3 100644 --- a/localedata/locales/os_RU +++ b/localedata/locales/os_RU @@ -42,7 +42,7 @@ category "os_RU:2000";LC_PAPER category "os_RU:2000";LC_NAME category "os_RU:2000";LC_ADDRESS category "os_RU:2000";LC_TELEPHONE - +category "os_RU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -158,7 +158,8 @@ copy "ru_RU" END LC_TELEPHONE LC_MEASUREMENT -copy "ru_RU" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN index a3f8ef4757..8c7d3e09b1 100644 --- a/localedata/locales/pa_IN +++ b/localedata/locales/pa_IN @@ -27,7 +27,7 @@ category "pa_IN:2000";LC_PAPER category "pa_IN:2000";LC_NAME category "pa_IN:2000";LC_ADDRESS category "pa_IN:2000";LC_TELEPHONE - +category "pa_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -225,5 +225,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK index 122113aa94..082e924716 100644 --- a/localedata/locales/pa_PK +++ b/localedata/locales/pa_PK @@ -38,7 +38,7 @@ category "pa_PK:2000";LC_PAPER category "pa_PK:2000";LC_NAME category "pa_PK:2000";LC_ADDRESS category "pa_PK:2000";LC_TELEPHONE - +category "pa_PK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -158,7 +158,8 @@ copy "ur_PK" END LC_PAPER LC_MEASUREMENT -copy "ur_PK" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/pap_AN b/localedata/locales/pap_AN index 45696cdd29..c949b45c2a 100644 --- a/localedata/locales/pap_AN +++ b/localedata/locales/pap_AN @@ -136,8 +136,8 @@ thousands_sep "" grouping 0;0 END LC_NUMERIC -% Metric Measurement system (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/pap_AW b/localedata/locales/pap_AW index 115fa3d4fc..98a6d9fa90 100644 --- a/localedata/locales/pap_AW +++ b/localedata/locales/pap_AW @@ -146,8 +146,8 @@ thousands_sep "" grouping 0;0 END LC_NUMERIC -% Metric Measurement system (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/pap_CW b/localedata/locales/pap_CW index dc10c836bb..4493e73a29 100644 --- a/localedata/locales/pap_CW +++ b/localedata/locales/pap_CW @@ -146,8 +146,8 @@ thousands_sep "" grouping 0;0 END LC_NUMERIC -% Metric Measurement system (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL index 1431614530..5af7af53aa 100644 --- a/localedata/locales/pl_PL +++ b/localedata/locales/pl_PL @@ -44,7 +44,7 @@ category "pl_PL:2000";LC_PAPER category "pl_PL:2000";LC_NAME category "pl_PL:2000";LC_ADDRESS category "pl_PL:2000";LC_TELEPHONE - +category "pl_PL:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2215,8 +2215,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF index 87ce5a6ede..858c50d7cc 100644 --- a/localedata/locales/ps_AF +++ b/localedata/locales/ps_AF @@ -229,7 +229,8 @@ LC_MESSAGES END LC_MESSAGES LC_MEASUREMENT - measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_PAPER diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR index acc9897fd0..388cb3e845 100644 --- a/localedata/locales/pt_BR +++ b/localedata/locales/pt_BR @@ -42,7 +42,7 @@ category "pt_BR:2000";LC_PAPER category "pt_BR:2000";LC_NAME category "pt_BR:2000";LC_ADDRESS category "pt_BR:2000";LC_TELEPHONE - +category "pt_BR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -137,8 +137,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT index 7417b3457a..d5461c9fc7 100644 --- a/localedata/locales/pt_PT +++ b/localedata/locales/pt_PT @@ -42,7 +42,7 @@ category "pt_PT:2000";LC_PAPER category "pt_PT:2000";LC_NAME category "pt_PT:2000";LC_ADDRESS category "pt_PT:2000";LC_TELEPHONE - +category "pt_PT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -139,7 +139,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/pt_PT@euro b/localedata/locales/pt_PT@euro index f0a5c27af5..16bcb145c0 100644 --- a/localedata/locales/pt_PT@euro +++ b/localedata/locales/pt_PT@euro @@ -35,7 +35,7 @@ category "pt_PT@euro:2000";LC_PAPER category "pt_PT@euro:2000";LC_NAME category "pt_PT@euro:2000";LC_ADDRESS category "pt_PT@euro:2000";LC_TELEPHONE - +category "pt_PT@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -71,7 +71,8 @@ copy "pt_PT" END LC_TELEPHONE LC_MEASUREMENT -copy "pt_PT" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/quz_PE b/localedata/locales/quz_PE index 6521fec8b9..8e755260a1 100644 --- a/localedata/locales/quz_PE +++ b/localedata/locales/quz_PE @@ -141,7 +141,7 @@ END LC_PAPER LC_MEASUREMENT % metric -measurement 1 +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO index b8953288fe..610f071c7d 100644 --- a/localedata/locales/ro_RO +++ b/localedata/locales/ro_RO @@ -47,7 +47,7 @@ category "ro_RO:2000";LC_PAPER category "ro_RO:2000";LC_NAME category "ro_RO:2000";LC_ADDRESS category "ro_RO:2000";LC_TELEPHONE - +category "ro_RO:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -289,7 +289,8 @@ END LC_TELEPHONE % Romania uses the metric system LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU index 0cb3a119ba..2e51a4d12d 100644 --- a/localedata/locales/ru_RU +++ b/localedata/locales/ru_RU @@ -43,7 +43,7 @@ category "ru_RU:2000";LC_PAPER category "ru_RU:2000";LC_NAME category "ru_RU:2000";LC_ADDRESS category "ru_RU:2000";LC_TELEPHONE - +category "ru_RU:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -168,8 +168,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA index 6764249333..29c4522740 100644 --- a/localedata/locales/ru_UA +++ b/localedata/locales/ru_UA @@ -39,7 +39,7 @@ category "ru_UA:2000";LC_PAPER category "ru_UA:2000";LC_NAME category "ru_UA:2000";LC_ADDRESS category "ru_UA:2000";LC_TELEPHONE - +category "ru_UA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -159,8 +159,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/rw_RW b/localedata/locales/rw_RW index e4e6c87657..1f503005ed 100644 --- a/localedata/locales/rw_RW +++ b/localedata/locales/rw_RW @@ -151,5 +151,6 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN index 41651ca55c..1ffa5f95f4 100644 --- a/localedata/locales/sa_IN +++ b/localedata/locales/sa_IN @@ -28,7 +28,7 @@ category "sa_IN:2000";LC_PAPER category "sa_IN:2000";LC_NAME category "sa_IN:2000";LC_ADDRESS category "sa_IN:2000";LC_TELEPHONE - +category "sa_IN:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -256,7 +256,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN index b334b88236..455b0e6a92 100644 --- a/localedata/locales/sat_IN +++ b/localedata/locales/sat_IN @@ -27,7 +27,7 @@ category "sat_IN:2012";LC_PAPER category "sat_IN:2012";LC_NAME category "sat_IN:2012";LC_ADDRESS category "sat_IN:2012";LC_TELEPHONE - +category "sat_IN:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -192,5 +192,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/sc_IT b/localedata/locales/sc_IT index 065ad61655..c6ffc98888 100644 --- a/localedata/locales/sc_IT +++ b/localedata/locales/sc_IT @@ -35,7 +35,7 @@ category "sc_IT:2000";LC_PAPER category "sc_IT:2000";LC_NAME category "sc_IT:2000";LC_ADDRESS category "sc_IT:2000";LC_TELEPHONE - +category "sc_IT:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -124,7 +124,8 @@ copy "it_IT" END LC_TELEPHONE LC_MEASUREMENT -copy "it_IT" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN index 866cc8db87..e57edf5923 100644 --- a/localedata/locales/sd_IN +++ b/localedata/locales/sd_IN @@ -29,8 +29,7 @@ category "sd_IN:2008";LC_PAPER category "sd_IN:2008";LC_NAME category "sd_IN:2008";LC_ADDRESS category "sd_IN:2008";LC_TELEPHONE - - +category "sd_IN:2008";LC_MEASUREMENT END LC_IDENTIFICATION @@ -209,5 +208,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/sd_IN@devanagari b/localedata/locales/sd_IN@devanagari index 66b1f9e6d0..6e7549be27 100644 --- a/localedata/locales/sd_IN@devanagari +++ b/localedata/locales/sd_IN@devanagari @@ -28,7 +28,7 @@ category "sd_IN@devanagari:2008";LC_PAPER category "sd_IN@devanagari:2008";LC_NAME category "sd_IN@devanagari:2008";LC_ADDRESS category "sd_IN@devanagari:2008";LC_TELEPHONE - +category "sd_IN@devanagari:2008";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -209,5 +209,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO index 53ee33fe56..2944e74f81 100644 --- a/localedata/locales/se_NO +++ b/localedata/locales/se_NO @@ -297,7 +297,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/shs_CA b/localedata/locales/shs_CA index d90b28c276..6b72fb1a05 100644 --- a/localedata/locales/shs_CA +++ b/localedata/locales/shs_CA @@ -43,7 +43,7 @@ category "shs_CA:2000";LC_PAPER category "shs_CA:2000";LC_NAME category "shs_CA:2000";LC_ADDRESS category "shs_CA:2000";LC_TELEPHONE - +category "shs_CA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -138,7 +138,8 @@ copy "en_CA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_CA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/si_LK b/localedata/locales/si_LK index cc75c49a6a..efecce7cc8 100644 --- a/localedata/locales/si_LK +++ b/localedata/locales/si_LK @@ -29,7 +29,7 @@ category "i18n:2002";LC_PAPER category "i18n:2002";LC_NAME category "i18n:2002";LC_ADDRESS category "i18n:2002";LC_TELEPHONE - +category "i18n:2002";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -222,9 +222,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% 1 is ISO 1000 (metric) -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET index 3de83901b9..86ba9e1b74 100644 --- a/localedata/locales/sid_ET +++ b/localedata/locales/sid_ET @@ -68,12 +68,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopia Specifc and Shared Data: +% Ethiopia Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK index 8ba797a4f6..dbfcfe9535 100644 --- a/localedata/locales/sk_SK +++ b/localedata/locales/sk_SK @@ -55,7 +55,7 @@ category "sk_SK:2000";LC_PAPER category "sk_SK:2000";LC_NAME category "sk_SK:2000";LC_ADDRESS category "sk_SK:2000";LC_TELEPHONE - +category "sk_SK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -206,8 +206,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI index 353933eb06..a250d64f53 100644 --- a/localedata/locales/sl_SI +++ b/localedata/locales/sl_SI @@ -44,7 +44,7 @@ category "sl_SI:2000";LC_PAPER category "sl_SI:2000";LC_NAME category "sl_SI:2000";LC_ADDRESS category "sl_SI:2000";LC_TELEPHONE - +category "sl_SI:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -2205,8 +2205,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ index f6d5cb2d0c..00ddf69b3c 100644 --- a/localedata/locales/so_DJ +++ b/localedata/locales/so_DJ @@ -67,12 +67,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Djibouti Specifc and Shared Data: +% Djibouti Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "aa_DJ" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET index 00b61b48e8..79941e7ab5 100644 --- a/localedata/locales/so_ET +++ b/localedata/locales/so_ET @@ -52,7 +52,7 @@ END LC_IDENTIFICATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopic Specifc Data: +% Ethiopic Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -67,12 +67,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopia Specifc and Shared Data: +% Ethiopia Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE index 49c108a0d0..0a1e978d8c 100644 --- a/localedata/locales/so_KE +++ b/localedata/locales/so_KE @@ -66,28 +66,29 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Kenya Specifc and Shared Data: +% Kenya Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "om_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY -copy "om_ET" +copy "om_KE" END LC_MONETARY LC_NUMERIC -copy "om_ET" +copy "om_KE" END LC_NUMERIC LC_PAPER -copy "om_ET" +copy "om_KE" END LC_PAPER LC_TELEPHONE -copy "om_ET" +copy "om_KE" END LC_TELEPHONE diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO index 75316392bd..4d6a24b4ae 100644 --- a/localedata/locales/so_SO +++ b/localedata/locales/so_SO @@ -71,16 +71,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Somalia Specifc and Shared Data: +% Somalia Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -% -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT category. -% +% metric measurement 1 -% END LC_MEASUREMENT diff --git a/localedata/locales/sq_AL b/localedata/locales/sq_AL index 09873c0207..f82de83ff5 100644 --- a/localedata/locales/sq_AL +++ b/localedata/locales/sq_AL @@ -29,7 +29,7 @@ category "sq_AL:2000";LC_PAPER category "sq_AL:2000";LC_NAME category "sq_AL:2000";LC_ADDRESS category "sq_AL:2000";LC_TELEPHONE - +category "sq_AL:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -355,8 +355,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/sq_MK b/localedata/locales/sq_MK index 7bac02ee9b..9a273b3d82 100644 --- a/localedata/locales/sq_MK +++ b/localedata/locales/sq_MK @@ -27,7 +27,7 @@ category "sq_MK:2000";LC_PAPER category "sq_MK:2000";LC_NAME category "sq_MK:2000";LC_ADDRESS category "sq_MK:2000";LC_TELEPHONE - +category "sq_MK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME index 231efb111e..c0aa4a4ce3 100644 --- a/localedata/locales/sr_ME +++ b/localedata/locales/sr_ME @@ -161,5 +161,6 @@ copy "sr_RS" END LC_TELEPHONE LC_MEASUREMENT -copy "sr_RS" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS index 3028e35707..b2b8577f6d 100644 --- a/localedata/locales/sr_RS +++ b/localedata/locales/sr_RS @@ -356,5 +356,6 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin index 6bc402a85f..7b283024a6 100644 --- a/localedata/locales/sr_RS@latin +++ b/localedata/locales/sr_RS@latin @@ -170,5 +170,6 @@ copy "sr_RS" END LC_TELEPHONE LC_MEASUREMENT -copy "sr_RS" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA index d33683c155..b296451d32 100644 --- a/localedata/locales/ss_ZA +++ b/localedata/locales/ss_ZA @@ -189,7 +189,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA index c29bb7d494..dcf3e7275f 100644 --- a/localedata/locales/st_ZA +++ b/localedata/locales/st_ZA @@ -186,7 +186,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI index 1fcb63be4b..258178f7b8 100644 --- a/localedata/locales/sv_FI +++ b/localedata/locales/sv_FI @@ -122,7 +122,8 @@ copy "fi_FI" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/sv_FI@euro b/localedata/locales/sv_FI@euro index 7e174a7ae8..dcd9b7530e 100644 --- a/localedata/locales/sv_FI@euro +++ b/localedata/locales/sv_FI@euro @@ -72,7 +72,8 @@ copy "sv_FI" END LC_TELEPHONE LC_MEASUREMENT -copy "sv_FI" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE index d0e59864b4..ead5d3641e 100644 --- a/localedata/locales/sv_SE +++ b/localedata/locales/sv_SE @@ -50,7 +50,7 @@ category "sv_SE:2000";LC_PAPER category "sv_SE:2000";LC_NAME category "sv_SE:2000";LC_ADDRESS category "sv_SE:2000";LC_TELEPHONE - +category "sv_SE:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -200,7 +200,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/sw_KE b/localedata/locales/sw_KE index de91d37a53..94126485d4 100644 --- a/localedata/locales/sw_KE +++ b/localedata/locales/sw_KE @@ -118,7 +118,8 @@ copy "om_KE" END LC_PAPER LC_MEASUREMENT -copy "om_KE" +% metric +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/sw_TZ b/localedata/locales/sw_TZ index 1ae73fb077..a2faf07e20 100644 --- a/localedata/locales/sw_TZ +++ b/localedata/locales/sw_TZ @@ -77,7 +77,8 @@ copy "sw_KE" END LC_PAPER LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/szl_PL b/localedata/locales/szl_PL index 3323430f63..e9cddd24cd 100644 --- a/localedata/locales/szl_PL +++ b/localedata/locales/szl_PL @@ -199,7 +199,8 @@ copy "pl_PL" END LC_TELEPHONE LC_MEASUREMENT -copy "pl_PL" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN index 75f63249ba..70c624ed1d 100644 --- a/localedata/locales/ta_IN +++ b/localedata/locales/ta_IN @@ -221,5 +221,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK index 7051e3be7b..e1af5f9645 100644 --- a/localedata/locales/ta_LK +++ b/localedata/locales/ta_LK @@ -37,7 +37,7 @@ category "ta_LK:2000";LC_PAPER category "ta_LK:2000";LC_NAME category "ta_LK:2000";LC_ADDRESS category "ta_LK:2000";LC_TELEPHONE - +category "ta_LK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -73,7 +73,8 @@ copy "si_LK" END LC_TELEPHONE LC_MEASUREMENT -copy "si_LK" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN index f2ab1b67ef..d42088fd86 100644 --- a/localedata/locales/te_IN +++ b/localedata/locales/te_IN @@ -30,7 +30,7 @@ category "i18n:2003";LC_PAPER category "i18n:2003";LC_NAME category "i18n:2003";LC_ADDRESS category "i18n:2003";LC_TELEPHONE - +category "i18n:2003";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -239,5 +239,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ index 3350881db4..c783625469 100644 --- a/localedata/locales/tg_TJ +++ b/localedata/locales/tg_TJ @@ -206,6 +206,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH index 05575dcb6a..88c3637cb2 100644 --- a/localedata/locales/th_TH +++ b/localedata/locales/th_TH @@ -68,7 +68,7 @@ category "th_TH:2000";LC_PAPER category "th_TH:2000";LC_NAME category "th_TH:2000";LC_ADDRESS category "th_TH:2000";LC_TELEPHONE - +category "th_TH:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -943,8 +943,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER index 103244f4c6..570130baa5 100644 --- a/localedata/locales/ti_ER +++ b/localedata/locales/ti_ER @@ -50,7 +50,7 @@ END LC_IDENTIFICATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopic Specifc Data: +% Ethiopic Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -65,16 +65,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Eritrea Specifc Data: +% Eritrea Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -% -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT category. -% +% metric measurement 1 -% END LC_MEASUREMENT diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET index 1f2353fd34..cdb6b0a0ac 100644 --- a/localedata/locales/ti_ET +++ b/localedata/locales/ti_ET @@ -50,7 +50,7 @@ END LC_IDENTIFICATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopic Specifc Data: +% Tigrigna Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -868,16 +868,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopia Specifc and Shared Data: +% Ethiopia Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -% -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT category. -% +% metric measurement 1 -% END LC_MEASUREMENT diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER index 417ab72784..cf4b6650d3 100644 --- a/localedata/locales/tig_ER +++ b/localedata/locales/tig_ER @@ -48,7 +48,7 @@ END LC_IDENTIFICATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopic Specifc Data: +% Tigre Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -63,12 +63,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Eritrea Specifc Data: +% Eritrea Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ER" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM index d76450749b..3d2decdae4 100644 --- a/localedata/locales/tk_TM +++ b/localedata/locales/tk_TM @@ -389,6 +389,7 @@ n_sign_posn 1 END LC_MONETARY LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH index ae30aeea59..a01ef8bff6 100644 --- a/localedata/locales/tl_PH +++ b/localedata/locales/tl_PH @@ -149,6 +149,7 @@ width 216 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA index 1a3fd82564..f2a85ed4eb 100644 --- a/localedata/locales/tn_ZA +++ b/localedata/locales/tn_ZA @@ -191,7 +191,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY index 1c2c3f313e..e2e6936b1a 100644 --- a/localedata/locales/tr_CY +++ b/localedata/locales/tr_CY @@ -77,7 +77,8 @@ copy "tr_TR" END LC_TELEPHONE LC_MEASUREMENT -copy "tr_TR" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR index 1893633203..f54be2c624 100644 --- a/localedata/locales/tr_TR +++ b/localedata/locales/tr_TR @@ -3558,7 +3558,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ts_ZA b/localedata/locales/ts_ZA index c7b56435ee..b8225fc40a 100644 --- a/localedata/locales/ts_ZA +++ b/localedata/locales/ts_ZA @@ -186,7 +186,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU index 520c6eb1f8..804f7f0989 100644 --- a/localedata/locales/tt_RU +++ b/localedata/locales/tt_RU @@ -304,7 +304,8 @@ copy "ru_RU" END LC_PAPER LC_MEASUREMENT -copy "ru_RU" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif index 4aac6365c9..8e455d6fdc 100644 --- a/localedata/locales/tt_RU@iqtelif +++ b/localedata/locales/tt_RU@iqtelif @@ -161,6 +161,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN index 462f42bc9e..e25d528445 100644 --- a/localedata/locales/ug_CN +++ b/localedata/locales/ug_CN @@ -302,8 +302,8 @@ height 297 width 210 END LC_PAPER -% Metric System (ISO 1000) LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA index b1df63085c..d9194b82c2 100644 --- a/localedata/locales/uk_UA +++ b/localedata/locales/uk_UA @@ -1114,10 +1114,8 @@ END LC_TELEPHONE LC_MEASUREMENT -% 1 - ISO 1000 -% 2 - U.S.A. -% 3 - other -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/unm_US b/localedata/locales/unm_US index a04188ec1a..482a7daf2b 100644 --- a/localedata/locales/unm_US +++ b/localedata/locales/unm_US @@ -164,5 +164,6 @@ copy "en_US" END LC_TELEPHONE LC_MEASUREMENT -copy "en_US" +% US customary units +measurement 2 END LC_MEASUREMENT diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN index 85e19bfc0a..8813b5113c 100644 --- a/localedata/locales/ur_IN +++ b/localedata/locales/ur_IN @@ -29,7 +29,7 @@ category "ur_IN:2009";LC_PAPER category "ur_IN:2009";LC_NAME category "ur_IN:2009";LC_ADDRESS category "ur_IN:2009";LC_TELEPHONE - +category "ur_IN:2009";LC_MEASUREMENT END LC_IDENTIFICATION @@ -193,5 +193,6 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "hi_IN" +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/ur_PK b/localedata/locales/ur_PK index ec1ee3b506..2bc522576f 100644 --- a/localedata/locales/ur_PK +++ b/localedata/locales/ur_PK @@ -38,7 +38,7 @@ category "ur_PK:2000";LC_PAPER category "ur_PK:2000";LC_NAME category "ur_PK:2000";LC_ADDRESS category "ur_PK:2000";LC_TELEPHONE - +category "ur_PK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -176,6 +176,7 @@ width 210 END LC_PAPER LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/uz_UZ b/localedata/locales/uz_UZ index 5a272a1ea5..6e5948bd89 100644 --- a/localedata/locales/uz_UZ +++ b/localedata/locales/uz_UZ @@ -283,7 +283,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/uz_UZ@cyrillic b/localedata/locales/uz_UZ@cyrillic index c7cf51fd41..679b64e9cc 100644 --- a/localedata/locales/uz_UZ@cyrillic +++ b/localedata/locales/uz_UZ@cyrillic @@ -284,7 +284,8 @@ int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA index 43a9aed4bb..9694401727 100644 --- a/localedata/locales/ve_ZA +++ b/localedata/locales/ve_ZA @@ -188,7 +188,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN index c1b9e8621b..0c045c6226 100644 --- a/localedata/locales/vi_VN +++ b/localedata/locales/vi_VN @@ -358,5 +358,6 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE index 8ca9cd8afa..a2fb3be616 100644 --- a/localedata/locales/wa_BE +++ b/localedata/locales/wa_BE @@ -95,9 +95,9 @@ LC_PAPER copy "fr_BE" END LC_PAPER -% COMINTAIRE: doet esse li minme ki po fr_BE. LC_MEASUREMENT -copy "fr_BE" +% metric +measurement 1 END LC_MEASUREMENT % COMINTAIRE: doet esse li minme ki po fr_BE. diff --git a/localedata/locales/wa_BE@euro b/localedata/locales/wa_BE@euro index 78c6b6a01c..09ad80c59b 100644 --- a/localedata/locales/wa_BE@euro +++ b/localedata/locales/wa_BE@euro @@ -35,7 +35,7 @@ category "wa_BE@euro:2000";LC_PAPER category "wa_BE@euro:2000";LC_NAME category "wa_BE@euro:2000";LC_ADDRESS category "wa_BE@euro:2000";LC_TELEPHONE - +category "wa_BE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "wa_BE" END LC_TELEPHONE LC_MEASUREMENT -copy "wa_BE" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/wae_CH b/localedata/locales/wae_CH index bbda7b7b73..bdfabc3eb4 100644 --- a/localedata/locales/wae_CH +++ b/localedata/locales/wae_CH @@ -172,7 +172,8 @@ copy "de_CH" END LC_TELEPHONE LC_MEASUREMENT -copy "de_CH" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET index 8408a629d6..5764267d45 100644 --- a/localedata/locales/wal_ET +++ b/localedata/locales/wal_ET @@ -65,12 +65,13 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopia Specifc and Shared Data: +% Ethiopia Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +% metric +measurement 1 END LC_MEASUREMENT LC_MONETARY @@ -92,7 +93,7 @@ END LC_TELEPHONE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Sidama Specific Data: +% Walaita Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN index 3841e0f068..44dcabdd14 100644 --- a/localedata/locales/wo_SN +++ b/localedata/locales/wo_SN @@ -39,7 +39,7 @@ category "mg_MG:2000";LC_PAPER category "mg_MG:2000";LC_NAME category "mg_MG:2000";LC_ADDRESS category "mg_MG:2000";LC_TELEPHONE - +category "mg_MG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -157,7 +157,8 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA index 3277ca1a65..2a2454066f 100644 --- a/localedata/locales/xh_ZA +++ b/localedata/locales/xh_ZA @@ -186,7 +186,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/yi_US b/localedata/locales/yi_US index 46136fbafa..97ed218572 100644 --- a/localedata/locales/yi_US +++ b/localedata/locales/yi_US @@ -148,7 +148,8 @@ copy "en_US" END LC_PAPER LC_MEASUREMENT -copy "en_US" +% US customary units +measurement 2 END LC_MEASUREMENT LC_NUMERIC diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG index f0206ae1a5..c88ca6e1bd 100644 --- a/localedata/locales/yo_NG +++ b/localedata/locales/yo_NG @@ -38,7 +38,7 @@ category "yo_NG:2000";LC_PAPER category "yo_NG:2000";LC_NAME category "yo_NG:2000";LC_ADDRESS category "yo_NG:2000";LC_TELEPHONE - +category "yo_NG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -430,7 +430,8 @@ copy "en_NG" END LC_PAPER LC_MEASUREMENT -copy "en_NG" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK index fdd15280c0..96e9901685 100644 --- a/localedata/locales/yue_HK +++ b/localedata/locales/yue_HK @@ -29,7 +29,7 @@ category "yue_HK:2010";LC_PAPER category "yue_HK:2010";LC_NAME category "yue_HK:2010";LC_ADDRESS category "yue_HK:2010";LC_TELEPHONE - +category "yue_HK:2010";LC_MEASUREMENT END LC_IDENTIFICATION @@ -164,7 +164,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN index 1ed9d252e1..ff21c85538 100644 --- a/localedata/locales/zh_CN +++ b/localedata/locales/zh_CN @@ -39,7 +39,7 @@ category "zh_CN:2000";LC_PAPER category "zh_CN:2000";LC_NAME category "zh_CN:2000";LC_ADDRESS category "zh_CN:2000";LC_TELEPHONE - +category "zh_CN:2000";LC_MEASUREMENT END LC_IDENTIFICATION @@ -188,5 +188,6 @@ lang_lib "" END LC_ADDRESS LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK index 6c7d793f5f..77a6f8c44d 100644 --- a/localedata/locales/zh_HK +++ b/localedata/locales/zh_HK @@ -28,7 +28,7 @@ category "zh_HK:2000";LC_PAPER category "zh_HK:2000";LC_NAME category "zh_HK:2000";LC_ADDRESS category "zh_HK:2000";LC_TELEPHONE - +category "zh_HK:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -201,8 +201,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the -% +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/zh_SG b/localedata/locales/zh_SG index cf7a2f6ea2..da9d64ec46 100644 --- a/localedata/locales/zh_SG +++ b/localedata/locales/zh_SG @@ -28,7 +28,7 @@ category "zh_SG:2000";LC_PAPER category "zh_SG:2000";LC_NAME category "zh_SG:2000";LC_ADDRESS category "zh_SG:2000";LC_TELEPHONE - +category "zh_SG:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -211,8 +211,6 @@ END LC_TELEPHONE LC_MEASUREMENT -% This is the ISO_IEC TR14652 Locale definition for the LC_MEASUREMENT -% category generated by IBM Basic CountryPack Transformer. +% metric measurement 1 - END LC_MEASUREMENT diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW index eac02283e5..e3eeb4d259 100644 --- a/localedata/locales/zh_TW +++ b/localedata/locales/zh_TW @@ -40,6 +40,7 @@ category "zh_TW:2000";LC_PAPER category "zh_TW:2000";LC_NAME category "zh_TW:2000";LC_ADDRESS category "zh_TW:2000";LC_TELEPHONE +category "zh_TW:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -206,5 +207,6 @@ lang_lib "" END LC_ADDRESS LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA index b74e6e82b8..2c78e51b83 100644 --- a/localedata/locales/zu_ZA +++ b/localedata/locales/zu_ZA @@ -192,7 +192,8 @@ copy "en_ZA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_ZA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME