locales: Rename zh_han* to zh_Han* (capitalize)
authorJohn Marino <draco@marino.st>
Thu, 23 Jul 2015 21:17:21 +0000 (23:17 +0200)
committerJohn Marino <draco@marino.st>
Thu, 23 Jul 2015 21:20:51 +0000 (23:20 +0200)
36 files changed:
Makefile_upgrade.inc
etc/mtree/BSD.local.dist
etc/mtree/BSD.usr.dist
lib/libc/nls/Makefile.inc
share/colldef/Makefile
share/locale-links/Makefile
share/mklocale/Makefile
share/mklocale/zh_Hans_CN.GB18030.src [moved from share/mklocale/zh_hans_CN.GB18030.src with 100% similarity]
share/mklocale/zh_Hans_CN.GB2312.src [moved from share/mklocale/zh_hans_CN.GB2312.src with 100% similarity]
share/mklocale/zh_Hans_CN.GBK.src [moved from share/mklocale/zh_hans_CN.GBK.src with 100% similarity]
share/mklocale/zh_Hans_CN.eucCN.src [moved from share/mklocale/zh_hans_CN.eucCN.src with 100% similarity]
share/mklocale/zh_Hant_HK.Big5HKSCS.src [moved from share/mklocale/zh_hant_HK.Big5HKSCS.src with 100% similarity]
share/mklocale/zh_Hant_TW.Big5.src [moved from share/mklocale/zh_hant_TW.Big5.src with 100% similarity]
share/monetdef/Makefile
share/monetdef/zh_Hans_CN.GB18030.src [moved from share/monetdef/zh_hans_CN.GB18030.src with 100% similarity]
share/monetdef/zh_Hans_CN.GB2312.src [moved from share/monetdef/zh_hans_CN.GB2312.src with 100% similarity]
share/monetdef/zh_Hans_CN.UTF-8.src [moved from share/monetdef/zh_hans_CN.UTF-8.src with 100% similarity]
share/monetdef/zh_Hans_CN.eucCN.src [moved from share/monetdef/zh_hans_CN.eucCN.src with 100% similarity]
share/monetdef/zh_Hant_HK.UTF-8.src [moved from share/monetdef/zh_hant_HK.UTF-8.src with 100% similarity]
share/monetdef/zh_Hant_TW.Big5.src [moved from share/monetdef/zh_hant_TW.Big5.src with 100% similarity]
share/msgdef/Makefile
share/msgdef/zh_Hans_CN.GB18030.src [moved from share/msgdef/zh_hans_CN.GB18030.src with 100% similarity]
share/msgdef/zh_Hans_CN.GB2312.src [moved from share/msgdef/zh_hans_CN.GB2312.src with 100% similarity]
share/msgdef/zh_Hans_CN.UTF-8.src [moved from share/msgdef/zh_hans_CN.UTF-8.src with 100% similarity]
share/msgdef/zh_Hans_CN.eucCN.src [moved from share/msgdef/zh_hans_CN.eucCN.src with 100% similarity]
share/msgdef/zh_Hant_TW.Big5.src [moved from share/msgdef/zh_hant_TW.Big5.src with 100% similarity]
share/msgdef/zh_Hant_TW.UTF-8.src [moved from share/msgdef/zh_hant_TW.UTF-8.src with 100% similarity]
share/numericdef/Makefile
share/numericdef/zh_Hans_CN.eucCN.src [moved from share/numericdef/zh_hans_CN.eucCN.src with 100% similarity]
share/timedef/Makefile
share/timedef/zh_Hans_CN.GB18030.src [moved from share/timedef/zh_hans_CN.GB18030.src with 100% similarity]
share/timedef/zh_Hans_CN.GB2312.src [moved from share/timedef/zh_hans_CN.GB2312.src with 100% similarity]
share/timedef/zh_Hans_CN.UTF-8.src [moved from share/timedef/zh_hans_CN.UTF-8.src with 100% similarity]
share/timedef/zh_Hans_CN.eucCN.src [moved from share/timedef/zh_hans_CN.eucCN.src with 100% similarity]
share/timedef/zh_Hant_TW.Big5.src [moved from share/timedef/zh_hant_TW.Big5.src with 100% similarity]
share/timedef/zh_Hant_TW.UTF-8.src [moved from share/timedef/zh_hant_TW.UTF-8.src with 100% similarity]

