summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--localedata/ChangeLog232
-rw-r--r--localedata/locales/POSIX1
-rw-r--r--localedata/locales/aa_DJ2
-rw-r--r--localedata/locales/aa_ER2
-rw-r--r--localedata/locales/aa_ER@saaho2
-rw-r--r--localedata/locales/aa_ET2
-rw-r--r--localedata/locales/af_ZA2
-rw-r--r--localedata/locales/agr_PE2
-rw-r--r--localedata/locales/ak_GH2
-rw-r--r--localedata/locales/am_ET2
-rw-r--r--localedata/locales/an_ES1
-rw-r--r--localedata/locales/ar_SA1
-rw-r--r--localedata/locales/ayc_PE2
-rw-r--r--localedata/locales/az_AZ1
-rw-r--r--localedata/locales/az_IR1
-rw-r--r--localedata/locales/be_BY1
-rw-r--r--localedata/locales/be_BY@latin1
-rw-r--r--localedata/locales/bem_ZM1
-rw-r--r--localedata/locales/ber_DZ1
-rw-r--r--localedata/locales/ber_MA1
-rw-r--r--localedata/locales/br_FR1
-rw-r--r--localedata/locales/br_FR@euro1
-rw-r--r--localedata/locales/bs_BA1
-rw-r--r--localedata/locales/byn_ER2
-rw-r--r--localedata/locales/ca_AD1
-rw-r--r--localedata/locales/ca_ES1
-rw-r--r--localedata/locales/ca_ES@euro1
-rw-r--r--localedata/locales/ca_FR1
-rw-r--r--localedata/locales/ca_IT1
-rw-r--r--localedata/locales/ce_RU1
-rw-r--r--localedata/locales/cmn_TW2
-rw-r--r--localedata/locales/crh_UA1
-rw-r--r--localedata/locales/cs_CZ1
-rw-r--r--localedata/locales/csb_PL1
-rw-r--r--localedata/locales/cv_RU1
-rw-r--r--localedata/locales/cy_GB2
-rw-r--r--localedata/locales/da_DK1
-rw-r--r--localedata/locales/de_AT1
-rw-r--r--localedata/locales/de_AT@euro1
-rw-r--r--localedata/locales/de_BE1
-rw-r--r--localedata/locales/de_BE@euro1
-rw-r--r--localedata/locales/de_LU1
-rw-r--r--localedata/locales/de_LU@euro1
-rw-r--r--localedata/locales/dv_MV1
-rw-r--r--localedata/locales/dz_BT1
-rw-r--r--localedata/locales/el_GR1
-rw-r--r--localedata/locales/en_AU1
-rw-r--r--localedata/locales/en_BW1
-rw-r--r--localedata/locales/en_CA1
-rw-r--r--localedata/locales/en_DK1
-rw-r--r--localedata/locales/en_GB1
-rw-r--r--localedata/locales/en_IE1
-rw-r--r--localedata/locales/en_IE@euro1
-rw-r--r--localedata/locales/en_NG1
-rw-r--r--localedata/locales/en_NZ1
-rw-r--r--localedata/locales/en_ZA1
-rw-r--r--localedata/locales/en_ZM1
-rw-r--r--localedata/locales/en_ZW1
-rw-r--r--localedata/locales/eo1
-rw-r--r--localedata/locales/es_AR1
-rw-r--r--localedata/locales/es_BO1
-rw-r--r--localedata/locales/es_CL1
-rw-r--r--localedata/locales/es_CO1
-rw-r--r--localedata/locales/es_CR1
-rw-r--r--localedata/locales/es_DO1
-rw-r--r--localedata/locales/es_EC1
-rw-r--r--localedata/locales/es_ES1
-rw-r--r--localedata/locales/es_ES@euro1
-rw-r--r--localedata/locales/es_GT1
-rw-r--r--localedata/locales/es_HN1
-rw-r--r--localedata/locales/es_MX1
-rw-r--r--localedata/locales/es_NI1
-rw-r--r--localedata/locales/es_PA1
-rw-r--r--localedata/locales/es_PE1
-rw-r--r--localedata/locales/es_PR1
-rw-r--r--localedata/locales/es_PY1
-rw-r--r--localedata/locales/es_SV1
-rw-r--r--localedata/locales/es_US1
-rw-r--r--localedata/locales/es_UY1
-rw-r--r--localedata/locales/es_VE1
-rw-r--r--localedata/locales/et_EE1
-rw-r--r--localedata/locales/eu_ES1
-rw-r--r--localedata/locales/eu_ES@euro1
-rw-r--r--localedata/locales/fa_IR1
-rw-r--r--localedata/locales/ff_SN1
-rw-r--r--localedata/locales/fi_FI1
-rw-r--r--localedata/locales/fi_FI@euro1
-rw-r--r--localedata/locales/fil_PH1
-rw-r--r--localedata/locales/fo_FO1
-rw-r--r--localedata/locales/fr_BE1
-rw-r--r--localedata/locales/fr_BE@euro1
-rw-r--r--localedata/locales/fr_CA1
-rw-r--r--localedata/locales/fr_CH1
-rw-r--r--localedata/locales/fr_FR1
-rw-r--r--localedata/locales/fr_FR@euro1
-rw-r--r--localedata/locales/fr_LU1
-rw-r--r--localedata/locales/fr_LU@euro1
-rw-r--r--localedata/locales/fur_IT1
-rw-r--r--localedata/locales/fy_DE2
-rw-r--r--localedata/locales/fy_NL1
-rw-r--r--localedata/locales/ga_IE1
-rw-r--r--localedata/locales/ga_IE@euro1
-rw-r--r--localedata/locales/gd_GB2
-rw-r--r--localedata/locales/gez_ER2
-rw-r--r--localedata/locales/gez_ER@abegede2
-rw-r--r--localedata/locales/gez_ET2
-rw-r--r--localedata/locales/gez_ET@abegede2
-rw-r--r--localedata/locales/gl_ES1
-rw-r--r--localedata/locales/gl_ES@euro1
-rw-r--r--localedata/locales/gv_GB1
-rw-r--r--localedata/locales/ha_NG1
-rw-r--r--localedata/locales/hak_TW2
-rw-r--r--localedata/locales/he_IL1
-rw-r--r--localedata/locales/hr_HR1
-rw-r--r--localedata/locales/ht_HT2
-rw-r--r--localedata/locales/hu_HU1
-rw-r--r--localedata/locales/hy_AM2
-rw-r--r--localedata/locales/ia_FR1
-rw-r--r--localedata/locales/id_ID1
-rw-r--r--localedata/locales/ig_NG1
-rw-r--r--localedata/locales/ik_CA1
-rw-r--r--localedata/locales/is_IS1
-rw-r--r--localedata/locales/it_CH1
-rw-r--r--localedata/locales/it_IT1
-rw-r--r--localedata/locales/it_IT@euro1
-rw-r--r--localedata/locales/iu_CA2
-rw-r--r--localedata/locales/ja_JP1
-rw-r--r--localedata/locales/ka_GE2
-rw-r--r--localedata/locales/kk_KZ1
-rw-r--r--localedata/locales/kl_GL1
-rw-r--r--localedata/locales/km_KH1
-rw-r--r--localedata/locales/ku_TR1
-rw-r--r--localedata/locales/kw_GB1
-rw-r--r--localedata/locales/ky_KG3
-rw-r--r--localedata/locales/lb_LU1
-rw-r--r--localedata/locales/lg_UG1
-rw-r--r--localedata/locales/lo_LA1
-rw-r--r--localedata/locales/lv_LV1
-rw-r--r--localedata/locales/lzh_TW2
-rw-r--r--localedata/locales/mg_MG1
-rw-r--r--localedata/locales/mhr_RU1
-rw-r--r--localedata/locales/mi_NZ1
-rw-r--r--localedata/locales/mk_MK1
-rw-r--r--localedata/locales/mn_MN1
-rw-r--r--localedata/locales/nan_TW2
-rw-r--r--localedata/locales/nan_TW@latin1
-rw-r--r--localedata/locales/nhn_MX1
-rw-r--r--localedata/locales/niu_NU2
-rw-r--r--localedata/locales/niu_NZ2
-rw-r--r--localedata/locales/nl_BE1
-rw-r--r--localedata/locales/nl_BE@euro1
-rw-r--r--localedata/locales/nl_NL1
-rw-r--r--localedata/locales/nl_NL@euro1
-rw-r--r--localedata/locales/nr_ZA2
-rw-r--r--localedata/locales/nso_ZA2
-rw-r--r--localedata/locales/oc_FR2
-rw-r--r--localedata/locales/om_ET2
-rw-r--r--localedata/locales/om_KE2
-rw-r--r--localedata/locales/os_RU1
-rw-r--r--localedata/locales/pa_PK1
-rw-r--r--localedata/locales/pl_PL1
-rw-r--r--localedata/locales/ps_AF1
-rw-r--r--localedata/locales/pt_BR1
-rw-r--r--localedata/locales/pt_PT1
-rw-r--r--localedata/locales/pt_PT@euro1
-rw-r--r--localedata/locales/quz_PE2
-rw-r--r--localedata/locales/ro_RO1
-rw-r--r--localedata/locales/ru_RU1
-rw-r--r--localedata/locales/ru_UA1
-rw-r--r--localedata/locales/sc_IT1
-rw-r--r--localedata/locales/se_NO1
-rw-r--r--localedata/locales/sgs_LT1
-rw-r--r--localedata/locales/si_LK1
-rw-r--r--localedata/locales/sid_ET2
-rw-r--r--localedata/locales/sk_SK1
-rw-r--r--localedata/locales/sl_SI1
-rw-r--r--localedata/locales/so_DJ2
-rw-r--r--localedata/locales/so_ET2
-rw-r--r--localedata/locales/so_KE2
-rw-r--r--localedata/locales/so_SO2
-rw-r--r--localedata/locales/sr_ME1
-rw-r--r--localedata/locales/sr_RS1
-rw-r--r--localedata/locales/sr_RS@latin1
-rw-r--r--localedata/locales/ss_ZA2
-rw-r--r--localedata/locales/st_ZA2
-rw-r--r--localedata/locales/sv_FI1
-rw-r--r--localedata/locales/sv_FI@euro1
-rw-r--r--localedata/locales/sv_SE1
-rw-r--r--localedata/locales/sw_KE1
-rw-r--r--localedata/locales/sw_TZ1
-rw-r--r--localedata/locales/szl_PL1
-rw-r--r--localedata/locales/ta_LK1
-rw-r--r--localedata/locales/tg_TJ1
-rw-r--r--localedata/locales/th_TH1
-rw-r--r--localedata/locales/ti_ER2
-rw-r--r--localedata/locales/ti_ET2
-rw-r--r--localedata/locales/tig_ER2
-rw-r--r--localedata/locales/tk_TM1
-rw-r--r--localedata/locales/tl_PH1
-rw-r--r--localedata/locales/tn_ZA2
-rw-r--r--localedata/locales/tr_CY1
-rw-r--r--localedata/locales/tr_TR1
-rw-r--r--localedata/locales/ts_ZA2
-rw-r--r--localedata/locales/tt_RU1
-rw-r--r--localedata/locales/tt_RU@iqtelif1
-rw-r--r--localedata/locales/ug_CN1
-rw-r--r--localedata/locales/uk_UA1
-rw-r--r--localedata/locales/ur_PK1
-rw-r--r--localedata/locales/uz_UZ@cyrillic1
-rw-r--r--localedata/locales/ve_ZA2
-rw-r--r--localedata/locales/vi_VN1
-rw-r--r--localedata/locales/wa_BE2
-rw-r--r--localedata/locales/wa_BE@euro1
-rw-r--r--localedata/locales/wae_CH2
-rw-r--r--localedata/locales/wal_ET2
-rw-r--r--localedata/locales/wo_SN1
-rw-r--r--localedata/locales/xh_ZA2
-rw-r--r--localedata/locales/yi_US1
-rw-r--r--localedata/locales/yo_NG1
-rw-r--r--localedata/locales/zh_TW1
-rw-r--r--localedata/locales/zu_ZA2
221 files changed, 232 insertions, 273 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 941fba0c4b..08cdd40ab0 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,235 @@
+2017-08-08  Mike FABIAN  <mfabian@redhat.com>
+
+	Remove “% Charset: ...” comments from locale sources.
+
+	These comments are useless and only confusing.  The encodings used to
+	create binary locales from source locales are listed in the
+	localedata/SUPPORTED file.  The source files itself are ASCII or UTF-8
+	encoded where non-ASCII UTF-8 is currently only used in comments. If
+	all locale source files are UTF-8 anyway, there is no need to specify
+	that in a special comment.
+
+	* locales/POSIX: Remove “% Charset:” comment.
+	* locales/aa_DJ: Likewise.
+	* locales/aa_ER: Likewise.
+	* locales/aa_ER@saaho: Likewise.
+	* locales/aa_ET: Likewise.
+	* locales/af_ZA: Likewise.
+	* locales/agr_PE: Likewise.
+	* locales/ak_GH: Likewise.
+	* locales/am_ET: Likewise.
+	* locales/an_ES: Likewise.
+	* locales/ar_SA: Likewise.
+	* locales/ayc_PE: Likewise.
+	* locales/az_AZ: Likewise.
+	* locales/az_IR: Likewise.
+	* locales/be_BY: Likewise.
+	* locales/be_BY@latin: Likewise.
+	* locales/bem_ZM: Likewise.
+	* locales/ber_DZ: Likewise.
+	* locales/ber_MA: Likewise.
+	* locales/br_FR: Likewise.
+	* locales/br_FR@euro: Likewise.
+	* locales/bs_BA: Likewise.
+	* locales/byn_ER: Likewise.
+	* locales/ca_AD: Likewise.
+	* locales/ca_ES: Likewise.
+	* locales/ca_ES@euro: Likewise.
+	* locales/ca_FR: Likewise.
+	* locales/ca_IT: Likewise.
+	* locales/ce_RU: Likewise.
+	* locales/cmn_TW: Likewise.
+	* locales/crh_UA: Likewise.
+	* locales/cs_CZ: Likewise.
+	* locales/csb_PL: Likewise.
+	* locales/cv_RU: Likewise.
+	* locales/cy_GB: Likewise.
+	* locales/da_DK: Likewise.
+	* locales/de_AT: Likewise.
+	* locales/de_AT@euro: Likewise.
+	* locales/de_BE: Likewise.
+	* locales/de_BE@euro: Likewise.
+	* locales/de_LU: Likewise.
+	* locales/de_LU@euro: Likewise.
+	* locales/dv_MV: Likewise.
+	* locales/dz_BT: Likewise.
+	* locales/el_GR: Likewise.
+	* locales/en_AU: Likewise.
+	* locales/en_BW: Likewise.
+	* locales/en_CA: Likewise.
+	* locales/en_DK: Likewise.
+	* locales/en_GB: Likewise.
+	* locales/en_IE: Likewise.
+	* locales/en_IE@euro: Likewise.
+	* locales/en_NG: Likewise.
+	* locales/en_NZ: Likewise.
+	* locales/en_ZA: Likewise.
+	* locales/en_ZM: Likewise.
+	* locales/en_ZW: Likewise.
+	* locales/eo: Likewise.
+	* locales/es_AR: Likewise.
+	* locales/es_BO: Likewise.
+	* locales/es_CL: Likewise.
+	* locales/es_CO: Likewise.
+	* locales/es_CR: 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/gv_GB: Likewise.
+	* locales/ha_NG: Likewise.
+	* locales/hak_TW: Likewise.
+	* locales/he_IL: Likewise.
+	* locales/hr_HR: Likewise.
+	* locales/ht_HT: 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/ku_TR: Likewise.
+	* locales/kw_GB: Likewise.
+	* locales/ky_KG: Likewise.
+	* locales/lb_LU: Likewise.
+	* locales/lg_UG: Likewise.
+	* locales/lo_LA: Likewise.
+	* locales/lv_LV: Likewise.
+	* locales/lzh_TW: Likewise.
+	* locales/mg_MG: Likewise.
+	* locales/mhr_RU: Likewise.
+	* locales/mi_NZ: Likewise.
+	* locales/mk_MK: Likewise.
+	* locales/mn_MN: Likewise.
+	* locales/nan_TW: Likewise.
+	* locales/nan_TW@latin: Likewise.
+	* locales/nhn_MX: Likewise.
+	* locales/niu_NU: Likewise.
+	* locales/niu_NZ: Likewise.
+	* locales/nl_BE: Likewise.
+	* locales/nl_BE@euro: Likewise.
+	* locales/nl_NL: Likewise.
+	* locales/nl_NL@euro: Likewise.
+	* locales/nr_ZA: Likewise.
+	* locales/nso_ZA: Likewise.
+	* locales/oc_FR: Likewise.
+	* locales/om_ET: Likewise.
+	* locales/om_KE: Likewise.
+	* locales/os_RU: Likewise.
+	* locales/pa_PK: 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/sc_IT: Likewise.
+	* locales/se_NO: Likewise.
+	* locales/sgs_LT: 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/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_LK: 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/ur_PK: 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/zh_TW: Likewise.
+	* locales/zu_ZA: Likewise.
+
 2017-08-04  Akhilesh Kumar <akhilesh.k@samsung.com>
 
 	[BZ #21854]
diff --git a/localedata/locales/POSIX b/localedata/locales/POSIX
index 6d7405d808..8c151c81f4 100644
--- a/localedata/locales/POSIX
+++ b/localedata/locales/POSIX
@@ -26,7 +26,6 @@ escape_char /
 % Date: 1997-03-15
 % Application: general
 % Users: general
-% Charset: ISO646:1993
 
 LC_CTYPE
 % The following is the POSIX Locale LC_CTYPE.
diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index 98fbc1c7fc..fa918d7fc4 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -12,8 +12,6 @@ escape_char /
 %
 % Afar language locale for Djibouti (Cadu/Laaqo Dialects).
 %
-% Charset: ISO-8859-1
-%
 % Afar terms provided by Mohamed Obakar <loubak@6sens.com> of the
 % Afar Civilization Researcher, Melka Werer Research Center.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index a9f43ca3ce..002c41d9a7 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -12,8 +12,6 @@ escape_char /
 %
 % Afar language locale for Eritrea (Cadu//Laaqo Dialects).
 %
-% Charset: UTF-8
-%
 % Afar terms provided by Mohamed Obakar <loubak@6sens.com> of the
 % Afar Civilization Researcher, Melka Werer Research Center.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
index 4c005f092a..18946d52c2 100644
--- a/localedata/locales/aa_ER@saaho
+++ b/localedata/locales/aa_ER@saaho
@@ -12,8 +12,6 @@ escape_char /
 %
 % Afar language locale for Eritrea (Saaho Dialect).
 %
-% Charset: UTF-8
-%
 % Afar terms provided by Mohamed Obakar <loubak@6sens.com> of the
 % Afar Civilization Researcher, Melka Werer Research Center.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index 78e7df2002..e4d12c193b 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Afar language locale for Ethiopia (Cadu//Carra Dialects).
 %
-% Charset: UTF-8
-%
 % Afar terms provided by Mohamed Obakar <loubak@6sens.com> of the
 % Afar Civilization Researcher, Melka Werer Research Center.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA
index 4d9f18d973..af43344e66 100644
--- a/localedata/locales/af_ZA
+++ b/localedata/locales/af_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: ISO-8859-1
-
 % ChangeLog
 % 1.2.1 (2005-10-13):
 %      2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/agr_PE b/localedata/locales/agr_PE
index 046e03dd25..0f6560ec69 100644
--- a/localedata/locales/agr_PE
+++ b/localedata/locales/agr_PE
@@ -12,8 +12,6 @@ escape_char /
 %
 % Awajún / Aguaruna (agr) language locale for Peru
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Chris Leonard <cjl@sugarlabs.org> and
 % Sebastian Silva <sebastian@fuentelibre.org>
 %
diff --git a/localedata/locales/ak_GH b/localedata/locales/ak_GH
index 388be293e2..f06e24cf7c 100644
--- a/localedata/locales/ak_GH
+++ b/localedata/locales/ak_GH
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Akan locale for Ghana
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index 4fa280437d..30a8e750a4 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Amharic language locale for Ethiopia.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
index 17bf1473fc..7a3648f4f6 100644
--- a/localedata/locales/an_ES
+++ b/localedata/locales/an_ES
@@ -19,7 +19,6 @@ escape_char /
 % Date: 2003-05-22
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 %
 % This file is under the
 % GNU General Public License.
diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
index c327c2de0b..b011fd9336 100644
--- a/localedata/locales/ar_SA
+++ b/localedata/locales/ar_SA
@@ -9,7 +9,6 @@ escape_char /
 % otherwise be governed by that license.
 
 % Arabic Locale
-% Charset: ISO-8859-6
 % By: Salvador Sabanal, LinuxLab, SAP AG <salvador.sabanal@sap.com>
 % Date: Oct. 18, 1999
 
diff --git a/localedata/locales/ayc_PE b/localedata/locales/ayc_PE
index bb6bbde899..1cb2b63452 100644
--- a/localedata/locales/ayc_PE
+++ b/localedata/locales/ayc_PE
@@ -12,8 +12,6 @@ escape_char /
 %
 % Aymara, Southern (ayc) language locale for Peru
 %
-% Charset: UTF-8
-%
 % Aymara terms provided by Edgar Quispe Chambi <equispe7@gmail.com> and
 % Amos Batto <amosbatto@yahoo.com>
 %
diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
index aeddd83106..d452d4b194 100644
--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2003-12-06
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title "Azeri language locale for Azerbaijan (latin)"
diff --git a/localedata/locales/az_IR b/localedata/locales/az_IR
index b4dca0e60b..406dfe32fc 100644
--- a/localedata/locales/az_IR
+++ b/localedata/locales/az_IR
@@ -11,7 +11,6 @@ escape_char  /
 % Date: 2014-05-02
 % Application: general
 % Users: general
-% Charset: UTF-8
 % Distribution and use is free, also
 % for commercial purposes.
 
diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY
index a17fe2f6ad..e6ed0ad11f 100644
--- a/localedata/locales/be_BY
+++ b/localedata/locales/be_BY
@@ -17,7 +17,6 @@ escape_char /
 % Date: 2002-04-06
 % Application: general
 % Users: general
-% Charset: CP1251
 
 LC_IDENTIFICATION
 title      "Belarusian locale for Belarus"
diff --git a/localedata/locales/be_BY@latin b/localedata/locales/be_BY@latin
index 047685f749..58fee57579 100644
--- a/localedata/locales/be_BY@latin
+++ b/localedata/locales/be_BY@latin
@@ -17,7 +17,6 @@ escape_char /
 % Date: 2005-09-24
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Belarusian Latin-Script locale for Belarus"
diff --git a/localedata/locales/bem_ZM b/localedata/locales/bem_ZM
index 9f6caad324..a09d53ea3a 100644
--- a/localedata/locales/bem_ZM
+++ b/localedata/locales/bem_ZM
@@ -8,7 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
 % Authors:
 % 2011-04-18, Anthony Musaluke <goof2092@gmail.com>
 % 2011-04-18, info@2xlibre.net
diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ
index 6fd5895200..0071151c16 100644
--- a/localedata/locales/ber_DZ
+++ b/localedata/locales/ber_DZ
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2002-04-16
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title "Amazigh language locale for Algeria (latin)"
diff --git a/localedata/locales/ber_MA b/localedata/locales/ber_MA
index 4afe04cf2f..46fd781432 100644
--- a/localedata/locales/ber_MA
+++ b/localedata/locales/ber_MA
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2004-06-26
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title "Amazigh language locale for Morocco (tifinagh)"
diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
index c140741d1a..4b750a5e45 100644
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@@ -20,7 +20,6 @@ escape_char /
 % Revision: 0.5
 % Date: 2001-01-28
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title "Breton language locale for France"
diff --git a/localedata/locales/br_FR@euro b/localedata/locales/br_FR@euro
index 11210e72b0..03732a01d3 100644
--- a/localedata/locales/br_FR@euro
+++ b/localedata/locales/br_FR@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Breton locale for France with Euro"
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index 68c2f9471a..6fa4523be6 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2004-01-09
 % Application: general
 % Users: general
-% Charset: ISO-8859-2
 %
 % Revisions:
 % 2004-01-09 pablo@mandrakesoft.com: fixed LC_COLLATE
diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
index dad0d0035b..2d03daf8a6 100644
--- a/localedata/locales/byn_ER
+++ b/localedata/locales/byn_ER
@@ -12,8 +12,6 @@ escape_char /
 %
 % Blin language locale for Eritrea.
 %
-% Charset: UTF-8
-%
 % Blin terms are provided by Tekie Alibekit with coordination of the
 % Blin Language and Culture Association in Norway.  Prepared and contributed
 % to glibc by Daniel Yacob <locales@geez.org>
diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD
index 94e938adb0..f9210ceb15 100644
--- a/localedata/locales/ca_AD
+++ b/localedata/locales/ca_AD
@@ -16,7 +16,6 @@ escape_char /
 % Date: 2006-01-16
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Catalan locale for Andorra "
diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index 8f6307838f..e17efdc114 100644
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -20,7 +20,6 @@ escape_char /
 % Date: 1999-08-11
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Catalan locale for Spain"
diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index bdec0c95ad..6541248eff 100644
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_ES@euro
@@ -16,7 +16,6 @@ escape_char /
 % Date: 2000-08-20
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Catalan locale for Catalonia with Euro"
diff --git a/localedata/locales/ca_FR b/localedata/locales/ca_FR
index 3095db16d9..6270172dcb 100644
--- a/localedata/locales/ca_FR
+++ b/localedata/locales/ca_FR
@@ -16,7 +16,6 @@ escape_char /
 % Date: 2006-01-16
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Catalan locale for France "
diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT
index bcd01e708d..0f944de164 100644
--- a/localedata/locales/ca_IT
+++ b/localedata/locales/ca_IT
@@ -16,7 +16,6 @@ escape_char /
 % Date: 2006-01-16
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Catalan locale for Italy (L'Alguer) "
diff --git a/localedata/locales/ce_RU b/localedata/locales/ce_RU
index 96754773ed..7f24fe01b2 100644
--- a/localedata/locales/ce_RU
+++ b/localedata/locales/ce_RU
@@ -10,7 +10,6 @@ escape_char /
 
 % Chechen locale for RUSSIAN FEDERATION.
 % Contributed by Kentaroh Noji  Arslanbek Astemirov <s-o-f-t AT mail DOT ru>
-% Charset: UTF-8
 LC_IDENTIFICATION
 title      "Chechen locale for RUSSIAN FEDERATION"
 source       "ANCHR"
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index b35abc462b..bfdd9bf14e 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Mandarin Chinese locale for the Republic of China
diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA
index c387608085..06b9b5a969 100644
--- a/localedata/locales/crh_UA
+++ b/localedata/locales/crh_UA
@@ -18,7 +18,6 @@ escape_char /
 % Date:		2009-08-16
 % Application:	general
 % Users:	general
-% Charset:	UTF-8
 
 LC_IDENTIFICATION
 title		"Crimean Tatar (Crimean Turkish) language locale for Ukraine"
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 2ae91b92b7..7973dcac90 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1999-02-07
 % Application: general
 % Users: general
-% Charset: ISO_8859-2:1987
 
 % !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 % Soubor cs_CZ je primárním souborem, cs_CZ@-ch je vytvořen z něj odebráním
diff --git a/localedata/locales/csb_PL b/localedata/locales/csb_PL
index 3479dc589b..b3d26f2a50 100644
--- a/localedata/locales/csb_PL
+++ b/localedata/locales/csb_PL
@@ -20,7 +20,6 @@ escape_char /
 % Date: 2006-07-25
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Kashubian locale for Poland"
diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU
index aa92b8823d..aa002935ff 100644
--- a/localedata/locales/cv_RU
+++ b/localedata/locales/cv_RU
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2009-10-13
 % Application: general
 % Users: general
-% Charset: UTF-8
 %
 % Based on the ru_RO
 % Modifed by:
diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 2d278562af..45acff286e 100644
--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "ISO-8859-14"
-
 LC_IDENTIFICATION
 title "Welsh language locale for Great Britain"
 source "thanks to Dafydd Tomos (dafydd@imaginet.co.uk)"
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index 01be48690f..dac9440e8f 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 % The ordering algorithm is in accordance
 % with Danish Standard DS 377 (1980)
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index 7562820f18..82bee3e442 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -20,7 +20,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "German locale for Austria"
diff --git a/localedata/locales/de_AT@euro b/localedata/locales/de_AT@euro
index 6c977c622d..44a33d744d 100644
--- a/localedata/locales/de_AT@euro
+++ b/localedata/locales/de_AT@euro
@@ -20,7 +20,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "German locale for Austria with Euro"
diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 896e4416b1..a07b0ab625 100644
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "German locale for Belgium"
diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro
index 22ea14bea4..f25ebc1473 100644
--- a/localedata/locales/de_BE@euro
+++ b/localedata/locales/de_BE@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-21
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "German locale for Belgium with Euro"
diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index 1a0674dfd7..0ccbeb62d0 100644
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "German locale for Luxemburg"
diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro
index b123580883..6b7548b9a9 100644
--- a/localedata/locales/de_LU@euro
+++ b/localedata/locales/de_LU@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "German locale for Luxemburg with Euro"
diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV
index 9d00152794..d7d4da7013 100644
--- a/localedata/locales/dv_MV
+++ b/localedata/locales/dv_MV
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.1
 % Date: 2006-05-13
 % Users: general
-% Charset: utf-8
 
 LC_IDENTIFICATION
 title      "Dhivehi Language Locale for Maldives"
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index 4871f849dc..efe8884169 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -18,7 +18,6 @@ escape_char /
 % Date:      2012-12-23
 % Language:  Dzongkha(dz)
 % Territory: Bhutan(BT)
-% Charset:   UTF-8
 % Revision:  0.3
 % Date:      2004-09-03
 %
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index 2eb90bf72e..bdeb84009f 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-7
 
 LC_IDENTIFICATION
 title      "Greek locale for Greece"
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index d64cb94569..b8fc4ed0ed 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1997-11-05
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "English locale for Australia"
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
index 7aadb547bd..613c9a9af9 100644
--- a/localedata/locales/en_BW
+++ b/localedata/locales/en_BW
@@ -18,7 +18,6 @@ escape_char /
 % Revision: 1.0
 % Date: 1999-12-23
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "English locale for Botswana"
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index cd971374d9..e1505fb05e 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -23,7 +23,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "English locale for Canada"
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index 6473ce38ac..bc757460dd 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -26,7 +26,6 @@ escape_char /
 % Date: 1996-09-18
 % Application: general
 % Users: general
-% Charset: ISO_8859-1:1987
 
 LC_IDENTIFICATION
 title      "English locale for Denmark"
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index f0f94b90f8..1e78a5584e 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "English locale for Britain"
diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE
index 6dbc590052..8841f7d981 100644
--- a/localedata/locales/en_IE
+++ b/localedata/locales/en_IE
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.4
 % Date: 1997-11-05
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "English locale for Ireland"
diff --git a/localedata/locales/en_IE@euro b/localedata/locales/en_IE@euro
index cdadcfa7ea..9bbc174b3b 100644
--- a/localedata/locales/en_IE@euro
+++ b/localedata/locales/en_IE@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "English locale for Ireland with Euro"
diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG
index 1d58d2d141..c53e03986d 100644
--- a/localedata/locales/en_NG
+++ b/localedata/locales/en_NG
@@ -14,7 +14,6 @@ escape_char /
 % Revision: 0.2
 % Date: 2006-02-01
 % Users: general
-% Charset: UTF-8
 %
 % adapted from en_ZA; should be checked and verified
 
diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ
index 47543deb14..2021309cda 100644
--- a/localedata/locales/en_NZ
+++ b/localedata/locales/en_NZ
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1997-11-05
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "English locale for New Zealand"
diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA
index 2ed2c25004..51c780a39d 100644
--- a/localedata/locales/en_ZA
+++ b/localedata/locales/en_ZA
@@ -18,7 +18,6 @@ escape_char /
 % Revision: 1.3
 % Date: 2007-04-19
 % Users: general
-% Charset: ISO-8859-1
 %
 % Changelog
 % 1.3 (2007-04-19):
diff --git a/localedata/locales/en_ZM b/localedata/locales/en_ZM
index ee7847bd89..c2c8ca226a 100644
--- a/localedata/locales/en_ZM
+++ b/localedata/locales/en_ZM
@@ -8,7 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
 % Authors:
 % 2011-04-18, Anthony Musaluke <goof2092@gmail.com>
 % 2011-04-18, info@2xlibre.net
diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW
index 2bdbaae540..7b24a8d08d 100644
--- a/localedata/locales/en_ZW
+++ b/localedata/locales/en_ZW
@@ -18,7 +18,6 @@ escape_char /
 % Revision: 1.0
 % Date: 1999-12-23
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "English locale for Zimbabwe"
diff --git a/localedata/locales/eo b/localedata/locales/eo
index 084d6dbf45..a33db5ab10 100644
--- a/localedata/locales/eo
+++ b/localedata/locales/eo
@@ -21,7 +21,6 @@ escape_char /
 % Date: 2016-06-10
 % Application: general
 % Users: general
-% Charset: UTF-8
 % License: Public Domain
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index 5fd695025e..87f8608d8c 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Argentina"
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index 261939c4dd..36fc4f46b6 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Bolivia"
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index 2460d0db2c..76b2101947 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Chile"
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index e8ecb3757c..e92fa19464 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Colombia"
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index a9dd64d78e..ac18b9c353 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -14,7 +14,6 @@ escape_char /
 % Date: 2000-08-21
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Costa Rica"
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index 7ca4873332..3e5cacac3c 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Dominican Republic"
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index 067e3cadbf..4ea7c41cf6 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Ecuador"
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index e7e7bf76d4..e0b3c1470e 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Spain"
diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro
index de4bd5aef9..3a9ab628f7 100644
--- a/localedata/locales/es_ES@euro
+++ b/localedata/locales/es_ES@euro
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2000-08-20
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Spanish locale for Spain with Euro"
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index d683f83b1a..29204b73ac 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Guatemala"
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 85d6f411e8..8d1e6ab940 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Honduras"
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 52706e0b5e..fcd926d5ec 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Mexico"
diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
index 0f43349086..9aaf122ccf 100644
--- a/localedata/locales/es_NI
+++ b/localedata/locales/es_NI
@@ -14,7 +14,6 @@ escape_char /
 % Date: 2000-08-21
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Nicaragua"
diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index 7b4c70a0b5..5929630b3f 100644
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Panama"
diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index d7b8e97152..a0d264d4ae 100644
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Peru"
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index 7e35ebd383..336618c292 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -14,7 +14,6 @@ escape_char /
 % Date: 2000-08-21
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Puerto Rico"
diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index a2b2386b50..f4aec06bfc 100644
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Paraguay"
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index cd222412e6..a1c2186214 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for El Salvador"
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index f423ae3d96..b387af18c4 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for the USA"
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index c799342665..f8968874f6 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Uruguay"
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index 02ecd0b66d..5bcd210ef8 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Spanish locale for Venezuela"
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index 7f68dabc18..50470b0f85 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -23,7 +23,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 % there are   s and s< different alpha;
 % z and z with diacritics after s
diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
index e795ce6e8a..53304f9f12 100644
--- a/localedata/locales/eu_ES
+++ b/localedata/locales/eu_ES
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 %
 % some updates done by Elhuyar http://www.elhuyar.com/
diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro
index 5426042bfc..77adbd0d9e 100644
--- a/localedata/locales/eu_ES@euro
+++ b/localedata/locales/eu_ES@euro
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2000-08-21
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Basque language locale for Spain with Euro"
diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR
index 1e597036a7..415c9b470c 100644
--- a/localedata/locales/fa_IR
+++ b/localedata/locales/fa_IR
@@ -20,7 +20,6 @@ escape_char /
 % Revision: 3.0
 % Date: 2005-04-06
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Persian locale for Iran"
diff --git a/localedata/locales/ff_SN b/localedata/locales/ff_SN
index 7a195190c6..6bd1ecc955 100644
--- a/localedata/locales/ff_SN
+++ b/localedata/locales/ff_SN
@@ -8,7 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
 % Authors:
 % 2011-03-28, admin@pulaar-fulfulde.org
 % 2011-03-28, info@2xlibre.net
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index 8e70d8e215..6d0dbb386b 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -23,7 +23,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: UTF-8, ISO-8859-15
 %
 % Useful sources:
 %   Locale info for Finnish in Finland
diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro
index 78d441905d..f0590177a9 100644
--- a/localedata/locales/fi_FI@euro
+++ b/localedata/locales/fi_FI@euro
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2000-08-20
 % Application: general
 % Users: general
-% Charset: UTF-8, ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Finnish locale for Finland with Euro"
diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH
index a049595440..869b22ad92 100644
--- a/localedata/locales/fil_PH
+++ b/localedata/locales/fil_PH
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.5
 % Date: 2005-02-02
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title "Filipino language locale for Philippines"
diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO
index 0509d33550..4c02df5192 100644
--- a/localedata/locales/fo_FO
+++ b/localedata/locales/fo_FO
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 %
 % Only LC_TIME and LC_MESSAGES are
 % specified here, else use the da_DK locale
diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index 642793106d..fa280f32e5 100644
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.4
 % Date: 1997-03-18
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "French locale for Belgium"
diff --git a/localedata/locales/fr_BE@euro b/localedata/locales/fr_BE@euro
index b8b2cb74dd..5c7b4ef3d6 100644
--- a/localedata/locales/fr_BE@euro
+++ b/localedata/locales/fr_BE@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "French locale for Belgium with Euro"
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 8b443e3af0..195d2143d3 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "French locale for Canada"
diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
index 63a5d84ead..70ee98faf6 100644
--- a/localedata/locales/fr_CH
+++ b/localedata/locales/fr_CH
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "French locale for Switzerland"
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index 68305a428e..3c41622c2c 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -19,7 +19,6 @@ escape_char /
 % Revision: 4.4
 % Date: 2008-03-02
 % Users: general
-% Charset: ISO-8859-1
 % Authors:
 % 2000-06-28, keld.simonsen@dkuug.dk
 % 2008-03-02, stephane.raimbault@gmail.com
diff --git a/localedata/locales/fr_FR@euro b/localedata/locales/fr_FR@euro
index afdfe5e331..6583524672 100644
--- a/localedata/locales/fr_FR@euro
+++ b/localedata/locales/fr_FR@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "French locale for France with Euro"
diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
index b0ee35605c..332c6c7897 100644
--- a/localedata/locales/fr_LU
+++ b/localedata/locales/fr_LU
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "French locale for Luxemburg"
diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro
index 1a7307aea0..a25df4d6b8 100644
--- a/localedata/locales/fr_LU@euro
+++ b/localedata/locales/fr_LU@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "French locale for Luxemburg with Euro"
diff --git a/localedata/locales/fur_IT b/localedata/locales/fur_IT
index e02d10f141..f9f86ac1dc 100644
--- a/localedata/locales/fur_IT
+++ b/localedata/locales/fur_IT
@@ -14,7 +14,6 @@ escape_char /
 % Revision: 0.3
 % Date: 2004-04-26
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Furlan locale for Italy"
diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE
index 56af7f9fd1..57130a0ee4 100644
--- a/localedata/locales/fy_DE
+++ b/localedata/locales/fy_DE
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "ISO_8859-1:1987"
-
 LC_IDENTIFICATION
 title "Sater Frisian and North Frisian Locale for Germany"
 source "information from Kenneth Christiansen"
diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
index 37364011c2..a1ec59bcf4 100644
--- a/localedata/locales/fy_NL
+++ b/localedata/locales/fy_NL
@@ -13,7 +13,6 @@ escape_char /
 % Territory: NL
 % Date: 2006-8-13
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Frisian locale for the Netherlands"
diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE
index 3642133c50..822c7dbb85 100644
--- a/localedata/locales/ga_IE
+++ b/localedata/locales/ga_IE
@@ -20,7 +20,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Irish locale for Ireland"
diff --git a/localedata/locales/ga_IE@euro b/localedata/locales/ga_IE@euro
index ee910b2993..fbbb4d742b 100644
--- a/localedata/locales/ga_IE@euro
+++ b/localedata/locales/ga_IE@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-21
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Irish locale for Ireland with Euro"
diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
index f744e04215..5fc18dc656 100644
--- a/localedata/locales/gd_GB
+++ b/localedata/locales/gd_GB
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Revision 1.1 created by Alastair McKinstry <mckinstry@computer.org>, 2000-06-12
diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
index b48069c76f..6a0078ae77 100644
--- a/localedata/locales/gez_ER
+++ b/localedata/locales/gez_ER
@@ -12,8 +12,6 @@ escape_char /
 %
 % Ge'ez language locale for Eritrea.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/gez_ER@abegede b/localedata/locales/gez_ER@abegede
index b665c4af82..438c580c05 100644
--- a/localedata/locales/gez_ER@abegede
+++ b/localedata/locales/gez_ER@abegede
@@ -12,8 +12,6 @@ escape_char /
 %
 % Ge'ez language locale for Eritrea with Abegede collation.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
index 5460def242..2dd4927b2d 100644
--- a/localedata/locales/gez_ET
+++ b/localedata/locales/gez_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Ge'ez language locale for Ethiopia.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/gez_ET@abegede b/localedata/locales/gez_ET@abegede
index 2780c50aec..dc330851c9 100644
--- a/localedata/locales/gez_ET@abegede
+++ b/localedata/locales/gez_ET@abegede
@@ -12,8 +12,6 @@ escape_char /
 %
 % Ge'ez language locale for Ethiopia with Abegede collation.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES
index 21e7dc92b0..f4e67a7d27 100644
--- a/localedata/locales/gl_ES
+++ b/localedata/locales/gl_ES
@@ -21,7 +21,6 @@ escape_char /
 % Date: 1999-07-07
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 % Based in the es_ES Locale
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/gl_ES@euro b/localedata/locales/gl_ES@euro
index d52a015d96..b2ba8acdfc 100644
--- a/localedata/locales/gl_ES@euro
+++ b/localedata/locales/gl_ES@euro
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2000-08-21
 % Application: general
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Galician locale for Spain with Euro"
diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB
index 24cf6cf115..f8fd939191 100644
--- a/localedata/locales/gv_GB
+++ b/localedata/locales/gv_GB
@@ -23,7 +23,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1999-07-06
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Manx Gaelic locale for Britain"
diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG
index e14d2ee57d..5758634f29 100644
--- a/localedata/locales/ha_NG
+++ b/localedata/locales/ha_NG
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.2
 % Date: 2006-02-01
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Hausa locale for Nigeria"
diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
index 8e6bec2341..5ed72aa160 100644
--- a/localedata/locales/hak_TW
+++ b/localedata/locales/hak_TW
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Hakka Chinese locale for the Republic of China
diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL
index 8fb3dc2e13..41ac2141b0 100644
--- a/localedata/locales/he_IL
+++ b/localedata/locales/he_IL
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.4
 % Date: 1997-03-18
 % Users: general
-% Charset: ISO-8859-8
 %
 % This locale replaces iw_IL, as the ISO-639 code for Hebrew was changed
 % from 'iw' to 'he' in 1989, according to Bruno Haible on libc-alpha
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index afbd863677..6f36b24c68 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1999-03-01
 % Application: general
 % Users: general
-% Charset: ISO-8859-2
 
 LC_IDENTIFICATION
 title      "Croatian locale for Croatia"
diff --git a/localedata/locales/ht_HT b/localedata/locales/ht_HT
index fd82c8e9da..9d1e1b30c2 100644
--- a/localedata/locales/ht_HT
+++ b/localedata/locales/ht_HT
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Haitian Kreyol (Kreyòl Ayisyen) language locale for Haiti
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index 31c59ea194..9e9128f286 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -34,7 +34,6 @@ escape_char /
 % Date: 2001-01-29
 % Application: general
 % Users: general
-% Charset: ISO-8859-2
 
 LC_IDENTIFICATION
 title      "Hungarian locale for Hungary"
diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM
index aff4ffc4b6..b0bfbe8db4 100644
--- a/localedata/locales/hy_AM
+++ b/localedata/locales/hy_AM
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 LC_IDENTIFICATION
 title "Armenian language locale for Armenia"
 source "http:////www.freenet.am//armscii"
diff --git a/localedata/locales/ia_FR b/localedata/locales/ia_FR
index 11e28bbfc6..93d6535610 100644
--- a/localedata/locales/ia_FR
+++ b/localedata/locales/ia_FR
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2013-03-01
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title "Interlingua locale for France"
diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID
index f9c7e15592..cab6a61d0e 100644
--- a/localedata/locales/id_ID
+++ b/localedata/locales/id_ID
@@ -21,7 +21,6 @@ escape_char /
 % Date: 1999-09-08
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Indonesian locale for Indonesia"
diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG
index 9f7d172184..a6aee5bc50 100644
--- a/localedata/locales/ig_NG
+++ b/localedata/locales/ig_NG
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.2
 % Date: 2005-12-14
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Igbo locale for Nigeria"
diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
index 2ce056763c..4174804ec3 100644
--- a/localedata/locales/ik_CA
+++ b/localedata/locales/ik_CA
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.2
 % Date: 2004-08-01
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Inupiaq locale for Canada"
diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index 03cfb6bb67..e69ac183cc 100644
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Icelandic locale for Iceland"
diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH
index d3fa4df75d..a81da58867 100644
--- a/localedata/locales/it_CH
+++ b/localedata/locales/it_CH
@@ -14,7 +14,6 @@ escape_char /
 % Revision: ........
 % Date: 1999-01-21
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Italian locale for Switzerland"
diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
index 671d2feaf0..e10cee431a 100644
--- a/localedata/locales/it_IT
+++ b/localedata/locales/it_IT
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Italian locale for Italy"
diff --git a/localedata/locales/it_IT@euro b/localedata/locales/it_IT@euro
index 569037347a..cf281c959e 100644
--- a/localedata/locales/it_IT@euro
+++ b/localedata/locales/it_IT@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Italian locale for Italy with Euro"
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index fdc7bc812a..7bcb82681b 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "UTF-8"
-
 LC_IDENTIFICATION
 title "Inuktitut language locale for Nunavut, Canada"
 source ""
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index e451f6d476..0a0b8023ab 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -12,7 +12,6 @@ escape_char /
 % Version: 0.7
 % Date:    1999-12-05
 % Write:   HANATAKA, Shinya <hanataka@abyss.rim.or.jp>
-% Charset: EUC-JP
 
 LC_IDENTIFICATION
 title      "Japanese language locale for Japan"
diff --git a/localedata/locales/ka_GE b/localedata/locales/ka_GE
index d9903731db..7b38a00c94 100644
--- a/localedata/locales/ka_GE
+++ b/localedata/locales/ka_GE
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "GEORGIAN-PS"
-
 LC_IDENTIFICATION
 title "Georgian language locale for Georgia"
 source ""
diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ
index aa020e645f..0962feb6ed 100644
--- a/localedata/locales/kk_KZ
+++ b/localedata/locales/kk_KZ
@@ -21,7 +21,6 @@ escape_char /
 % Date: 2016-03-22
 % Application: general
 % Users: general
-% Charset: UTF-8
 % License: Public Domain
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
index 3ba625dd03..a51e21911b 100644
--- a/localedata/locales/kl_GL
+++ b/localedata/locales/kl_GL
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 %
 % Only LC_TIME and LC_MESSAGES are
 % specified here, else the da_DK locale
diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index fd47be0fe0..1a9ed04106 100644
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -16,7 +16,6 @@ escape_char /
 % E-mail:       jens@khmeros.info
 % Language:     Khmer
 % Territory:    Cambodia
-% Charset:      UTF-8
 % Revision:     1.0
 % Date:         2005-03-15
 
diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR
index a028693815..6c889355e5 100644
--- a/localedata/locales/ku_TR
+++ b/localedata/locales/ku_TR
@@ -19,7 +19,6 @@ escape_char /
 % Revision: 0.1
 % Date: 2003-07-27
 % Users: general
-% Charset: UTF-8
 % History:
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB
index 2e1a0b943d..ae3e0ab204 100644
--- a/localedata/locales/kw_GB
+++ b/localedata/locales/kw_GB
@@ -24,7 +24,6 @@ escape_char /
 % Revision: 1.0
 % Date: 1999-08-09
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Cornish locale for Britain"
diff --git a/localedata/locales/ky_KG b/localedata/locales/ky_KG
index 2d23cb84de..920b2401cc 100644
--- a/localedata/locales/ky_KG
+++ b/localedata/locales/ky_KG
@@ -8,9 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "UTF-8"
-
-%
 %
 % needed extra chars: <U04A2>, <U04A3>, <U04E8>, <U04E9>, <U04AE>, <U04AF>
 %
diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU
index bfe37bc62f..e5d50e878c 100644
--- a/localedata/locales/lb_LU
+++ b/localedata/locales/lb_LU
@@ -10,7 +10,6 @@ escape_char /
 
 % Locale for Luxembourgish locale in Luxembourg
 % Contributed by Pit Wenkin <pit@wenkin.lu>, 2011
-% Charset UTF-8
 
 LC_IDENTIFICATION
 title      "Luxembourgish locale for Luxembourg"
diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG
index 0750d2ebc9..6a229dbadc 100644
--- a/localedata/locales/lg_UG
+++ b/localedata/locales/lg_UG
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 1.0
 % Date: 2001-11-04
 % Users: general
-% Charset: ISO-8859-10
 
 LC_IDENTIFICATION
 title      "Luganda locale for Uganda"
diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
index d0bcceb1cb..a5e1f641f8 100644
--- a/localedata/locales/lo_LA
+++ b/localedata/locales/lo_LA
@@ -16,7 +16,6 @@ escape_char /
 % E-mail:       Anousak@muanglao.com
 % Language:     Lao
 % Territory:    Laos
-% Charset:      UTF-8
 % Revision:     1.2
 % Date:         2003-15-09
 
diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV
index fe0bc32a99..9a9bd0e325 100644
--- a/localedata/locales/lv_LV
+++ b/localedata/locales/lv_LV
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1995-08-28
 % Application: general
 % Users: general
-% Charset: BALTIC
 
 % <CAPITAL> before <SMALL> letters
 
diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
index e575a8ae74..9529fca2dc 100644
--- a/localedata/locales/lzh_TW
+++ b/localedata/locales/lzh_TW
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Literary Chinese locale for the Republic of China
diff --git a/localedata/locales/mg_MG b/localedata/locales/mg_MG
index ae4335bc90..2983ab641a 100644
--- a/localedata/locales/mg_MG
+++ b/localedata/locales/mg_MG
@@ -18,7 +18,6 @@ escape_char /
 % Revision: 1.0
 % Date: 2004-09-08
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Malagasy locale for Madagascar"
diff --git a/localedata/locales/mhr_RU b/localedata/locales/mhr_RU
index a54d3e3e75..7ad658a8b8 100644
--- a/localedata/locales/mhr_RU
+++ b/localedata/locales/mhr_RU
@@ -21,7 +21,6 @@ escape_char /
 % Date: 2011-04-18
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Mari locale for Russia"
diff --git a/localedata/locales/mi_NZ b/localedata/locales/mi_NZ
index 6589dede13..0e86978264 100644
--- a/localedata/locales/mi_NZ
+++ b/localedata/locales/mi_NZ
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.3
 % Date: 2001-01-28
 % Users: general
-% Charset: ISO-8859-13
 
 LC_IDENTIFICATION
 title "Maori language locale for New Zealand"
diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK
index caa28110a5..a2a2f48423 100644
--- a/localedata/locales/mk_MK
+++ b/localedata/locales/mk_MK
@@ -11,7 +11,6 @@ escape_char /
 % Macedonian language locale for Macedonia
 % Damjan Georgievski { gdamjan %% gmail.com }
 % Revision: 2.2 (2006-09-12)
-% Charsets: UTF-8, ISO-8859-5, CP1251
 
 LC_IDENTIFICATION
 title      "Macedonian locale for Macedonia"
diff --git a/localedata/locales/mn_MN b/localedata/locales/mn_MN
index 28553633cd..44b49f34ff 100644
--- a/localedata/locales/mn_MN
+++ b/localedata/locales/mn_MN
@@ -11,7 +11,6 @@ escape_char /
 % Mongolian language (cyrillic) locale for Mongolia
 % Sanlig Badral <badral@chinggis.com>
 % Revision: 1.0 (2005-5-21)
-% Charsets: UTF-8
 
 LC_IDENTIFICATION
 title      "Mongolian locale for Mongolia"
diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
index cdb6b071a8..d323fe0ac4 100644
--- a/localedata/locales/nan_TW
+++ b/localedata/locales/nan_TW
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Min Nan Chinese locale for the Republic of China
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index 6b9136c8ff..1ba5e60b47 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.1
 % Date: 2008-06-16
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title "Minnan language locale for Taiwan"
diff --git a/localedata/locales/nhn_MX b/localedata/locales/nhn_MX
index f80744902d..4122ad40e6 100644
--- a/localedata/locales/nhn_MX
+++ b/localedata/locales/nhn_MX
@@ -20,7 +20,6 @@ escape_char /
 % Date: 2012-08-19
 % Application: general
 % Users: general
-% Charset: UTF-8
 % This file is distributed under the same license as the glibc package.
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU
index 73b74f0aa0..d9be018d85 100644
--- a/localedata/locales/niu_NU
+++ b/localedata/locales/niu_NU
@@ -12,8 +12,6 @@ escape_char /
 %
 % Niuean, Vagahau Niue language locale for Niue
 %
-% Charset: UTF-8
-%
 % Niuean terms provided by Emani Fakaotimanava-Lui <emani@niue.nu>
 %
 % Prepared and contributed to glibc by Chris Leonard <cjl@sugarlabs.org> and
diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ
index d494c4a4c2..6bf7c2cf47 100644
--- a/localedata/locales/niu_NZ
+++ b/localedata/locales/niu_NZ
@@ -12,8 +12,6 @@ escape_char /
 %
 % Niuean, Vagahau Niue language locale for New Zealand
 %
-% Charset: UTF-8
-%
 % Niuean terms provided by Emani Fakaotimanava-Lui <emani@niue.nu>
 %
 % Prepared and contributed to glibc by Chris Leonard <cjl@sugarlabs.org> and
diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index ac728eab8e..6775f2cff9 100644
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Dutch locale for Belgium"
diff --git a/localedata/locales/nl_BE@euro b/localedata/locales/nl_BE@euro
index 93d7ad3fdb..10627586a9 100644
--- a/localedata/locales/nl_BE@euro
+++ b/localedata/locales/nl_BE@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-21
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Dutch locale for Belgium with Euro"
diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL
index fa6d1fc31a..fade2f10ac 100644
--- a/localedata/locales/nl_NL
+++ b/localedata/locales/nl_NL
@@ -23,7 +23,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Dutch locale for the Netherlands"
diff --git a/localedata/locales/nl_NL@euro b/localedata/locales/nl_NL@euro
index f300361037..8f298a279d 100644
--- a/localedata/locales/nl_NL@euro
+++ b/localedata/locales/nl_NL@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Dutch locale for the Netherlands with Euro"
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index 5cb4e570fb..34e24d7fa9 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-13):
 %     2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
index e374f39d51..6b0f2e1232 100644
--- a/localedata/locales/nso_ZA
+++ b/localedata/locales/nso_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-13):
 %      2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR
index 66e0c0e8b3..a28dec8226 100644
--- a/localedata/locales/oc_FR
+++ b/localedata/locales/oc_FR
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "ISO_8859-1:1987"
-
 LC_IDENTIFICATION
 title "Occitan Language Locale for France"
 source "RAP"
diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
index 0e79cb2800..44f685108b 100644
--- a/localedata/locales/om_ET
+++ b/localedata/locales/om_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Oromo language locale for Ethiopia.
 %
-% Charset: UTF-8 (Under Qubee conventions)
-%
 % Oromo terms are provided by Mahdi Hamid Muudee of Sagalee Oromoo
 % Publishing Co. Inc and formatted in this locale by Daniel Yacob of
 % the Ge'ez Frontier Foundation.  The Oromo language terms used here
diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE
index 282f6cee7e..e1448ca691 100644
--- a/localedata/locales/om_KE
+++ b/localedata/locales/om_KE
@@ -12,8 +12,6 @@ escape_char /
 %
 % Oromo language locale for Kenya.
 %
-% Charset: ISO-8859-1 (Under Qubee conventions)
-%
 % Oromo terms are provided by Mahdi Hamid Muudee of Sagalee Oromoo
 % Publishing Co. Inc and formatted in this locale by Daniel Yacob of
 % the Ge'ez Frontier Foundation.  The Oromo language terms used here
diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU
index 62585e60e2..3b7cdf0cf6 100644
--- a/localedata/locales/os_RU
+++ b/localedata/locales/os_RU
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2011-05-06
 % Application: general
 % Users: general
-% Charset: UTF-8
 %
 % Based on ru_RU, cv_RU, da_DK
 % Modifed by:
diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK
index f9de3c20a1..609ca9baa5 100644
--- a/localedata/locales/pa_PK
+++ b/localedata/locales/pa_PK
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.1
 % Date: 2005-12-31
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Punjabi (Shahmukhi) Language Locale for Pakistan"
diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index 4476323de6..d63588adca 100644
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Charset: ISO-8859-2
 
 LC_IDENTIFICATION
 title      "Polish locale for Poland"
diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
index 0402f139d5..4064b65792 100644
--- a/localedata/locales/ps_AF
+++ b/localedata/locales/ps_AF
@@ -15,7 +15,6 @@ escape_char /
 % Locale name: ps_AF.UTF-8
 % Language: Pashto
 % Territory: Afghanistan
-% Charset: UTF-8
 % Revision: 0.1
 % By: Nasir Gulzade<nasirgulzade@hotmail.com>
 % Creation Date: Thu, 15 Jan 2009 18:16:15 +0500 GMT
diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index eda5c1b34f..cd86df25de 100644
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.4
 % Date: 1997-03-19
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Portuguese locale for Brasil"
diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
index 1cdfc15ae2..fdec34afc8 100644
--- a/localedata/locales/pt_PT
+++ b/localedata/locales/pt_PT
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Portuguese locale for Portugal"
diff --git a/localedata/locales/pt_PT@euro b/localedata/locales/pt_PT@euro
index b29561bc35..3ca18ee02e 100644
--- a/localedata/locales/pt_PT@euro
+++ b/localedata/locales/pt_PT@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-20
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Portuguese locale for Portugal with Euro"
diff --git a/localedata/locales/quz_PE b/localedata/locales/quz_PE
index d95ff933e4..e4ad076eb6 100644
--- a/localedata/locales/quz_PE
+++ b/localedata/locales/quz_PE
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Quechua (Cusco-Collao) language locale for Peru
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 7a7dee06d7..4a68700bbe 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: UTF-8
 %
 % Corrections by:
 %  2006-01-07
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 9993e9e923..6434f39041 100644
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Charset: ISO-8859-5
 
 LC_IDENTIFICATION
 title      "Russian locale for Russia"
diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA
index 789bd53eb2..8c071ecaee 100644
--- a/localedata/locales/ru_UA
+++ b/localedata/locales/ru_UA
@@ -18,7 +18,6 @@ escape_char /
 % Date: 1998-05-03
 % Application: general
 % Users: general
-% Charset: KOI8-U
 
 LC_IDENTIFICATION
 title      "Russian locale for Ukraine"
diff --git a/localedata/locales/sc_IT b/localedata/locales/sc_IT
index a17d1b383b..d16892f897 100644
--- a/localedata/locales/sc_IT
+++ b/localedata/locales/sc_IT
@@ -14,7 +14,6 @@ escape_char /
 % Revision: 0.2
 % Date: 2017-07-21
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Sardinian locale for Italy"
diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO
index c4bdb45beb..afd5988813 100644
--- a/localedata/locales/se_NO
+++ b/localedata/locales/se_NO
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2001-11-03
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title "Northern Saami language locale for Norway"
diff --git a/localedata/locales/sgs_LT b/localedata/locales/sgs_LT
index 9a2e4128ea..67fbf4d752 100644
--- a/localedata/locales/sgs_LT
+++ b/localedata/locales/sgs_LT
@@ -22,7 +22,6 @@ escape_char /
 % Application: general
 % Users: general
 % Repertoiremap: mnemonic.ds
-% Charset: UTF-8
 % Distribution and use is free, also
 % for commercial purposes.
 
diff --git a/localedata/locales/si_LK b/localedata/locales/si_LK
index 9bd8bac33b..4348b8408e 100644
--- a/localedata/locales/si_LK
+++ b/localedata/locales/si_LK
@@ -9,7 +9,6 @@ escape_char /
 % otherwise be governed by that license.
 
 % Sinhala language locale for Sri Lanka.
-% Charset: UTF-8
 % Contributed by Anuradha Ratnaweera <anuradha at gnu org>
 % and Himira Ratnatilake <himira at linux lk>
 
diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
index 4dda182136..dcf8e09874 100644
--- a/localedata/locales/sid_ET
+++ b/localedata/locales/sid_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Sidama language locale for Ethiopia.
 %
-% Charset: UTF-8
-%
 % Sidama terms provided by Dessalegn Garsamo Gabbiso <gabbiso2001@yahoo.com>
 % of the National University of Ireland, Dublin and A.H. Weno
 % <bus1hwa@east-01.novell.leeds.ac.uk>. Prepared and contributed to glibc
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index 2f5c390760..11e86d3d1c 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -21,7 +21,6 @@ escape_char /
 % Date: 1998-05-26
 % Application: general
 % Users: general
-% Charset: ISO-8859-2
 
 % 1997-05-14: Odvodené z cs_CZ locale Vladimíra Michla.
 %             Collate algoritmy prevzaté bezo zmien (norma bola rovnaká),
diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI
index a8bee615d8..b2aee954ce 100644
--- a/localedata/locales/sl_SI
+++ b/localedata/locales/sl_SI
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Charset: ISO-8859-2
 
 LC_IDENTIFICATION
 title      "Slovenian locale for Slovenia"
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index 250faffcbb..081d1f01e4 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -12,8 +12,6 @@ escape_char /
 %
 % Somali language locale for Djibouti.
 %
-% Charset: ISO-8859-1
-%
 % Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
 % Department of Linguistics and Translation, Université de Montréal, Montreal.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index d5c840c38b..8b1d285981 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Somali language locale for Ethiopia.
 %
-% Charset: UTF-8
-%
 % Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
 % Department of Linguistics and Translation, Université de Montréal, Montreal.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index ca9dc5e490..6ec59ae40e 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -12,8 +12,6 @@ escape_char /
 %
 % Somali language locale for Kenya.
 %
-% Charset: ISO-8859-1
-%
 % Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
 % Department of Linguistics and Translation, Université de Montréal, Montreal.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index 444fbe7569..1e2b3e76dc 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -12,8 +12,6 @@ escape_char /
 %
 % Somali language locale for Somalia.
 %
-% Charset: ISO-8859-1
-%
 % Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
 % Department of Linguistics and Translation, Université de Montréal, Montreal.
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME
index 122707fd4d..b8617958e4 100644
--- a/localedata/locales/sr_ME
+++ b/localedata/locales/sr_ME
@@ -22,7 +22,6 @@ escape_char /
 % Date: 2006-10-11
 % Application: general
 % Users: general
-% Charset: UTF-8, ISO-8859-5
 
 LC_IDENTIFICATION
 title      "Serbian locale for Montenegro"
diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index 2db556115c..c0d008b905 100644
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -22,7 +22,6 @@ escape_char /
 % Date: 2006-10-09
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Serbian locale for Serbia"
diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
index 6c46927549..ec5adf4b49 100644
--- a/localedata/locales/sr_RS@latin
+++ b/localedata/locales/sr_RS@latin
@@ -22,7 +22,6 @@ escape_char /
 % Date: 2006-10-09
 % Application: general
 % Users: general
-% Charset: UTF-8, ISO-8859-2
 
 LC_IDENTIFICATION
 title      "Serbian Latin locale for Serbia"
diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA
index c989d9af92..c5e77ddd4f 100644
--- a/localedata/locales/ss_ZA
+++ b/localedata/locales/ss_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-13):
 %     2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index 5844da2c50..d97cdae175 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-13):
 %    2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI
