diff options
author | bapt <bapt@FreeBSD.org> | 2016-07-03 18:21:11 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2016-07-03 18:21:11 +0000 |
commit | 9889527f5a2ab902035c679c612e4e5687466fea (patch) | |
tree | 5a15a869f837abcd6acea9d7a7ce6d0c1e536aa0 /share | |
parent | 2ff8e9c6364b43e59db4e7bcb2dafb66980c2024 (diff) | |
download | FreeBSD-src-9889527f5a2ab902035c679c612e4e5687466fea.zip FreeBSD-src-9889527f5a2ab902035c679c612e4e5687466fea.tar.gz |
Posixify the locales name for variants
For all locales with variants:
- if no ambiguity on the locale (only one variant) just use the regular name
- if ambiguity, pick one as default and append @<variant> to the others
respecting POSIX
As a result:
- All the 3 components locales added recently are renamed to the usual 2
components version for all but sr_RS.UTF-8
- Set sr_RS.UTF-8 to the cyrillic variant
- Add sr_RS.UTF-8@latin
- Remove the symlinks aliases they were created to represent the 2 components
version as aliasas and are now useless
- Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to reflect those
changes
Discussed with: ache@
Approved by: re@ (gjb)
Diffstat (limited to 'share')
-rw-r--r-- | share/Makefile | 2 | ||||
-rw-r--r-- | share/colldef/Makefile | 32 | ||||
-rw-r--r-- | share/colldef/kk_KZ.UTF-8.src (renamed from share/colldef/kk_Cyrl_KZ.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/colldef/zh_CN.UTF-8.src (renamed from share/colldef/zh_Hans_CN.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/colldef/zh_TW.UTF-8.src (renamed from share/colldef/zh_Hant_TW.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/ctypedef/Makefile | 52 | ||||
-rw-r--r-- | share/ctypedef/ja_JP.SJIS.src (renamed from share/ctypedef/ja_JP.eucJP.src) | 0 | ||||
-rw-r--r-- | share/ctypedef/zh_CN.GB18030.src (renamed from share/ctypedef/zh_Hans_CN.eucCN.src) | 0 | ||||
-rw-r--r-- | share/ctypedef/zh_TW.Big5.src (renamed from share/ctypedef/zh_Hant_TW.Big5.src) | 0 | ||||
-rw-r--r-- | share/locale-links/Makefile | 22 | ||||
-rw-r--r-- | share/locale-links/Makefile.depend | 11 | ||||
-rw-r--r-- | share/monetdef/Makefile | 32 | ||||
-rw-r--r-- | share/monetdef/kk_KZ.UTF-8.src (renamed from share/monetdef/kk_Cyrl_KZ.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/monetdef/mn_MN.UTF-8.src (renamed from share/monetdef/mn_Cyrl_MN.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/monetdef/sr_RS.UTF-8@latin.src (renamed from share/monetdef/sr_Latn_RS.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/monetdef/zh_CN.GB2312.src (renamed from share/monetdef/zh_Hans_CN.GB2312.src) | 0 | ||||
-rw-r--r-- | share/monetdef/zh_CN.GBK.src (renamed from share/monetdef/zh_Hans_CN.GBK.src) | 0 | ||||
-rw-r--r-- | share/monetdef/zh_CN.UTF-8.src (renamed from share/monetdef/zh_Hans_CN.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/monetdef/zh_CN.eucCN.src (renamed from share/monetdef/zh_Hans_CN.eucCN.src) | 0 | ||||
-rw-r--r-- | share/monetdef/zh_HK.UTF-8.src (renamed from share/monetdef/zh_Hant_HK.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/monetdef/zh_TW.Big5.src (renamed from share/monetdef/zh_Hant_TW.Big5.src) | 0 | ||||
-rw-r--r-- | share/monetdef/zh_TW.UTF-8.src (renamed from share/monetdef/zh_Hant_TW.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/msgdef/Makefile | 38 | ||||
-rw-r--r-- | share/msgdef/kk_KZ.UTF-8.src (renamed from share/msgdef/kk_Cyrl_KZ.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/msgdef/mn_MN.UTF-8.src (renamed from share/msgdef/mn_Cyrl_MN.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/msgdef/sr_RS.ISO8859-5.src (renamed from share/msgdef/sr_Cyrl_RS.ISO8859-5.src) | 0 | ||||
-rw-r--r-- | share/msgdef/sr_RS.UTF-8.src (renamed from share/msgdef/sr_Cyrl_RS.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/msgdef/sr_RS.UTF-8@latin.src (renamed from share/msgdef/sr_Latn_RS.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/msgdef/zh_CN.GB2312.src (renamed from share/msgdef/zh_Hans_CN.GB2312.src) | 0 | ||||
-rw-r--r-- | share/msgdef/zh_CN.GBK.src (renamed from share/msgdef/zh_Hans_CN.GBK.src) | 0 | ||||
-rw-r--r-- | share/msgdef/zh_CN.UTF-8.src (renamed from share/msgdef/zh_Hans_CN.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/msgdef/zh_HK.UTF-8.src (renamed from share/msgdef/zh_Hant_HK.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/msgdef/zh_TW.Big5.src (renamed from share/msgdef/zh_Hant_TW.Big5.src) | 0 | ||||
-rw-r--r-- | share/msgdef/zh_TW.UTF-8.src (renamed from share/msgdef/zh_Hant_TW.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/numericdef/Makefile | 28 | ||||
-rw-r--r-- | share/numericdef/zh_CN.GB2312.src (renamed from share/numericdef/zh_Hans_CN.GB2312.src) | 0 | ||||
-rw-r--r-- | share/numericdef/zh_CN.eucCN.src (renamed from share/numericdef/zh_Hans_CN.eucCN.src) | 0 | ||||
-rw-r--r-- | share/numericdef/zh_TW.Big5.src (renamed from share/numericdef/zh_Hant_TW.Big5.src) | 0 | ||||
-rw-r--r-- | share/timedef/Makefile | 28 | ||||
-rw-r--r-- | share/timedef/kk_KZ.UTF-8.src (renamed from share/timedef/kk_Cyrl_KZ.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/timedef/mn_MN.UTF-8.src (renamed from share/timedef/mn_Cyrl_MN.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/timedef/sr_RS.ISO8859-2.src (renamed from share/timedef/sr_Latn_RS.ISO8859-2.src) | 0 | ||||
-rw-r--r-- | share/timedef/sr_RS.ISO8859-5.src (renamed from share/timedef/sr_Cyrl_RS.ISO8859-5.src) | 0 | ||||
-rw-r--r-- | share/timedef/sr_RS.UTF-8.src (renamed from share/timedef/sr_Cyrl_RS.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/timedef/sr_RS.UTF-8@latin.src (renamed from share/timedef/sr_Latn_RS.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/timedef/zh_CN.GB2312.src (renamed from share/timedef/zh_Hans_CN.GB2312.src) | 0 | ||||
-rw-r--r-- | share/timedef/zh_CN.GBK.src (renamed from share/timedef/zh_Hans_CN.GBK.src) | 0 | ||||
-rw-r--r-- | share/timedef/zh_CN.UTF-8.src (renamed from share/timedef/zh_Hans_CN.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/timedef/zh_CN.eucCN.src (renamed from share/timedef/zh_Hans_CN.eucCN.src) | 0 | ||||
-rw-r--r-- | share/timedef/zh_HK.UTF-8.src (renamed from share/timedef/zh_Hant_HK.UTF-8.src) | 0 | ||||
-rw-r--r-- | share/timedef/zh_TW.Big5.src (renamed from share/timedef/zh_Hant_TW.Big5.src) | 0 | ||||
-rw-r--r-- | share/timedef/zh_TW.UTF-8.src (renamed from share/timedef/zh_Hant_TW.UTF-8.src) | 0 |
52 files changed, 105 insertions, 140 deletions
diff --git a/share/Makefile b/share/Makefile index 56cebef..25b2ba3 100644 --- a/share/Makefile +++ b/share/Makefile @@ -13,7 +13,6 @@ SUBDIR= ${_colldef} \ ${_examples} \ ${_i18n} \ keys \ - ${_locale-links} \ ${_man} \ ${_me} \ misc \ @@ -61,7 +60,6 @@ _i18n= i18n .if ${MK_LOCALES} != "no" _colldef= colldef _ctypedef= ctypedef -_locale-links= locale-links _monetdef= monetdef _msgdef= msgdef _numericdef= numericdef diff --git a/share/colldef/Makefile b/share/colldef/Makefile index 01578af..5cd981a 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -9,7 +9,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps .src.LC_COLLATE: localedef -D -U -i ${.IMPSRC} \ - -f ${MAPLOC}/map.${.TARGET:T:R:E} ${.OBJDIR}/${.IMPSRC:T:R} + -f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} ${.OBJDIR}/${.IMPSRC:T:R} LOCALES+= af_ZA.UTF-8 LOCALES+= am_ET.UTF-8 @@ -30,7 +30,7 @@ LOCALES+= hu_HU.UTF-8 LOCALES+= hy_AM.UTF-8 LOCALES+= is_IS.UTF-8 LOCALES+= ja_JP.UTF-8 -LOCALES+= kk_Cyrl_KZ.UTF-8 +LOCALES+= kk_KZ.UTF-8 LOCALES+= ko_KR.UTF-8 LOCALES+= lt_LT.UTF-8 LOCALES+= lv_LV.UTF-8 @@ -44,15 +44,15 @@ LOCALES+= sl_SI.UTF-8 LOCALES+= sv_SE.UTF-8 LOCALES+= tr_TR.UTF-8 LOCALES+= uk_UA.UTF-8 -LOCALES+= zh_Hans_CN.UTF-8 -LOCALES+= zh_Hant_TW.UTF-8 +LOCALES+= zh_CN.UTF-8 +LOCALES+= zh_TW.UTF-8 LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-15 LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-1 LOCALES_MAPPED+= be_BY.UTF-8 be_BY.ISO8859-5 LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1251 LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1131 -LOCALES_MAPPED+= ru_RU.UTF-8 sr_Cyrl_RS.ISO8859-5 +LOCALES_MAPPED+= ru_RU.UTF-8 sr_RS.ISO8859-5 LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.KOI8-R LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.ISO8859-5 LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.CP866 @@ -66,7 +66,8 @@ LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-15 LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-1 LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-15 LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 sr_Latn_RS.ISO8859-2 +LOCALES_MAPPED+= en_US.UTF-8 sr_RS.UTF-8@latin +LOCALES_MAPPED+= en_US.UTF-8 sr_RS.ISO8859-2 LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-15 LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-1 LOCALES_MAPPED+= en_US.UTF-8 pt_BR.ISO8859-1 @@ -147,9 +148,9 @@ LOCALES_MAPPED+= tr_TR.UTF-8 tr_TR.ISO8859-9 LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.KOI8-U LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.ISO8859-5 LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.CP1251 -LOCALES_MAPPED+= zh_Hans_CN.UTF-8 zh_Hans_CN.GBK -LOCALES_MAPPED+= zh_Hans_CN.UTF-8 zh_Hans_CN.GB18030 -LOCALES_MAPPED+= zh_Hant_TW.UTF-8 zh_Hant_TW.Big5 +LOCALES_MAPPED+= zh_CN.UTF-8 zh_CN.GBK +LOCALES_MAPPED+= zh_CN.UTF-8 zh_CN.GB18030 +LOCALES_MAPPED+= zh_TW.UTF-8 zh_TW.Big5 LOCALES+= cs_CZ.ISO8859-2 LOCALES+= da_DK.ISO8859-1 @@ -159,8 +160,8 @@ LOCALES+= hu_HU.ISO8859-2 LOCALES+= nb_NO.ISO8859-1 LOCALES+= nb_NO.ISO8859-15 LOCALES+= sk_SK.ISO8859-2 -LOCALES+= zh_Hans_CN.GB2312 -LOCALES+= zh_Hans_CN.eucCN +LOCALES+= zh_CN.GB2312 +LOCALES+= zh_CN.eucCN SAME+= ar_SA.UTF-8 ar_QA.UTF-8 @@ -168,13 +169,12 @@ SAME+= ar_SA.UTF-8 ar_MA.UTF-8 SAME+= ar_SA.UTF-8 ar_JO.UTF-8 SAME+= ar_SA.UTF-8 ar_EG.UTF-8 SAME+= ar_SA.UTF-8 ar_AE.UTF-8 -SAME+= ru_RU.UTF-8 sr_Cyrl_RS.UTF-8 -SAME+= ru_RU.UTF-8 mn_Cyrl_MN.UTF-8 +SAME+= ru_RU.UTF-8 sr_RS.UTF-8 +SAME+= ru_RU.UTF-8 mn_MN.UTF-8 SAME+= ru_RU.UTF-8 bg_BG.UTF-8 SAME+= ca_AD.UTF-8 ca_IT.UTF-8 SAME+= ca_AD.UTF-8 ca_FR.UTF-8 SAME+= ca_AD.UTF-8 ca_ES.UTF-8 -SAME+= en_US.UTF-8 sr_Latn_RS.UTF-8 SAME+= en_US.UTF-8 pt_PT.UTF-8 SAME+= en_US.UTF-8 pt_BR.UTF-8 SAME+= en_US.UTF-8 nn_NO.UTF-8 @@ -204,7 +204,7 @@ SAME+= es_MX.UTF-8 es_CR.UTF-8 SAME+= es_MX.UTF-8 es_AR.UTF-8 SAME+= se_NO.UTF-8 se_FI.UTF-8 SAME+= sv_SE.UTF-8 sv_FI.UTF-8 -SAME+= zh_Hant_TW.UTF-8 zh_Hant_HK.UTF-8 +SAME+= zh_TW.UTF-8 zh_HK.UTF-8 SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.LC_COLLATE/} @@ -224,7 +224,7 @@ FILES+= $t.LC_COLLATE FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t $t.LC_COLLATE: ${.CURDIR}/$f.src localedef -D -U -i ${.ALLSRC} \ - -f ${MAPLOC}/map.${.TARGET:T:R:E} \ + -f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} \ ${.OBJDIR}/${.TARGET:T:R} .endfor diff --git a/share/colldef/kk_Cyrl_KZ.UTF-8.src b/share/colldef/kk_KZ.UTF-8.src index abc0aeb..abc0aeb 100644 --- a/share/colldef/kk_Cyrl_KZ.UTF-8.src +++ b/share/colldef/kk_KZ.UTF-8.src diff --git a/share/colldef/zh_Hans_CN.UTF-8.src b/share/colldef/zh_CN.UTF-8.src index d734ba9..d734ba9 100644 --- a/share/colldef/zh_Hans_CN.UTF-8.src +++ b/share/colldef/zh_CN.UTF-8.src diff --git a/share/colldef/zh_Hant_TW.UTF-8.src b/share/colldef/zh_TW.UTF-8.src index 84aa7ac..84aa7ac 100644 --- a/share/colldef/zh_Hant_TW.UTF-8.src +++ b/share/colldef/zh_TW.UTF-8.src diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index d7f2cd1..dcc7708 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -30,29 +30,29 @@ LOCALES+= ru_RU.CP1251 LOCALES+= ru_RU.CP866 LOCALES+= ru_RU.ISO8859-5 LOCALES+= ru_RU.KOI8-R -LOCALES+= sr_Latn_RS.ISO8859-2 +LOCALES+= sr_RS.ISO8859-2 LOCALES+= tr_TR.ISO8859-9 LOCALES+= uk_UA.CP1251 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U -LOCALES+= zh_Hans_CN.GB18030 -LOCALES+= zh_Hans_CN.GB2312 -LOCALES+= zh_Hans_CN.GBK -LOCALES+= zh_Hans_CN.eucCN -LOCALES+= zh_Hant_TW.Big5 +LOCALES+= zh_CN.GB18030 +LOCALES+= zh_CN.GB2312 +LOCALES+= zh_CN.GBK +LOCALES+= zh_CN.eucCN +LOCALES+= zh_TW.Big5 SAME+= en_US.UTF-8 ru_RU.UTF-8 -SAME+= en_US.UTF-8 zh_Hant_TW.UTF-8 -SAME+= en_US.UTF-8 zh_Hant_HK.UTF-8 -SAME+= en_US.UTF-8 zh_Hans_CN.UTF-8 +SAME+= en_US.UTF-8 zh_TW.UTF-8 +SAME+= en_US.UTF-8 zh_HK.UTF-8 +SAME+= en_US.UTF-8 zh_CN.UTF-8 SAME+= en_US.UTF-8 uk_UA.UTF-8 SAME+= en_US.UTF-8 tr_TR.UTF-8 SAME+= en_US.UTF-8 sv_SE.UTF-8 SAME+= en_US.UTF-8 sv_FI.UTF-8 -SAME+= en_US.UTF-8 sr_Latn_RS.UTF-8 -SAME+= en_US.UTF-8 sr_Cyrl_RS.UTF-8 +SAME+= en_US.UTF-8 sr_RS.UTF-8@latin +SAME+= en_US.UTF-8 sr_RS.UTF-8 SAME+= en_US.UTF-8 sl_SI.UTF-8 SAME+= en_US.UTF-8 sk_SK.UTF-8 SAME+= en_US.UTF-8 se_NO.UTF-8 @@ -65,11 +65,11 @@ SAME+= en_US.UTF-8 nn_NO.UTF-8 SAME+= en_US.UTF-8 nl_NL.UTF-8 SAME+= en_US.UTF-8 nl_BE.UTF-8 SAME+= en_US.UTF-8 nb_NO.UTF-8 -SAME+= en_US.UTF-8 mn_Cyrl_MN.UTF-8 +SAME+= en_US.UTF-8 mn_MN.UTF-8 SAME+= en_US.UTF-8 lv_LV.UTF-8 SAME+= en_US.UTF-8 lt_LT.UTF-8 SAME+= en_US.UTF-8 ko_KR.UTF-8 -SAME+= en_US.UTF-8 kk_Cyrl_KZ.UTF-8 +SAME+= en_US.UTF-8 kk_KZ.UTF-8 SAME+= en_US.UTF-8 ja_JP.UTF-8 SAME+= en_US.UTF-8 it_IT.UTF-8 SAME+= en_US.UTF-8 it_CH.UTF-8 @@ -184,7 +184,7 @@ SAME+= en_US.ISO8859-15 da_DK.ISO8859-15 SAME+= en_US.ISO8859-15 af_ZA.ISO8859-15 SAME+= ru_RU.CP1251 bg_BG.CP1251 SAME+= ru_RU.CP1251 be_BY.CP1251 -SAME+= ru_RU.ISO8859-5 sr_Cyrl_RS.ISO8859-5 +SAME+= ru_RU.ISO8859-5 sr_RS.ISO8859-5 SAME+= ru_RU.ISO8859-5 be_BY.ISO8859-5 SAME+= ca_IT.ISO8859-1 ca_FR.ISO8859-1 SAME+= ca_IT.ISO8859-1 ca_ES.ISO8859-1 @@ -192,13 +192,13 @@ SAME+= ca_IT.ISO8859-1 ca_AD.ISO8859-1 SAME+= ca_IT.ISO8859-15 ca_FR.ISO8859-15 SAME+= ca_IT.ISO8859-15 ca_ES.ISO8859-15 SAME+= ca_IT.ISO8859-15 ca_AD.ISO8859-15 -SAME+= sr_Latn_RS.ISO8859-2 sl_SI.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2 sk_SK.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2 ro_RO.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2 pl_PL.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2 hu_HU.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2 hr_HR.ISO8859-2 -SAME+= sr_Latn_RS.ISO8859-2 cs_CZ.ISO8859-2 +SAME+= sr_RS.ISO8859-2 sl_SI.ISO8859-2 +SAME+= sr_RS.ISO8859-2 sk_SK.ISO8859-2 +SAME+= sr_RS.ISO8859-2 ro_RO.ISO8859-2 +SAME+= sr_RS.ISO8859-2 pl_PL.ISO8859-2 +SAME+= sr_RS.ISO8859-2 hu_HU.ISO8859-2 +SAME+= sr_RS.ISO8859-2 hr_HR.ISO8859-2 +SAME+= sr_RS.ISO8859-2 cs_CZ.ISO8859-2 SAME+= en_US.US-ASCII en_ZA.US-ASCII SAME+= en_US.US-ASCII en_NZ.US-ASCII SAME+= en_US.US-ASCII en_GB.US-ASCII @@ -226,15 +226,15 @@ SYMPAIRS+= be_BY.CP1131.src ru_RU.ISO8859-5.src SYMPAIRS+= be_BY.CP1131.src ru_RU.KOI8-R.src SYMPAIRS+= uk_UA.CP1251.src uk_UA.ISO8859-5.src SYMPAIRS+= uk_UA.CP1251.src uk_UA.KOI8-U.src -SYMPAIRS+= zh_Hans_CN.eucCN.src zh_Hans_CN.GB18030.src -SYMPAIRS+= zh_Hans_CN.eucCN.src zh_Hans_CN.GB2312.src -SYMPAIRS+= zh_Hans_CN.eucCN.src zh_Hans_CN.GBK.src +SYMPAIRS+= zh_CN.GB18030.src zh_CN.GB2312.src +SYMPAIRS+= zh_CN.GB18030.src zh_CN.GBK.src +SYMPAIRS+= zh_CN.GB18030.src zh_CN.eucCN.src SYMPAIRS+= en_US.ISO8859-1.src en_US.ISO8859-15.src SYMPAIRS+= en_US.ISO8859-1.src en_US.US-ASCII.src SYMPAIRS+= en_US.ISO8859-1.src lv_LV.ISO8859-13.src -SYMPAIRS+= en_US.ISO8859-1.src sr_Latn_RS.ISO8859-2.src +SYMPAIRS+= en_US.ISO8859-1.src sr_RS.ISO8859-2.src SYMPAIRS+= en_US.ISO8859-1.src tr_TR.ISO8859-9.src -SYMPAIRS+= ja_JP.eucJP.src ja_JP.SJIS.src +SYMPAIRS+= ja_JP.SJIS.src ja_JP.eucJP.src .for s t in ${SYMPAIRS} ${t:S/src$/LC_CTYPE/}: $s diff --git a/share/ctypedef/ja_JP.eucJP.src b/share/ctypedef/ja_JP.SJIS.src index 73b93d8..73b93d8 100644 --- a/share/ctypedef/ja_JP.eucJP.src +++ b/share/ctypedef/ja_JP.SJIS.src diff --git a/share/ctypedef/zh_Hans_CN.eucCN.src b/share/ctypedef/zh_CN.GB18030.src index e70b37b..e70b37b 100644 --- a/share/ctypedef/zh_Hans_CN.eucCN.src +++ b/share/ctypedef/zh_CN.GB18030.src diff --git a/share/ctypedef/zh_Hant_TW.Big5.src b/share/ctypedef/zh_TW.Big5.src index 99a0420..99a0420 100644 --- a/share/ctypedef/zh_Hant_TW.Big5.src +++ b/share/ctypedef/zh_TW.Big5.src diff --git a/share/locale-links/Makefile b/share/locale-links/Makefile deleted file mode 100644 index 6487a14..0000000 --- a/share/locale-links/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -LOCALEDIR= ${SHAREDIR}/locale -LC_FILES= LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC \ - LC_TIME - -ALIASES= zh_Hans_CN.GB18030 zh_CN.GB18030 \ - zh_Hans_CN.GB2312 zh_CN.GB2312 \ - zh_Hans_CN.GBK zh_CN.GBK \ - zh_Hans_CN.eucCN zh_CN.eucCN \ - zh_Hans_CN.UTF-8 zh_CN.UTF-8 \ - zh_Hant_HK.UTF-8 zh_HK.UTF-8 \ - zh_Hant_TW.Big5 zh_TW.Big5 \ - zh_Hant_TW.UTF-8 zh_TW.UTF-8 - -.for from to in ${ALIASES} -.for f in ${LC_FILES} -SYMLINKS+= ../${from}/${f} ${LOCALEDIR}/${to}/${f} -.endfor -.endfor - -.include <bsd.prog.mk> diff --git a/share/locale-links/Makefile.depend b/share/locale-links/Makefile.depend deleted file mode 100644 index f80275d..0000000 --- a/share/locale-links/Makefile.depend +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - - -.include <dirdeps.mk> - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index c31f5bf..c06792c 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -63,12 +63,12 @@ LOCALES+= it_CH.UTF-8 LOCALES+= ja_JP.SJIS LOCALES+= ja_JP.UTF-8 LOCALES+= ja_JP.eucJP -LOCALES+= kk_Cyrl_KZ.UTF-8 +LOCALES+= kk_KZ.UTF-8 LOCALES+= ko_KR.UTF-8 LOCALES+= ko_KR.eucKR LOCALES+= lv_LV.ISO8859-13 LOCALES+= lv_LV.UTF-8 -LOCALES+= mn_Cyrl_MN.UTF-8 +LOCALES+= mn_MN.UTF-8 LOCALES+= nb_NO.ISO8859-15 LOCALES+= nb_NO.UTF-8 LOCALES+= nl_BE.ISO8859-15 @@ -89,7 +89,7 @@ LOCALES+= se_NO.UTF-8 LOCALES+= sk_SK.UTF-8 LOCALES+= sl_SI.ISO8859-2 LOCALES+= sl_SI.UTF-8 -LOCALES+= sr_Latn_RS.UTF-8 +LOCALES+= sr_RS.UTF-8@latin LOCALES+= sv_FI.ISO8859-1 LOCALES+= sv_FI.ISO8859-15 LOCALES+= sv_FI.UTF-8 @@ -101,13 +101,13 @@ LOCALES+= uk_UA.CP1251 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 -LOCALES+= zh_Hans_CN.GB2312 -LOCALES+= zh_Hans_CN.GBK -LOCALES+= zh_Hans_CN.UTF-8 -LOCALES+= zh_Hans_CN.eucCN -LOCALES+= zh_Hant_HK.UTF-8 -LOCALES+= zh_Hant_TW.Big5 -LOCALES+= zh_Hant_TW.UTF-8 +LOCALES+= zh_CN.GB2312 +LOCALES+= zh_CN.GBK +LOCALES+= zh_CN.UTF-8 +LOCALES+= zh_CN.eucCN +LOCALES+= zh_HK.UTF-8 +LOCALES+= zh_TW.Big5 +LOCALES+= zh_TW.UTF-8 @@ -160,8 +160,8 @@ SAME+= en_CA.UTF-8 en_CA.US-ASCII SAME+= en_CA.UTF-8 en_CA.ISO8859-15 SAME+= en_CA.UTF-8 en_CA.ISO8859-1 SAME+= en_GB.ISO8859-15 en_GB.ISO8859-1 -SAME+= zh_Hant_HK.UTF-8 en_HK.UTF-8 -SAME+= zh_Hant_HK.UTF-8 en_HK.ISO8859-1 +SAME+= zh_HK.UTF-8 en_HK.UTF-8 +SAME+= zh_HK.UTF-8 en_HK.ISO8859-1 SAME+= en_NZ.UTF-8 en_NZ.US-ASCII SAME+= en_NZ.UTF-8 en_NZ.ISO8859-15 SAME+= en_NZ.UTF-8 en_NZ.ISO8859-1 @@ -197,11 +197,11 @@ SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-1 SAME+= se_NO.UTF-8 nn_NO.UTF-8 SAME+= pt_BR.UTF-8 pt_BR.ISO8859-1 SAME+= ro_RO.UTF-8 ro_RO.ISO8859-2 -SAME+= sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2 -SAME+= sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8 -SAME+= sr_Latn_RS.UTF-8 sr_Cyrl_RS.ISO8859-5 +SAME+= sr_RS.UTF-8@latin sr_RS.ISO8859-2 +SAME+= sr_RS.UTF-8@latin sr_RS.UTF-8 +SAME+= sr_RS.UTF-8@latin sr_RS.ISO8859-5 SAME+= sv_SE.ISO8859-15 sv_SE.ISO8859-1 -SAME+= zh_Hans_CN.GBK zh_Hans_CN.GB18030 +SAME+= zh_CN.GBK zh_CN.GB18030 SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.out/} diff --git a/share/monetdef/kk_Cyrl_KZ.UTF-8.src b/share/monetdef/kk_KZ.UTF-8.src index a5dc90c..a5dc90c 100644 --- a/share/monetdef/kk_Cyrl_KZ.UTF-8.src +++ b/share/monetdef/kk_KZ.UTF-8.src diff --git a/share/monetdef/mn_Cyrl_MN.UTF-8.src b/share/monetdef/mn_MN.UTF-8.src index 3706866..3706866 100644 --- a/share/monetdef/mn_Cyrl_MN.UTF-8.src +++ b/share/monetdef/mn_MN.UTF-8.src diff --git a/share/monetdef/sr_Latn_RS.UTF-8.src b/share/monetdef/sr_RS.UTF-8@latin.src index c4dbd27..c4dbd27 100644 --- a/share/monetdef/sr_Latn_RS.UTF-8.src +++ b/share/monetdef/sr_RS.UTF-8@latin.src diff --git a/share/monetdef/zh_Hans_CN.GB2312.src b/share/monetdef/zh_CN.GB2312.src index 98bbbf1..98bbbf1 100644 --- a/share/monetdef/zh_Hans_CN.GB2312.src +++ b/share/monetdef/zh_CN.GB2312.src diff --git a/share/monetdef/zh_Hans_CN.GBK.src b/share/monetdef/zh_CN.GBK.src index 03faef2..03faef2 100644 --- a/share/monetdef/zh_Hans_CN.GBK.src +++ b/share/monetdef/zh_CN.GBK.src diff --git a/share/monetdef/zh_Hans_CN.UTF-8.src b/share/monetdef/zh_CN.UTF-8.src index e1c1ce8..e1c1ce8 100644 --- a/share/monetdef/zh_Hans_CN.UTF-8.src +++ b/share/monetdef/zh_CN.UTF-8.src diff --git a/share/monetdef/zh_Hans_CN.eucCN.src b/share/monetdef/zh_CN.eucCN.src index 1919a03..1919a03 100644 --- a/share/monetdef/zh_Hans_CN.eucCN.src +++ b/share/monetdef/zh_CN.eucCN.src diff --git a/share/monetdef/zh_Hant_HK.UTF-8.src b/share/monetdef/zh_HK.UTF-8.src index faf104e..faf104e 100644 --- a/share/monetdef/zh_Hant_HK.UTF-8.src +++ b/share/monetdef/zh_HK.UTF-8.src diff --git a/share/monetdef/zh_Hant_TW.Big5.src b/share/monetdef/zh_TW.Big5.src index 9c37150..9c37150 100644 --- a/share/monetdef/zh_Hant_TW.Big5.src +++ b/share/monetdef/zh_TW.Big5.src diff --git a/share/monetdef/zh_Hant_TW.UTF-8.src b/share/monetdef/zh_TW.UTF-8.src index 80109b9..80109b9 100644 --- a/share/monetdef/zh_Hant_TW.UTF-8.src +++ b/share/monetdef/zh_TW.UTF-8.src diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index ab8a7ad..4c0e6d9 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -41,13 +41,13 @@ LOCALES+= it_IT.UTF-8 LOCALES+= ja_JP.SJIS LOCALES+= ja_JP.UTF-8 LOCALES+= ja_JP.eucJP -LOCALES+= kk_Cyrl_KZ.UTF-8 +LOCALES+= kk_KZ.UTF-8 LOCALES+= ko_KR.UTF-8 LOCALES+= ko_KR.eucKR LOCALES+= lt_LT.UTF-8 LOCALES+= lv_LV.ISO8859-13 LOCALES+= lv_LV.UTF-8 -LOCALES+= mn_Cyrl_MN.UTF-8 +LOCALES+= mn_MN.UTF-8 LOCALES+= nb_NO.UTF-8 LOCALES+= nl_NL.UTF-8 LOCALES+= nn_NO.UTF-8 @@ -63,9 +63,9 @@ LOCALES+= ru_RU.UTF-8 LOCALES+= se_NO.UTF-8 LOCALES+= sk_SK.ISO8859-2 LOCALES+= sk_SK.UTF-8 -LOCALES+= sr_Cyrl_RS.ISO8859-5 -LOCALES+= sr_Cyrl_RS.UTF-8 -LOCALES+= sr_Latn_RS.UTF-8 +LOCALES+= sr_RS.ISO8859-5 +LOCALES+= sr_RS.UTF-8 +LOCALES+= sr_RS.UTF-8@latin LOCALES+= sv_SE.UTF-8 LOCALES+= tr_TR.ISO8859-9 LOCALES+= tr_TR.UTF-8 @@ -73,12 +73,12 @@ LOCALES+= uk_UA.CP1251 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 -LOCALES+= zh_Hans_CN.GB2312 -LOCALES+= zh_Hans_CN.GBK -LOCALES+= zh_Hans_CN.UTF-8 -LOCALES+= zh_Hant_HK.UTF-8 -LOCALES+= zh_Hant_TW.Big5 -LOCALES+= zh_Hant_TW.UTF-8 +LOCALES+= zh_CN.GB2312 +LOCALES+= zh_CN.GBK +LOCALES+= zh_CN.UTF-8 +LOCALES+= zh_HK.UTF-8 +LOCALES+= zh_TW.Big5 +LOCALES+= zh_TW.UTF-8 @@ -95,7 +95,7 @@ SAME+= ar_SA.UTF-8 ar_MA.UTF-8 SAME+= ar_SA.UTF-8 ar_JO.UTF-8 SAME+= ar_SA.UTF-8 ar_EG.UTF-8 SAME+= ar_SA.UTF-8 ar_AE.UTF-8 -SAME+= sr_Cyrl_RS.UTF-8 bg_BG.UTF-8 +SAME+= sr_RS.UTF-8 bg_BG.UTF-8 SAME+= es_MX.ISO8859-1 es_ES.ISO8859-15 SAME+= es_MX.ISO8859-1 es_ES.ISO8859-1 SAME+= es_MX.ISO8859-1 es_AR.ISO8859-1 @@ -178,11 +178,11 @@ SAME+= fr_FR.UTF-8 fr_CA.ISO8859-1 SAME+= fr_FR.UTF-8 fr_BE.UTF-8 SAME+= fr_FR.UTF-8 fr_BE.ISO8859-15 SAME+= fr_FR.UTF-8 fr_BE.ISO8859-1 -SAME+= sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2 -SAME+= sr_Latn_RS.UTF-8 sl_SI.UTF-8 -SAME+= sr_Latn_RS.UTF-8 sl_SI.ISO8859-2 -SAME+= sr_Latn_RS.UTF-8 hr_HR.UTF-8 -SAME+= sr_Latn_RS.UTF-8 hr_HR.ISO8859-2 +SAME+= sr_RS.UTF-8@latin sr_RS.ISO8859-2 +SAME+= sr_RS.UTF-8@latin sl_SI.UTF-8 +SAME+= sr_RS.UTF-8@latin sl_SI.ISO8859-2 +SAME+= sr_RS.UTF-8@latin hr_HR.UTF-8 +SAME+= sr_RS.UTF-8@latin hr_HR.ISO8859-2 SAME+= hu_HU.UTF-8 hu_HU.ISO8859-2 SAME+= is_IS.ISO8859-15 is_IS.ISO8859-1 SAME+= it_IT.ISO8859-15 it_IT.ISO8859-1 @@ -200,8 +200,8 @@ SAME+= pt_PT.ISO8859-15 pt_BR.ISO8859-1 SAME+= pt_PT.UTF-8 pt_BR.UTF-8 SAME+= ro_RO.UTF-8 ro_RO.ISO8859-2 SAME+= se_NO.UTF-8 se_FI.UTF-8 -SAME+= zh_Hans_CN.GBK zh_Hans_CN.GB18030 -SAME+= zh_Hans_CN.GBK zh_Hans_CN.eucCN +SAME+= zh_CN.GBK zh_CN.GB18030 +SAME+= zh_CN.GBK zh_CN.eucCN SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.out/} diff --git a/share/msgdef/kk_Cyrl_KZ.UTF-8.src b/share/msgdef/kk_KZ.UTF-8.src index 80f5bfa..80f5bfa 100644 --- a/share/msgdef/kk_Cyrl_KZ.UTF-8.src +++ b/share/msgdef/kk_KZ.UTF-8.src diff --git a/share/msgdef/mn_Cyrl_MN.UTF-8.src b/share/msgdef/mn_MN.UTF-8.src index 4051025..4051025 100644 --- a/share/msgdef/mn_Cyrl_MN.UTF-8.src +++ b/share/msgdef/mn_MN.UTF-8.src diff --git a/share/msgdef/sr_Cyrl_RS.ISO8859-5.src b/share/msgdef/sr_RS.ISO8859-5.src index 21d5a5e..21d5a5e 100644 --- a/share/msgdef/sr_Cyrl_RS.ISO8859-5.src +++ b/share/msgdef/sr_RS.ISO8859-5.src diff --git a/share/msgdef/sr_Cyrl_RS.UTF-8.src b/share/msgdef/sr_RS.UTF-8.src index 1e4662c..1e4662c 100644 --- a/share/msgdef/sr_Cyrl_RS.UTF-8.src +++ b/share/msgdef/sr_RS.UTF-8.src diff --git a/share/msgdef/sr_Latn_RS.UTF-8.src b/share/msgdef/sr_RS.UTF-8@latin.src index cc22eaa..cc22eaa 100644 --- a/share/msgdef/sr_Latn_RS.UTF-8.src +++ b/share/msgdef/sr_RS.UTF-8@latin.src diff --git a/share/msgdef/zh_Hans_CN.GB2312.src b/share/msgdef/zh_CN.GB2312.src index 0dcd3e2..0dcd3e2 100644 --- a/share/msgdef/zh_Hans_CN.GB2312.src +++ b/share/msgdef/zh_CN.GB2312.src diff --git a/share/msgdef/zh_Hans_CN.GBK.src b/share/msgdef/zh_CN.GBK.src index c81391c..c81391c 100644 --- a/share/msgdef/zh_Hans_CN.GBK.src +++ b/share/msgdef/zh_CN.GBK.src diff --git a/share/msgdef/zh_Hans_CN.UTF-8.src b/share/msgdef/zh_CN.UTF-8.src index 14f5b1a..14f5b1a 100644 --- a/share/msgdef/zh_Hans_CN.UTF-8.src +++ b/share/msgdef/zh_CN.UTF-8.src diff --git a/share/msgdef/zh_Hant_HK.UTF-8.src b/share/msgdef/zh_HK.UTF-8.src index 53c58af..53c58af 100644 --- a/share/msgdef/zh_Hant_HK.UTF-8.src +++ b/share/msgdef/zh_HK.UTF-8.src diff --git a/share/msgdef/zh_Hant_TW.Big5.src b/share/msgdef/zh_TW.Big5.src index 964f9ed..964f9ed 100644 --- a/share/msgdef/zh_Hant_TW.Big5.src +++ b/share/msgdef/zh_TW.Big5.src diff --git a/share/msgdef/zh_Hant_TW.UTF-8.src b/share/msgdef/zh_TW.UTF-8.src index 40deaaf..40deaaf 100644 --- a/share/msgdef/zh_Hant_TW.UTF-8.src +++ b/share/msgdef/zh_TW.UTF-8.src diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index 1205c12..3ff8484 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -22,9 +22,9 @@ LOCALES+= tr_TR.UTF-8 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 -LOCALES+= zh_Hans_CN.GB2312 -LOCALES+= zh_Hans_CN.eucCN -LOCALES+= zh_Hant_TW.Big5 +LOCALES+= zh_CN.GB2312 +LOCALES+= zh_CN.eucCN +LOCALES+= zh_TW.Big5 @@ -74,7 +74,7 @@ SAME+= uk_UA.UTF-8 nn_NO.UTF-8 SAME+= uk_UA.UTF-8 nb_NO.UTF-8 SAME+= uk_UA.UTF-8 lv_LV.UTF-8 SAME+= uk_UA.UTF-8 lt_LT.UTF-8 -SAME+= uk_UA.UTF-8 kk_Cyrl_KZ.UTF-8 +SAME+= uk_UA.UTF-8 kk_KZ.UTF-8 SAME+= uk_UA.UTF-8 hu_HU.UTF-8 SAME+= uk_UA.UTF-8 fr_FR.UTF-8 SAME+= uk_UA.UTF-8 fr_CA.UTF-8 @@ -85,12 +85,12 @@ SAME+= uk_UA.UTF-8 cs_CZ.UTF-8 SAME+= uk_UA.UTF-8 bg_BG.UTF-8 SAME+= uk_UA.UTF-8 be_BY.UTF-8 SAME+= uk_UA.UTF-8 af_ZA.UTF-8 -SAME+= en_US.UTF-8 zh_Hant_TW.UTF-8 -SAME+= en_US.UTF-8 zh_Hant_HK.UTF-8 -SAME+= en_US.UTF-8 zh_Hans_CN.UTF-8 -SAME+= en_US.UTF-8 zh_Hans_CN.GBK -SAME+= en_US.UTF-8 zh_Hans_CN.GB18030 -SAME+= en_US.UTF-8 mn_Cyrl_MN.UTF-8 +SAME+= en_US.UTF-8 zh_TW.UTF-8 +SAME+= en_US.UTF-8 zh_HK.UTF-8 +SAME+= en_US.UTF-8 zh_CN.UTF-8 +SAME+= en_US.UTF-8 zh_CN.GBK +SAME+= en_US.UTF-8 zh_CN.GB18030 +SAME+= en_US.UTF-8 mn_MN.UTF-8 SAME+= en_US.UTF-8 ko_KR.UTF-8 SAME+= en_US.UTF-8 ko_KR.eucKR SAME+= en_US.UTF-8 ja_JP.UTF-8 @@ -132,10 +132,10 @@ SAME+= ar_SA.UTF-8 ar_JO.UTF-8 SAME+= ar_SA.UTF-8 ar_EG.UTF-8 SAME+= ar_SA.UTF-8 ar_AE.UTF-8 SAME+= tr_TR.UTF-8 tr_TR.ISO8859-9 -SAME+= tr_TR.UTF-8 sr_Latn_RS.UTF-8 -SAME+= tr_TR.UTF-8 sr_Latn_RS.ISO8859-2 -SAME+= tr_TR.UTF-8 sr_Cyrl_RS.UTF-8 -SAME+= tr_TR.UTF-8 sr_Cyrl_RS.ISO8859-5 +SAME+= tr_TR.UTF-8 sr_RS.UTF-8@latin +SAME+= tr_TR.UTF-8 sr_RS.ISO8859-2 +SAME+= tr_TR.UTF-8 sr_RS.UTF-8 +SAME+= tr_TR.UTF-8 sr_RS.ISO8859-5 SAME+= tr_TR.UTF-8 sl_SI.UTF-8 SAME+= tr_TR.UTF-8 sl_SI.ISO8859-2 SAME+= tr_TR.UTF-8 ro_RO.UTF-8 diff --git a/share/numericdef/zh_Hans_CN.GB2312.src b/share/numericdef/zh_CN.GB2312.src index 21fa435..21fa435 100644 --- a/share/numericdef/zh_Hans_CN.GB2312.src +++ b/share/numericdef/zh_CN.GB2312.src diff --git a/share/numericdef/zh_Hans_CN.eucCN.src b/share/numericdef/zh_CN.eucCN.src index 64d21ed..64d21ed 100644 --- a/share/numericdef/zh_Hans_CN.eucCN.src +++ b/share/numericdef/zh_CN.eucCN.src diff --git a/share/numericdef/zh_Hant_TW.Big5.src b/share/numericdef/zh_TW.Big5.src index d88fa8f..d88fa8f 100644 --- a/share/numericdef/zh_Hant_TW.Big5.src +++ b/share/numericdef/zh_TW.Big5.src diff --git a/share/timedef/Makefile b/share/timedef/Makefile index 6866291..a1a211f 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -76,14 +76,14 @@ LOCALES+= it_IT.UTF-8 LOCALES+= ja_JP.SJIS LOCALES+= ja_JP.UTF-8 LOCALES+= ja_JP.eucJP -LOCALES+= kk_Cyrl_KZ.UTF-8 +LOCALES+= kk_KZ.UTF-8 LOCALES+= ko_KR.UTF-8 LOCALES+= ko_KR.eucKR LOCALES+= lt_LT.ISO8859-13 LOCALES+= lt_LT.UTF-8 LOCALES+= lv_LV.ISO8859-13 LOCALES+= lv_LV.UTF-8 -LOCALES+= mn_Cyrl_MN.UTF-8 +LOCALES+= mn_MN.UTF-8 LOCALES+= nb_NO.ISO8859-15 LOCALES+= nb_NO.UTF-8 LOCALES+= nl_BE.UTF-8 @@ -109,10 +109,10 @@ LOCALES+= sk_SK.ISO8859-2 LOCALES+= sk_SK.UTF-8 LOCALES+= sl_SI.ISO8859-2 LOCALES+= sl_SI.UTF-8 -LOCALES+= sr_Cyrl_RS.ISO8859-5 -LOCALES+= sr_Cyrl_RS.UTF-8 -LOCALES+= sr_Latn_RS.ISO8859-2 -LOCALES+= sr_Latn_RS.UTF-8 +LOCALES+= sr_RS.ISO8859-5 +LOCALES+= sr_RS.UTF-8 +LOCALES+= sr_RS.ISO8859-2 +LOCALES+= sr_RS.UTF-8@latin LOCALES+= sv_FI.ISO8859-15 LOCALES+= sv_FI.UTF-8 LOCALES+= sv_SE.ISO8859-15 @@ -123,13 +123,13 @@ LOCALES+= uk_UA.CP1251 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 -LOCALES+= zh_Hans_CN.GB2312 -LOCALES+= zh_Hans_CN.GBK -LOCALES+= zh_Hans_CN.UTF-8 -LOCALES+= zh_Hans_CN.eucCN -LOCALES+= zh_Hant_HK.UTF-8 -LOCALES+= zh_Hant_TW.Big5 -LOCALES+= zh_Hant_TW.UTF-8 +LOCALES+= zh_CN.GB2312 +LOCALES+= zh_CN.GBK +LOCALES+= zh_CN.UTF-8 +LOCALES+= zh_CN.eucCN +LOCALES+= zh_HK.UTF-8 +LOCALES+= zh_TW.Big5 +LOCALES+= zh_TW.UTF-8 @@ -201,7 +201,7 @@ SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-1 SAME+= pt_PT.ISO8859-15 pt_PT.ISO8859-1 SAME+= sv_FI.ISO8859-15 sv_FI.ISO8859-1 SAME+= sv_SE.ISO8859-15 sv_SE.ISO8859-1 -SAME+= zh_Hans_CN.GBK zh_Hans_CN.GB18030 +SAME+= zh_CN.GBK zh_CN.GB18030 SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.out/} diff --git a/share/timedef/kk_Cyrl_KZ.UTF-8.src b/share/timedef/kk_KZ.UTF-8.src index 822b115..822b115 100644 --- a/share/timedef/kk_Cyrl_KZ.UTF-8.src +++ b/share/timedef/kk_KZ.UTF-8.src diff --git a/share/timedef/mn_Cyrl_MN.UTF-8.src b/share/timedef/mn_MN.UTF-8.src index fd4fa05..fd4fa05 100644 --- a/share/timedef/mn_Cyrl_MN.UTF-8.src +++ b/share/timedef/mn_MN.UTF-8.src diff --git a/share/timedef/sr_Latn_RS.ISO8859-2.src b/share/timedef/sr_RS.ISO8859-2.src index c9254fc..c9254fc 100644 --- a/share/timedef/sr_Latn_RS.ISO8859-2.src +++ b/share/timedef/sr_RS.ISO8859-2.src diff --git a/share/timedef/sr_Cyrl_RS.ISO8859-5.src b/share/timedef/sr_RS.ISO8859-5.src index 99e50b6..99e50b6 100644 --- a/share/timedef/sr_Cyrl_RS.ISO8859-5.src +++ b/share/timedef/sr_RS.ISO8859-5.src diff --git a/share/timedef/sr_Cyrl_RS.UTF-8.src b/share/timedef/sr_RS.UTF-8.src index 096d929..096d929 100644 --- a/share/timedef/sr_Cyrl_RS.UTF-8.src +++ b/share/timedef/sr_RS.UTF-8.src diff --git a/share/timedef/sr_Latn_RS.UTF-8.src b/share/timedef/sr_RS.UTF-8@latin.src index 2f22f70..2f22f70 100644 --- a/share/timedef/sr_Latn_RS.UTF-8.src +++ b/share/timedef/sr_RS.UTF-8@latin.src diff --git a/share/timedef/zh_Hans_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src index efa11cd..efa11cd 100644 --- a/share/timedef/zh_Hans_CN.GB2312.src +++ b/share/timedef/zh_CN.GB2312.src diff --git a/share/timedef/zh_Hans_CN.GBK.src b/share/timedef/zh_CN.GBK.src index 9f5dd0f..9f5dd0f 100644 --- a/share/timedef/zh_Hans_CN.GBK.src +++ b/share/timedef/zh_CN.GBK.src diff --git a/share/timedef/zh_Hans_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src index 9c994d4..9c994d4 100644 --- a/share/timedef/zh_Hans_CN.UTF-8.src +++ b/share/timedef/zh_CN.UTF-8.src diff --git a/share/timedef/zh_Hans_CN.eucCN.src b/share/timedef/zh_CN.eucCN.src index 5589bf9..5589bf9 100644 --- a/share/timedef/zh_Hans_CN.eucCN.src +++ b/share/timedef/zh_CN.eucCN.src diff --git a/share/timedef/zh_Hant_HK.UTF-8.src b/share/timedef/zh_HK.UTF-8.src index afd3217..afd3217 100644 --- a/share/timedef/zh_Hant_HK.UTF-8.src +++ b/share/timedef/zh_HK.UTF-8.src diff --git a/share/timedef/zh_Hant_TW.Big5.src b/share/timedef/zh_TW.Big5.src index 012b870..012b870 100644 --- a/share/timedef/zh_Hant_TW.Big5.src +++ b/share/timedef/zh_TW.Big5.src diff --git a/share/timedef/zh_Hant_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src index 9b84865..9b84865 100644 --- a/share/timedef/zh_Hant_TW.UTF-8.src +++ b/share/timedef/zh_TW.UTF-8.src |