index 6e65d7e..076b572 100644 (file)
@@ -2149,9 +2149,11 @@ TO_REMOVE+=/usr/share/locale/sr_YU*
 TO_REMOVE+=/usr/share/locale/zh_CN*
 TO_REMOVE+=/usr/share/locale/zh_HK*
 TO_REMOVE+=/usr/share/locale/zh_TW*
+TO_REMOVE+=/usr/share/locale/zh_han*
 TO_REMOVE+=/usr/share/nls/no_NO.ISO8859-1
 TO_REMOVE+=/usr/share/nls/mn_MN.UTF-8
 TO_REMOVE+=/usr/share/nls/zh_CN.*
+TO_REMOVE+=/usr/share/nls/zh_hans_CN.*
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/stlstats
index 420f9c3..4be0382 100644 (file)
             ..
             uk_UA.UTF-8
             ..
-            zh_hans_CN.GB18030
+            zh_Hans_CN.GB18030
             ..
-            zh_hans_CN.GB2312
+            zh_Hans_CN.GB2312
             ..
-            zh_hans_CN.GBK
+            zh_Hans_CN.GBK
             ..
-            zh_hans_CN.UTF-8
+            zh_Hans_CN.UTF-8
             ..
-            zh_hans_CN.eucCN
+            zh_Hans_CN.eucCN
             ..
-            zh_hant_HK.Big5HKSCS
+            zh_Hant_HK.Big5HKSCS
             ..
-            zh_hant_HK.UTF-8
+            zh_Hant_HK.UTF-8
             ..
-            zh_hnat_TW.Big5
+            zh_Hant_TW.Big5
             ..
-            zh_hant_TW.UTF-8
+            zh_Hant_TW.UTF-8
             ..
         ..
         sgml
index 571bdd1..0c3e0ac 100644 (file)
             ..
             uk_UA.UTF-8
             ..
-            zh_hans_CN.GB18030
+            zh_Hans_CN.GB18030
             ..
-            zh_hans_CN.GB2312
+            zh_Hans_CN.GB2312
             ..
-            zh_hans_CN.GBK
+            zh_Hans_CN.GBK
             ..
-            zh_hans_CN.UTF-8
+            zh_Hans_CN.UTF-8
             ..
-            zh_hans_CN.eucCN
+            zh_Hans_CN.eucCN
             ..
-            zh_hant_HK.Big5HKSCS
+            zh_Hant_HK.Big5HKSCS
             ..
-            zh_hant_HK.UTF-8
+            zh_Hant_HK.UTF-8
             ..
-            zh_hant_TW.Big5
+            zh_Hant_TW.Big5
             ..
-            zh_hant_TW.UTF-8
+            zh_Hant_TW.UTF-8
             ..
         ..
         man
             ..
             uk_UA.UTF-8
             ..
-            zh_hans_CN.GB18030
+            zh_Hans_CN.GB18030
             ..
-            zh_hans_CN.GB2312
+            zh_Hans_CN.GB2312
             ..
-            zh_hans_CN.UTF-8
+            zh_Hans_CN.UTF-8
             ..
         ..
         openssl
index 645f837..048a60f 100644 (file)
@@ -39,6 +39,6 @@ NLS+= ru_RU.KOI8-R
 NLS+=  sk_SK.ISO8859-2
 NLS+=  sv_SE.ISO8859-1
 NLS+=  uk_UA.UTF-8
-NLS+=  zh_hans_CN.GB18030
-NLS+=  zh_hans_CN.GB2312
-NLS+=  zh_hans_CN.UTF-8
+NLS+=  zh_Hans_CN.GB18030
+NLS+=  zh_Hans_CN.GB2312
+NLS+=  zh_Hans_CN.UTF-8
index 388c0a5..1effd67 100644 (file)
@@ -64,7 +64,7 @@ CLEANFILES=   ${FILES}
 ENCODINGS=     Big5 Big5HKSCS CP949 eucCN eucJP eucKR GB18030 GB2312 GBK \
                ISO8859-1 ISO8859-2 ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8
 