index 4cddd4b1bd..a8830cdc79 100644
--- a/localedata/locales/sv_FI
+++ b/localedata/locales/sv_FI
@@ -21,7 +21,6 @@ escape_char /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title      "Swedish locale for Finland"
diff --git a/localedata/locales/sv_FI@euro b/localedata/locales/sv_FI@euro
index ae6dff5e36..01976df647 100644
--- a/localedata/locales/sv_FI@euro
+++ b/localedata/locales/sv_FI@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2000-08-21
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Swedish locale for Finland with Euro"
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index c11da51d23..535597fdd5 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Charset: ISO-8859-1
 
 % This is a 4 step version.
 % The Swedish Technical Standard
diff --git a/localedata/locales/sw_KE b/localedata/locales/sw_KE
index 137a381e9c..72137f0dc9 100644
--- a/localedata/locales/sw_KE
+++ b/localedata/locales/sw_KE
@@ -8,7 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
 % Authors:
 % 2011-03-07, locales@kamusi.org
 % 2011-03-07, info@2xlibre.net
diff --git a/localedata/locales/sw_TZ b/localedata/locales/sw_TZ
index 383a305818..5c3d71918d 100644
--- a/localedata/locales/sw_TZ
+++ b/localedata/locales/sw_TZ
@@ -8,7 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
 % Authors:
 % 2011-03-07, locales@kamusi.org
 % 2011-03-07, info@2xlibre.net
diff --git a/localedata/locales/szl_PL b/localedata/locales/szl_PL
index 931e416187..891ef41b0d 100644
--- a/localedata/locales/szl_PL
+++ b/localedata/locales/szl_PL
@@ -20,7 +20,6 @@ escape_char /
 % Date: 2012-07-22
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Silesian locale for Poland"
diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK
index e8f39ab140..610afa2437 100644
--- a/localedata/locales/ta_LK
+++ b/localedata/locales/ta_LK
@@ -15,7 +15,6 @@ escape_char /
 % Date: 2011,August,11
 % Application: general
 % Users: general
-% Charset: SLS 1326:2008
 
 LC_IDENTIFICATION
 title      "Tamil language locale for Sri Lanka"
diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ
index e7be6d603d..4b8b0f5280 100644
--- a/localedata/locales/tg_TJ
+++ b/localedata/locales/tg_TJ
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2004-01-09
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 %
 % TODO: check LC_COLLATE
diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
index 1b9b0414f4..aac7a20247 100644
--- a/localedata/locales/th_TH
+++ b/localedata/locales/th_TH
@@ -22,7 +22,6 @@ escape_char /
 % E-mail:    thep@links.nectec.or.th
 % Language:  Thai
 % Territory: Thailand
-% Charset:   TIS-620.2533:1990
 % Revision:  0.5.3
 % Date:      1999-05-28
 
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index 8e496c59cd..b4abde3020 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -12,8 +12,6 @@ escape_char /
 %
 % Tigrigna language locale for Eritrea.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index fd6f494891..13280d4790 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Tigrigna language locale for Ethiopia.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