-ISO8859-1_Big5=        is_IS:zh_hant_TW
+ISO8859-1_Big5=        is_IS:zh_Hant_TW
 ISO8859-1_ISO8859-1= ${ISO8859-15_ISO8859-15} pt_PT:pt_BR
 
 LATIN1LINKS=   af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \
@@ -81,14 +81,14 @@ ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/} cs_CZ:sk_SK
 LATIN13LINKS=  lt_LT lv_LV
 ISO8859-13_ISO8859-13= ${LATIN13LINKS:C/^/la_LN:/}
 
-US-ASCII_Big5HKSCS= la_LN:zh_hant_HK
+US-ASCII_Big5HKSCS= la_LN:zh_Hant_HK
 US-ASCII_CP949=        la_LN:ko_KR
-US-ASCII_eucCN=        la_LN:zh_hans_CN
+US-ASCII_eucCN=        la_LN:zh_Hans_CN
 US-ASCII_eucJP=        la_LN:ja_JP
 US-ASCII_eucKR=        la_LN:ko_KR
-US-ASCII_GB18030= la_LN:zh_hans_CN
-US-ASCII_GB2312= la_LN:zh_hans_CN
-US-ASCII_GBK=  la_LN:zh_hans_CN
+US-ASCII_GB18030= la_LN:zh_Hans_CN
+US-ASCII_GB2312= la_LN:zh_Hans_CN
+US-ASCII_GBK=  la_LN:zh_Hans_CN
 US-ASCII_SJIS= la_LN:ja_JP
 
 ASCIILINKS=    en_AU en_CA en_GB en_NZ en_US
@@ -101,7 +101,7 @@ UTF8LINKS=  af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
                is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT lv_LV mn_Cyrl_MN \
                nb_NO nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT \
                ro_RO ru_RU sk_SK sl_SI sv_SE tr_TR uk_UA \
-               sr_Cyrl_RS sr_Latn_RS zh_hans_CN zh_hant_HK zh_hant_TW
+               sr_Cyrl_RS sr_Latn_RS zh_Hans_CN zh_Hant_HK zh_Hant_TW
 US-ASCII_UTF-8=        ${UTF8LINKS:C/^/la_LN:/}
 
 SYMLINKS=
index e0d4980..26b30a7 100644 (file)
@@ -12,9 +12,9 @@ UTF8= af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT \
        mn_Cyrl_MN \
        sr_Cyrl_RS \
        sr_Latn_RS \
-       zh_hans_CN \
-       zh_hant_HK \
-       zh_hant_TW 
+       zh_Hans_CN \
+       zh_Hant_HK \
+       zh_Hant_TW
 
 EURO=  af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH \
        de_DE en_AU en_CA en_GB en_NZ en_US es_ES et_EE \
index 19e424b..3e6e99d 100644 (file)
@@ -23,12 +23,12 @@ LOCALES=    UTF-8 \
                ru_RU.KOI8-R \
                tr_TR.ISO8859-9 \
                uk_UA.KOI8-U \
-               zh_hans_CN.eucCN \
-               zh_hans_CN.GB18030 \
-               zh_hans_CN.GB2312 \
-               zh_hans_CN.GBK \
-               zh_hant_HK.Big5HKSCS \
-               zh_hant_TW.Big5
+               zh_Hans_CN.eucCN \
+               zh_Hans_CN.GB18030 \
+               zh_Hans_CN.GB2312 \
+               zh_Hans_CN.GBK \
+               zh_Hant_HK.Big5HKSCS \
+               zh_Hant_TW.Big5
 
 LOCALEDIR=     /usr/share/locale
 
@@ -85,7 +85,7 @@ UTF8LINKS=    af_ZA be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
                ja_JP kk_KZ ko_KR lt_LT lv_LV mn_Cyrl_MN \
                nb_NO nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT \
                ro_RO ru_RU sk_SK sl_SI sv_SE tr_TR uk_UA \
-               sr_Cyrl_RS sr_Latn_RS zh_hans_CN zh_hant_HK zh_hant_TW
+               sr_Cyrl_RS sr_Latn_RS zh_Hans_CN zh_Hant_HK zh_Hant_TW
 UTF-8_UTF-8=   ${UTF8LINKS:C/^/:/}
 
 