index 9cbbc41cdf..9571704208 100644
--- a/localedata/locales/tig_ER
+++ b/localedata/locales/tig_ER
@@ -12,8 +12,6 @@ escape_char /
 %
 % Tigre language locale for Eritrea.
 %
-% Charset: UTF-8
-%
 % Tigre terms are provided by Mussie Bekit with coordination by the
 % Shimagale Team <http://www.shimagle.com/>.  Prepared and contributed
 % to glibc by Daniel Yacob <locales@geez.org>
diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM
index 9ab463ccbe..ed561c714c 100644
--- a/localedata/locales/tk_TM
+++ b/localedata/locales/tk_TM
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2011-04-09
 % Application: general
 % Users: general
-% Charset: UTF-8
 
 % needed extra chars: ä, ö, ü, ý, ç, ş, ň, ž
 % cyrillic extra chars: җ (z%,=), ң (n,=), ө (o-=), ү (u'=), ә (sw=)
diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH
index 01002c2e54..046e52f935 100644
--- a/localedata/locales/tl_PH
+++ b/localedata/locales/tl_PH
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.2
 % Date: 2001-01-28
 % Users: general
-% Charset: ISO-8859-1
 
 LC_IDENTIFICATION
 title "Tagalog language locale for Philippines"
diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA
index 71f063dd90..57bba64d0c 100644
--- a/localedata/locales/tn_ZA
+++ b/localedata/locales/tn_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.4 (2005-10-13):
 %     2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
index f7f2e45183..4c2c16f410 100644
--- a/localedata/locales/tr_CY
+++ b/localedata/locales/tr_CY
@@ -14,7 +14,6 @@ escape_char /
 % Revision: 4.4
 % Application: general
 % Users: general
-% Charset: ISO-8859-9
 
 % Adapted from tr_TR by Recai Oktaş <roktas@omu.edu.tr>, 2004
 
diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index 94a642dfc7..b6f5227ae2 100644
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -22,7 +22,6 @@ escape_char /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Charset: ISO-8859-9
 
 % Corrections by:
 %   1998-01-11T15:54:39
diff --git a/localedata/locales/ts_ZA b/localedata/locales/ts_ZA
index c41557a6f7..dea2da5628 100644
--- a/localedata/locales/ts_ZA
+++ b/localedata/locales/ts_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-12):
 %     2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU
index f06e798180..e305cf50f7 100644
--- a/localedata/locales/tt_RU
+++ b/localedata/locales/tt_RU
@@ -18,7 +18,6 @@ escape_char /
 % Date: 2001-01-28
 % Application: general
 % Users: general
-% Charset: TATAR-CYR
 
 %
 % TODO: check LC_COLLATE
diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif
index db6db5c3c6..0e1c3925e3 100644
--- a/localedata/locales/tt_RU@iqtelif
+++ b/localedata/locales/tt_RU@iqtelif
@@ -18,7 +18,6 @@ escape_char /
 % Date:		2006-10-12
 % Application:	general
 % Users:	general
-% Charset:	ISO-8859-9
 
 LC_IDENTIFICATION
 title		"Tatar language locale using IQTElif alphabet; for Tatarstan, Russian Federation"
diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index f9883d6eac..952750bbbc 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -17,7 +17,6 @@ escape_char /
 % Revision:  2.00
 % Date:      2012-02-26
 % Users:     general
-% Charset:   UTF-8
 
 LC_IDENTIFICATION
 title      "Uyghur locale for China"
diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 37f4011210..f430495ce7 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -20,7 +20,6 @@ escape_char /
 % Date: 2006-05-20
 % Application: general
 % Users: general
-% Charset: UTF-8
 %
 % Keywords in this file are treated according to ISO/IEC 14652
 % http://anubis.dkuug.dk/jtc1/sc22/wg20/docs/14652fcd.txt
diff --git a/localedata/locales/ur_PK b/localedata/locales/ur_PK
index c9fcd196be..e7361bd2b1 100644
--- a/localedata/locales/ur_PK
+++ b/localedata/locales/ur_PK
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.3
 % Date: 2000-07-11
 % Users: general
-% Charset: CP1256
 
 LC_IDENTIFICATION
 title      "Urdu Language Locale for Pakistan"
diff --git a/localedata/locales/uz_UZ@cyrillic b/localedata/locales/uz_UZ@cyrillic
index c4abac82d2..2eba1ac225 100644
--- a/localedata/locales/uz_UZ@cyrillic
+++ b/localedata/locales/uz_UZ@cyrillic
@@ -19,7 +19,6 @@ escape_char /
 % Revision: 0.1
 % Date: 2003-05-30
 % Users: general
-% Charset: UTF-8
 % History:
 %
 % 2003-05-30 Mashrab Kuvatov <kmashrab@uni-bremen.de>
diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
index c5cec115cf..0badd42257 100644
--- a/localedata/locales/ve_ZA
+++ b/localedata/locales/ve_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-13):
 %      2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN
index 1f1abc8f4f..2e75f61800 100644
--- a/localedata/locales/vi_VN
+++ b/localedata/locales/vi_VN
@@ -20,7 +20,6 @@ escape_char /
 % Revision: 1.1
 % Date: 2004-01-09
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Vietnamese language locale for Vietnam"
diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE
index 378287142a..abebdd28a4 100644
--- a/localedata/locales/wa_BE
+++ b/localedata/locales/wa_BE
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "UTF-8"
-
 LC_IDENTIFICATION
 title "Walloon Language Locale for Belgium"
 source "Djan SACRE"