index 3bcb705..fcd17c6 100644 (file)
@@ -83,12 +83,12 @@ LOCALES=    af_ZA.ISO8859-1 \
                uk_UA.ISO8859-5 \
                uk_UA.KOI8-U \
                uk_UA.UTF-8 \
-               zh_hans_CN.eucCN \
-               zh_hans_CN.GB18030 \
-               zh_hans_CN.GB2312 \
-               zh_hans_CN.UTF-8 \
-               zh_hant_HK.UTF-8 \
-               zh_hant_TW.Big5
+               zh_Hans_CN.eucCN \
+               zh_Hans_CN.GB18030 \
+               zh_Hans_CN.GB2312 \
+               zh_Hans_CN.UTF-8 \
+               zh_Hant_HK.UTF-8 \
+               zh_Hant_TW.Big5
 
 LOCALEDIR=     /usr/share/locale
 
@@ -110,10 +110,10 @@ ENCODINGS=        Big5 Big5HKSCS CP949 eucJP eucKR GB2312 GBK \
                ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-7 ISO8859-9 \
                ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8
 
-Big5_UTF-8=    zh_hant_TW
+Big5_UTF-8=    zh_Hant_TW
 eucJP_SJIS=    ja_JP
 eucKR_CP949=   ko_KR
-GB2312_GBK=    zh_hans_CN
+GB2312_GBK=    zh_Hans_CN
 ISO8859-1_ISO8859-1= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT es_ES:eu_ES \
                de_CH:fr_CH de_CH:it_CH nb_NO:nn_NO
 ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
@@ -129,7 +129,7 @@ ISO8859-13_ISO8859-4= lt_LT
 ISO8859-13_UTF-8= lt_LT lv_LV
 ISO8859-15_ISO8859-15= es_ES:eu_ES
 ISO8859-15_UTF-8= et_EE
-UTF-8_Big5HKSCS= zh_hant_HK
+UTF-8_Big5HKSCS= zh_Hant_HK
 UTF-8_UTF-8=   ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
                es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
 
index a477fad..e9b6ec7 100644 (file)
@@ -63,12 +63,12 @@ LOCALES=    af_ZA.ISO8859-1 \
                uk_UA.ISO8859-5 \
                uk_UA.KOI8-U \
                uk_UA.UTF-8 \
-               zh_hans_CN.eucCN \
-               zh_hans_CN.GB18030 \
-               zh_hans_CN.GB2312 \
-               zh_hans_CN.UTF-8 \
-               zh_hant_TW.Big5 \
-               zh_hant_TW.UTF-8
+               zh_Hans_CN.eucCN \
+               zh_Hans_CN.GB18030 \
+               zh_Hans_CN.GB2312 \
+               zh_Hans_CN.UTF-8 \
+               zh_Hant_TW.Big5 \
+               zh_Hant_TW.UTF-8
 
 LOCALEDIR=     /usr/share/locale
 
@@ -100,9 +100,9 @@ ENCODINGS=  Big5 Big5HKSCS CP949 eucKR GB2312 GBK \
                ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-9 ISO8859-13 ISO8859-15 \
                US-ASCII UTF-8
 
-Big5_Big5HKSCS=        zh_hant_TW:zh_hant_HK
+Big5_Big5HKSCS=        zh_Hant_TW:zh_Hant_HK
 eucKR_CP949=   ko_KR
-GB2312_GBK=    zh_hans_CN
+GB2312_GBK=    zh_Hans_CN
 ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
                ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
 ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \
@@ -121,7 +121,7 @@ ISO8859-13_ISO8859-4= lt_LT
 ISO8859-13_UTF-8= lt_LT
 ISO8859-15_UTF-8= et_EE
 UTF-8_UTF-8=   ${CA_LINKS} ${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
-               en_GB:en_IE zh_hant_TW:zh_hant_HK \
+               en_GB:en_IE zh_Hant_TW:zh_Hant_HK \
                ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
 
 SYMLINKS=
index 2ffff2d..8304589 100644 (file)
@@ -45,7 +45,7 @@ LOCALES=      af_ZA.ISO8859-1 \
                sv_SE.ISO8859-1 \
                tr_TR.ISO8859-9 \
                uk_UA.KOI8-U \
-               zh_hans_CN.eucCN
+               zh_Hans_CN.eucCN
 
 LOCALEDIR=     /usr/share/locale
 
@@ -93,9 +93,9 @@ DOT_COMMA_3=  en_US:am_ET en_US:en_AU en_US:en_CA en_US:en_GB \
                en_US:mn_Cyrl_MN \
                en_US:sr_Cyrl_RS \
                en_US:sr_Latn_RS \
-               en_US:zh_hans_CN \
-               en_US:zh_hant_HK \
-               en_US:zh_hant_TW
+               en_US:zh_Hans_CN \
+               en_US:zh_Hant_HK \
+               en_US:zh_Hant_TW
 DOT_TICK_3=    de_CH:fr_CH de_CH:it_CH
 COMMA_DOT_3=   de_DE:ca_AD de_DE:ca_ES de_DE:ca_FR de_DE:ca_IT \
                de_DE:da_DK de_DE:de_AT de_DE:el_GR de_DE:es_ES \
@@ -110,11 +110,11 @@ COMMA_NBSP_3=     af_ZA:be_BY af_ZA:bg_BG af_ZA:cs_CZ af_ZA:et_EE \
 
 CP1251_CP1131= be_BY
 CP1251_ISO8859-5= be_BY
-eucCN_Big5=    zh_hans_CN:zh_hant_TW
-eucCN_Big5HKSCS= zh_hans_CN:zh_hant_HK
-eucCN_GB18030= zh_hans_CN
-eucCN_GB2312=  zh_hans_CN
-eucCN_GBK=     zh_hans_CN
+eucCN_Big5=    zh_Hans_CN:zh_Hant_TW
+eucCN_Big5HKSCS= zh_Hans_CN:zh_Hant_HK
+eucCN_GB18030= zh_Hans_CN
+eucCN_GB2312=  zh_Hans_CN
+eucCN_GBK=     zh_Hans_CN
 eucJP_SJIS=    ja_JP
 eucKR_CP949=   ko_KR
 ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \
index de9b9ef..15c4597 100644 (file)
@@ -89,12 +89,12 @@ LOCALES=    am_ET.UTF-8 \
                uk_UA.ISO8859-5 \
                uk_UA.KOI8-U \
                uk_UA.UTF-8 \
-               zh_hans_CN.eucCN \
-               zh_hans_CN.GB18030 \
-               zh_hans_CN.GB2312 \
-               zh_hans_CN.UTF-8 \
-               zh_hant_TW.Big5 \
-               zh_hant_TW.UTF-8
+               zh_Hans_CN.eucCN \
+               zh_Hans_CN.GB18030 \
+               zh_Hans_CN.GB2312 \
+               zh_Hans_CN.UTF-8 \
+               zh_Hant_TW.Big5 \
+               zh_Hant_TW.UTF-8
 
 LOCALEDIR=      /usr/share/locale
 
@@ -124,7 +124,7 @@ NL_LINKS=   nl_NL:nl_BE
 GB_LINKS=      en_GB:en_AU en_GB:en_CA en_GB:en_NZ
 
 eucKR_CP949=   ko_KR
-GB2312_GBK=    zh_hans_CN
+GB2312_GBK=    zh_Hans_CN
 ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
                ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} en_US:af_ZA
 ISO8859-1_ISO8859-15= ca_ES da_DK de_AT de_DE en_GB en_US es_ES eu_ES \
@@ -137,10 +137,10 @@ ISO8859-1_ISO8859-2= la_LN
 ISO8859-1_ISO8859-4= la_LN
 ISO8859-1_UTF-8= en_GB en_US eu_ES nl_NL
 ISO8859-15_ISO8859-15= en_US:af_ZA
-UTF-8_Big5HKSCS= zh_hant_TW:zh_hant_HK
+UTF-8_Big5HKSCS= zh_Hant_TW:zh_Hant_HK
 UTF-8_UTF-8=   ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
                ${NL_LINKS} ${NO_LINKS} \
-               en_GB:en_IE en_US:af_ZA zh_hant_TW:zh_hant_HK
+               en_GB:en_IE en_US:af_ZA zh_Hant_TW:zh_Hant_HK
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}