diff --git a/localedata/locales/wa_BE@euro b/localedata/locales/wa_BE@euro
index cc1c4f5049..12c095d929 100644
--- a/localedata/locales/wa_BE@euro
+++ b/localedata/locales/wa_BE@euro
@@ -14,7 +14,6 @@ escape_char /
 % Option: euro
 % Date: 2002-02-23
 % Users: general
-% Charset: ISO-8859-15
 
 LC_IDENTIFICATION
 title      "Walloon locale for Belgium with Euro"
diff --git a/localedata/locales/wae_CH b/localedata/locales/wae_CH
index 2911bcbe22..501feb40ed 100644
--- a/localedata/locales/wae_CH
+++ b/localedata/locales/wae_CH
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ChangeLog
 %	0.1		2010-10-25 Kevin Bortis <bortis@translate-wae.ch>
diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
index 05a699cea2..ec30a40953 100644
--- a/localedata/locales/wal_ET
+++ b/localedata/locales/wal_ET
@@ -12,8 +12,6 @@ escape_char /
 %
 % Walaita language locale for Ethiopia.
 %
-% Charset: UTF-8
-%
 % Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
 %
 % This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN
index 2e644d3960..8fc88941be 100644
--- a/localedata/locales/wo_SN
+++ b/localedata/locales/wo_SN
@@ -18,7 +18,6 @@ escape_char /
 % Revision: 1.0
 % Date: 2004-09-15
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Wolof locale for Senegal"
diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA
index 6bec97553c..e01a620977 100644
--- a/localedata/locales/xh_ZA
+++ b/localedata/locales/xh_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-13):
 %     2005-10-12 Dwayne Bailey <dwayne@translate.org.za>
diff --git a/localedata/locales/yi_US b/localedata/locales/yi_US
index d7c29b1852..dfa727a5d7 100644
--- a/localedata/locales/yi_US
+++ b/localedata/locales/yi_US
@@ -8,7 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% charset "UTF-8"
 %
 % 2003-08-16: corrections from Raphael Finkel <raphael@cs.uky.edu>
 %
diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
index a3f11d22bb..24cc671b63 100644
--- a/localedata/locales/yo_NG
+++ b/localedata/locales/yo_NG
@@ -17,7 +17,6 @@ escape_char /
 % Revision: 0.2
 % Date: 2005-11-21
 % Users: general
-% Charset: UTF-8
 
 LC_IDENTIFICATION
 title      "Yoruba locale for Nigeria"
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index 2a54f391eb..b46088a187 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -9,7 +9,6 @@ escape_char /
 % otherwise be governed by that license.
 
 % Chinese language locale for Taiwan R.O.C.
-% charmap: BIG5-CP950
 %
 % Original Author:
 %    Ming-Che Chuang
diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA
index df059a7f6d..239be8bc3d 100644
--- a/localedata/locales/zu_ZA
+++ b/localedata/locales/zu_ZA
@@ -8,8 +8,6 @@ escape_char /
 % exempt you from the conditions of the license if your use would
 % otherwise be governed by that license.
 
-% Charset: UTF-8
-
 % ChangeLog
 % 0.3 (2005-10-13):
 %     2005-10-12 Dwayne Bailey <dwayne@translate.org.za>