Move some locales before upcoming overhauls
authorJohn Marino <draco@marino.st>
Thu, 23 Jul 2015 17:40:19 +0000 (19:40 +0200)
committerJohn Marino <draco@marino.st>
Thu, 23 Jul 2015 18:56:33 +0000 (20:56 +0200)
Several locales are obsolete and have misleading names.  This moves
many of them at once.  An entry to the UPDATING files notifies what
the new locale options are for users of affected locales.

This is necessary because the upcoming locale updates are going to be
generated and we can avoid carrying ancient aliases over.  Also note
that Serbia's change may not be complete until the entire locales are
updated.

56 files changed:
Makefile_upgrade.inc
UPDATING
etc/mtree/BSD.local.dist
etc/mtree/BSD.usr.dist
lib/libc/nls/Makefile.inc
lib/libc/nls/mn_Cyrl_MN.UTF-8.msg [moved from lib/libc/nls/mn_MN.UTF-8.msg with 98% similarity]
lib/libc/nls/zh_hans_CN.GB18030.msg [moved from lib/libc/nls/zh_CN.GB18030.msg with 94% similarity]
lib/libc/nls/zh_hans_CN.GB2312.msg [moved from lib/libc/nls/zh_CN.GB2312.msg with 94% similarity]
lib/libc/nls/zh_hans_CN.UTF-8.msg [moved from lib/libc/nls/zh_CN.UTF-8.msg with 97% similarity]
share/colldef/Makefile
share/colldef/sr_Cyrl_RS.ISO8859-5.src [moved from share/colldef/sr_YU.ISO8859-5.src with 91% similarity]
share/locale-links/Makefile
share/mklocale/Makefile
share/mklocale/zh_hans_CN.GB18030.src [moved from share/mklocale/zh_CN.GB18030.src with 99% similarity]
share/mklocale/zh_hans_CN.GB2312.src [moved from share/mklocale/zh_CN.GB2312.src with 98% similarity]
share/mklocale/zh_hans_CN.GBK.src [moved from share/mklocale/zh_CN.GBK.src with 99% similarity]
share/mklocale/zh_hans_CN.eucCN.src [moved from share/mklocale/zh_CN.eucCN.src with 98% similarity]
share/mklocale/zh_hant_HK.Big5HKSCS.src [moved from share/mklocale/zh_HK.Big5HKSCS.src with 99% similarity]
share/mklocale/zh_hant_TW.Big5.src [moved from share/mklocale/zh_TW.Big5.src with 99% similarity]
share/monetdef/Makefile
share/monetdef/mn_Cyrl_MN.UTF-8.src [moved from share/monetdef/mn_MN.UTF-8.src with 83% similarity]
share/monetdef/sr_Cyrl_RS.ISO8859-5.src [moved from share/monetdef/sr_YU.ISO8859-5.src with 82% similarity]
share/monetdef/sr_Latn_RS.ISO8859-2.src [moved from share/monetdef/sr_YU.ISO8859-2.src with 82% similarity]
share/monetdef/sr_Latn_RS.UTF-8.src [moved from share/monetdef/sr_YU.UTF-8.src with 83% similarity]
share/monetdef/zh_hans_CN.GB18030.src [moved from share/monetdef/zh_CN.GB18030.src with 82% similarity]
share/monetdef/zh_hans_CN.GB2312.src [moved from share/monetdef/zh_CN.eucCN.src with 83% similarity]
share/monetdef/zh_hans_CN.UTF-8.src [moved from share/monetdef/zh_CN.UTF-8.src with 83% similarity]
share/monetdef/zh_hans_CN.eucCN.src [moved from share/monetdef/zh_CN.GB2312.src with 82% similarity]
share/monetdef/zh_hant_HK.UTF-8.src [moved from share/monetdef/zh_HK.UTF-8.src with 83% similarity]
share/monetdef/zh_hant_TW.Big5.src [moved from share/monetdef/zh_TW.Big5.src with 83% similarity]
share/msgdef/Makefile
share/msgdef/mn_Cyrl_MN.UTF-8.src [moved from share/msgdef/mn_MN.UTF-8.src with 67% similarity]
share/msgdef/sr_Cyrl_RS.ISO8859-5.src [moved from share/msgdef/sr_YU.ISO8859-5.src with 64% similarity]
share/msgdef/sr_Latn_RS.ISO8859-2.src [moved from share/msgdef/sr_YU.ISO8859-2.src with 61% similarity]
share/msgdef/sr_Latn_RS.UTF-8.src [moved from share/msgdef/sr_YU.UTF-8.src with 66% similarity]
share/msgdef/zh_hans_CN.GB18030.src [moved from share/msgdef/zh_CN.GB2312.src with 66% similarity]
share/msgdef/zh_hans_CN.GB2312.src [moved from share/msgdef/zh_CN.eucCN.src with 67% similarity]
share/msgdef/zh_hans_CN.UTF-8.src [moved from share/msgdef/zh_TW.UTF-8.src with 68% similarity]
share/msgdef/zh_hans_CN.eucCN.src [moved from share/msgdef/zh_CN.GB18030.src with 66% similarity]
share/msgdef/zh_hant_TW.Big5.src [moved from share/msgdef/zh_TW.Big5.src with 67% similarity]
share/msgdef/zh_hant_TW.UTF-8.src [moved from share/msgdef/zh_CN.UTF-8.src with 68% similarity]
share/numericdef/Makefile
share/numericdef/sr_Cyrl_RS.ISO8859-5.src [moved from share/numericdef/sr_YU.ISO8859-5.src with 64% similarity]
share/numericdef/sr_Latn_RS.ISO8859-2.src [moved from share/numericdef/sr_YU.ISO8859-2.src with 64% similarity]
share/numericdef/zh_hans_CN.eucCN.src [moved from share/numericdef/zh_CN.eucCN.src with 65% similarity]
share/timedef/Makefile
share/timedef/mn_Cyrl_MN.UTF-8.src [moved from share/timedef/mn_MN.UTF-8.src with 93% similarity]
share/timedef/sr_Cyrl_RS.ISO8859-5.src [moved from share/timedef/sr_YU.ISO8859-5.src with 88% similarity]
share/timedef/sr_Latn_RS.ISO8859-2.src [moved from share/timedef/sr_YU.ISO8859-2.src with 88% similarity]
share/timedef/sr_Latn_RS.UTF-8.src [moved from share/timedef/sr_YU.UTF-8.src with 91% similarity]
share/timedef/zh_hans_CN.GB18030.src [moved from share/timedef/zh_CN.GB2312.src with 88% similarity]
share/timedef/zh_hans_CN.GB2312.src [moved from share/timedef/zh_CN.eucCN.src with 88% similarity]
share/timedef/zh_hans_CN.UTF-8.src [moved from share/timedef/zh_CN.UTF-8.src with 89% similarity]
share/timedef/zh_hans_CN.eucCN.src [moved from share/timedef/zh_CN.GB18030.src with 88% similarity]
share/timedef/zh_hant_TW.Big5.src [moved from share/timedef/zh_TW.Big5.src with 87% similarity]
share/timedef/zh_hant_TW.UTF-8.src [moved from share/timedef/zh_TW.UTF-8.src with 88% similarity]

index 87e8097..6e65d7e 100644 (file)
@@ -2144,7 +2144,14 @@ TO_REMOVE+=/usr/share/locale/*/*.UTF-8
 TO_REMOVE+=/usr/share/locale/hi_IN/hi_IN.ISCII-DEV
 TO_REMOVE+=/usr/share/locale/la_LN/la_LN.ISO8859-1
 TO_REMOVE+=/usr/share/locale/no_NO*
+TO_REMOVE+=/usr/share/locale/mn_MN*
+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/nls/no_NO.ISO8859-1
+TO_REMOVE+=/usr/share/nls/mn_MN.UTF-8
+TO_REMOVE+=/usr/share/nls/zh_CN.*
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/stlstats
index 6bb93c2..23c0160 100644 (file)
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,36 @@
 # If you discover any problem, please contact the bugs@lists.dragonflybsd.org
 # mailing list with the details.
 
++-----------------------------------------------------------------------+
++         UPGRADING DRAGONFLY FROM 4.2 TO LATER VERSIONS                +
++-----------------------------------------------------------------------+
+
+SEVERAL LOCALES RENAMED
+-----------------------
+
+Several locales were using obsolete and misleading names, and thus have
+been adjusted to current standards. Any users of the following locales
+need to select alternates:
+
+DFLY 4.2 locale            DFLY 4.4 alterative locale
+---------------            ------------------------------------
+mn_MN.UTF-8                mn_Cyrl_MN.UTF-8
+no_NO.UTF-8                nb_NO.UTF-8      or nn_NO.UTF-8
+no_NO.ISO8859-1            nb_NO.ISO8869-1  or nn_NO.ISO8859-1
+no_NO.ISO8859-15           nb_NO.ISO8859-15 or nn_NO.ISO8859-15
+sr_YU.UTF-8                sr_Cyrl_RS.UTF-8 or sr_Latn_RS.UTF-8
+sr_YU.ISO8859-5            sr_Cyrl_RS.ISO8859-5
+sr_YU.ISO8859-2            sr_Latn_RS.ISO8859-2
+zh_CN.GBK                  zh_Hans_CN.GBK
+zh_CN.UTF-8                zh_Hans_CN.UTF-8
+zh_CN.eucCN                zh_Hans_CN.eucCN
+zh_CN.GB2312               zh_Hans_CH.GB2312
+zh_CN.GB18030              zh_Hans_CH.GB18030
+zh_HK.Big5HKSCS            zh_Hant_HK.Big5HKSCS
+zh_HK.UTF_8                zh_Hant_HK.UTF-8
+zh_TW.Big5                 zh_Hant_TW.Big5
+zh_TW.UTF-8                zh_Hant_TW.UTF-8
+
 +-----------------------------------------------------------------------+
 +         UPGRADING DRAGONFLY FROM 4.0 TO LATER VERSIONS                +
 +-----------------------------------------------------------------------+
index 3d93f93..420f9c3 100644 (file)
             ..
             sl_SI.UTF-8
             ..
-            sr_YU.ISO8859-2
+            sr_Cyrl_RS.ISO8859-5
             ..
-            sr_YU.ISO8859-5
+            sr_Cyrl_RS.UTF-8
             ..
-            sr_YU.UTF-8
+            sr_Latn_RS.ISO8859-2
+            ..
+            sr_Latn_RS.UTF-8
             ..
             sv_SE.ISO8859-1
             ..
             ..
             uk_UA.UTF-8
             ..
-            zh_CN.GB18030
+            zh_hans_CN.GB18030
             ..
-            zh_CN.GB2312
+            zh_hans_CN.GB2312
             ..
-            zh_CN.GBK
+            zh_hans_CN.GBK
             ..
-            zh_CN.UTF-8
+            zh_hans_CN.UTF-8
             ..
-            zh_CN.eucCN
+            zh_hans_CN.eucCN
             ..
-            zh_HK.Big5HKSCS
+            zh_hant_HK.Big5HKSCS
             ..
-            zh_HK.UTF-8
+            zh_hant_HK.UTF-8
             ..
-            zh_TW.Big5
+            zh_hnat_TW.Big5
             ..
-            zh_TW.UTF-8
+            zh_hant_TW.UTF-8
             ..
         ..
         sgml
index 7cb44d1..571bdd1 100644 (file)
             ..
             lv_LV.UTF-8
             ..
-            mn_MN.UTF-8
+            mn_Cyrl_MN.UTF-8
             ..
             nb_NO.ISO8859-1
             ..
             ..
             sl_SI.UTF-8
             ..
-            sr_YU.ISO8859-2
+            sr_Cyrl_RS.ISO8859-5
             ..
-            sr_YU.ISO8859-5
+            sr_Cyrl_RS.UTF-8
             ..
-            sr_YU.UTF-8
+            sr_Latn_RS.ISO8859-2
+            ..
+            sr_Latn_RS.UTF-8
             ..
             sv_SE.ISO8859-1
             ..
             ..
             uk_UA.UTF-8
             ..
-            zh_CN.GB18030
+            zh_hans_CN.GB18030
             ..
-            zh_CN.GB2312
+            zh_hans_CN.GB2312
             ..
-            zh_CN.GBK
+            zh_hans_CN.GBK
             ..
-            zh_CN.UTF-8
+            zh_hans_CN.UTF-8
             ..
-            zh_CN.eucCN
+            zh_hans_CN.eucCN
             ..
-            zh_HK.Big5HKSCS
+            zh_hant_HK.Big5HKSCS
             ..
-            zh_HK.UTF-8
+            zh_hant_HK.UTF-8
             ..
-            zh_TW.Big5
+            zh_hant_TW.Big5
             ..
-            zh_TW.UTF-8
+            zh_hant_TW.UTF-8
             ..
         ..
         man
             ..
             ko_KR.eucKR
             ..
-            mn_MN.UTF-8
+            mn_Cyrl_MN.UTF-8
             ..
             nb_NO.ISO8859-1
             ..
             ..
             uk_UA.UTF-8
             ..
-            zh_CN.GB18030
+            zh_hans_CN.GB18030
             ..
-            zh_CN.GB2312
+            zh_hans_CN.GB2312
             ..
-            zh_CN.UTF-8
+            zh_hans_CN.UTF-8
             ..
         ..
         openssl
index 76889d4..645f837 100644 (file)
@@ -30,7 +30,7 @@ NLS+= ja_JP.UTF-8
 NLS+=  ja_JP.eucJP
 NLS+=  ko_KR.UTF-8
 NLS+=  ko_KR.eucKR
-NLS+=  mn_MN.UTF-8
+NLS+=  mn_Cyrl_MN.UTF-8
 NLS+=  nl_NL.ISO8859-1
 NLS+=  nb_NO.ISO8859-1
 NLS+=  pl_PL.ISO8859-2
@@ -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_CN.GB18030
-NLS+=  zh_CN.GB2312
-NLS+=  zh_CN.UTF-8
+NLS+=  zh_hans_CN.GB18030
+NLS+=  zh_hans_CN.GB2312
+NLS+=  zh_hans_CN.UTF-8
similarity index 98%
rename from lib/libc/nls/mn_MN.UTF-8.msg
rename to lib/libc/nls/mn_Cyrl_MN.UTF-8.msg
index fbbd95f..67937b0 100644 (file)
@@ -1,6 +1,4 @@
-$ $FreeBSD: head/lib/libc/nls/mn_MN.UTF-8.msg 192653 2009-05-23 17:13:35Z des $
-$
-$ Message catalog for mn_MN.UTF-8 locale
+$ Message catalog for mn_Cyrl_MN.UTF-8 locale
 $
 $ strerror() support catalog
 $
similarity index 94%
rename from lib/libc/nls/zh_CN.GB18030.msg
rename to lib/libc/nls/zh_hans_CN.GB18030.msg
index f033861..9256f1c 100644 (file)
@@ -1,9 +1,3 @@
-$ $FreeBSD: head/lib/libc/nls/zh_CN.GB18030.msg 244757 2012-12-28 01:23:12Z delphij $
-$
-$ Message catalog for zh_CN.GB18030 locale
-$
-$ Derived from FreeBSD: head/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij
-$
 $ strerror() support catalog
 $
 $set 1
similarity index 94%
rename from lib/libc/nls/zh_CN.GB2312.msg
rename to lib/libc/nls/zh_hans_CN.GB2312.msg
index 40142f4..9256f1c 100644 (file)
@@ -1,9 +1,3 @@
-$ $FreeBSD: head/lib/libc/nls/zh_CN.GB2312.msg 244757 2012-12-28 01:23:12Z delphij $
-$
-$ Message catalog for zh_CN.GB2312 locale
-$
-$ Derived from FreeBSD: head/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij
-$
 $ strerror() support catalog
 $
 $set 1
similarity index 97%
rename from lib/libc/nls/zh_CN.UTF-8.msg
rename to lib/libc/nls/zh_hans_CN.UTF-8.msg
index 3ff2bb2..c9160fc 100644 (file)
@@ -1,7 +1,3 @@
-$ $FreeBSD: head/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij $
-$
-$ Message catalog for zh_CN.UTF-8 locale
-$
 $ strerror() support catalog
 $
 $set 1
index 1694eb0..388c0a5 100644 (file)
@@ -34,7 +34,7 @@ LOCALES=      bg_BG.CP1251 \
                ru_RU.ISO8859-5 \
                ru_RU.KOI8-R \
                sl_SI.ISO8859-2 \
-               sr_YU.ISO8859-5 \
+               sr_Cyrl_RS.ISO8859-5 \
                sv_SE.ISO8859-1 \
                sv_SE.ISO8859-15 \
                tr_TR.ISO8859-9 \
@@ -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_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 \
@@ -75,20 +75,20 @@ ISO8859-15_ISO8859-15= \
        nb_NO:nn_NO \
        ${LATIN1LINKS:C/^/la_LN:/}
 
-LATIN2LINKS=    hu_HU ro_RO sr_YU
+LATIN2LINKS=    hu_HU ro_RO sr_Latn_RS
 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_HK
+US-ASCII_Big5HKSCS= la_LN:zh_hant_HK
 US-ASCII_CP949=        la_LN:ko_KR
-US-ASCII_eucCN=        la_LN:zh_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_CN
-US-ASCII_GB2312= la_LN:zh_CN
-US-ASCII_GBK=  la_LN:zh_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
@@ -98,10 +98,10 @@ UTF8LINKS=  af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
                da_DK de_AT de_CH de_DE \
                el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES \
                fi_FI fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM \
-               is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT lv_LV mn_MN \
+               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 sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
-               zh_TW
+               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
 US-ASCII_UTF-8=        ${UTF8LINKS:C/^/la_LN:/}
 
 SYMLINKS=
similarity index 91%
rename from share/colldef/sr_YU.ISO8859-5.src
rename to share/colldef/sr_Cyrl_RS.ISO8859-5.src
index f0e1ee7..e2dfc06 100644 (file)
@@ -1,7 +1,5 @@
 # Serbian part of ISO8859-5 (backward compatible with ASCII)
 #
-# $FreeBSD: src/share/colldef/sr_YU.ISO8859-5.src,v 1.2 2012/11/17 01:50:27 svnexp Exp $
-#
 charmap map.ISO8859-5
 order \
 # controls
index 8dee415..e0d4980 100644 (file)
@@ -7,9 +7,14 @@ UTF8=  af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT \
        en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \
        fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM \
        is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT lv_LV \
-       mn_MN nb_NO nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT \
-       ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA \
-       zh_CN zh_HK zh_TW
+       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 \
+       mn_Cyrl_MN \
+       sr_Cyrl_RS \
+       sr_Latn_RS \
+       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 379a39f..19e424b 100644 (file)
@@ -23,12 +23,12 @@ LOCALES=    UTF-8 \
                ru_RU.KOI8-R \
                tr_TR.ISO8859-9 \
                uk_UA.KOI8-U \
-               zh_CN.eucCN \
-               zh_CN.GB18030 \
-               zh_CN.GB2312 \
-               zh_CN.GBK \
-               zh_HK.Big5HKSCS \
-               zh_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
 
@@ -62,13 +62,13 @@ ISO8859-1_ISO8859-1= ${LATIN1LINKS:C/^/la_LN:/}
 LATIN15LINKS=  ${LATIN1XLINKS} et_EE
 ISO8859-15_ISO8859-15= ${LATIN15LINKS:C/^/la_LN:/}
 
-LATIN2LINKS=   cs_CZ hr_HR hu_HU pl_PL sl_SI sr_YU ro_RO sk_SK
+LATIN2LINKS=   cs_CZ hr_HR hu_HU pl_PL sl_SI sr_Latn_RS ro_RO sk_SK
 ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/}
 
 LATIN4LINKS=   lt_LT
 ISO8859-4_ISO8859-4= ${LATIN4LINKS:C/^/la_LN:/}
 
-LATIN5LINKS=   sr_YU uk_UA be_BY
+LATIN5LINKS=   sr_Cyrl_RS uk_UA be_BY
 ISO8859-5_ISO8859-5= ${LATIN5LINKS:C/^/ru_RU:/}
 
 LATIN13LINKS=  lt_LT lv_LV
@@ -82,10 +82,10 @@ UTF8LINKS=  af_ZA be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
                en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \
                fr_BE \
                fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
-               ja_JP kk_KZ ko_KR lt_LT lv_LV mn_MN \
+               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 sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
-               zh_TW
+               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
 UTF-8_UTF-8=   ${UTF8LINKS:C/^/:/}
 
 
similarity index 99%
rename from share/mklocale/zh_CN.GB18030.src
rename to share/mklocale/zh_hans_CN.GB18030.src
index f90cd28..c34a929 100644 (file)
@@ -28,8 +28,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD: head/share/mklocale/zh_CN.GB18030.src 119246 2003-08-21 19:23:15Z ache $
  */
 
 ENCODING       "GB18030"
similarity index 98%
rename from share/mklocale/zh_CN.GB2312.src
rename to share/mklocale/zh_hans_CN.GB2312.src
index 9498f81..e18c568 100644 (file)
@@ -1,8 +1,6 @@
 /*
  * GB2312   first byte:   A1-FE
  *          second byte:  A1-FE
- *
- * $FreeBSD: head/share/mklocale/zh_CN.GB2312.src 122146 2003-11-05 22:54:54Z davidxu $
  */
 
 ENCODING       "GB2312"
similarity index 99%
rename from share/mklocale/zh_CN.GBK.src
rename to share/mklocale/zh_hans_CN.GBK.src
index 5a5bd88..abaeb16 100644 (file)
@@ -1,8 +1,6 @@
 /*
  * GBK      first byte:   81-FE
  *          second byte:  40-7E, 80-FE
- *
- * $FreeBSD: head/share/mklocale/zh_CN.GBK.src 156026 2006-02-26 14:03:13Z delphij $
  */
 
 ENCODING       "GBK"
similarity index 98%
rename from share/mklocale/zh_CN.eucCN.src
rename to share/mklocale/zh_hans_CN.eucCN.src
index 81baae8..5fb5e9f 100644 (file)
@@ -22,8 +22,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD: head/share/mklocale/zh_CN.eucCN.src 156056 2006-02-27 06:11:58Z delphij $
  */
 
 ENCODING       "EUC"
similarity index 99%
rename from share/mklocale/zh_HK.Big5HKSCS.src
rename to share/mklocale/zh_hant_HK.Big5HKSCS.src
index dd0cf67..64aab18 100644 (file)
@@ -1,8 +1,6 @@
 /*
  * big5hkscs   first byte:    81-FE
  *             second byte:   40-7E, A1-FE
- *
- * $FreeBSD: head/share/mklocale/zh_HK.Big5HKSCS.src 123664 2003-12-19 12:51:40Z ache $
  */
 
 ENCODING        "GBK"
similarity index 99%
rename from share/mklocale/zh_TW.Big5.src
rename to share/mklocale/zh_hant_TW.Big5.src
index bf39cde..8e419f5 100644 (file)
@@ -1,8 +1,6 @@
 /*
  * big5   first byte:   A1-FE
  *        second byte:   40-7E, A1-FE
- *
- * $FreeBSD: head/share/mklocale/zh_TW.Big5.src 156014 2006-02-25 23:28:19Z delphij $
  */
 
 ENCODING        "BIG5"
index a6d99d4..3bcb705 100644 (file)
@@ -54,7 +54,7 @@ LOCALES=      af_ZA.ISO8859-1 \
                ko_KR.UTF-8 \
                lt_LT.ISO8859-13 \
                lv_LV.ISO8859-13 \
-               mn_MN.UTF-8 \
+               mn_Cyrl_MN.UTF-8 \
                nl_BE.ISO8859-1 \
                nl_BE.UTF-8 \
                nl_NL.ISO8859-1 \
@@ -74,21 +74,21 @@ LOCALES=    af_ZA.ISO8859-1 \
                ru_RU.UTF-8 \
                sk_SK.ISO8859-2 \
                sl_SI.ISO8859-2 \
-               sr_YU.ISO8859-2 \
-               sr_YU.ISO8859-5 \
-               sr_YU.UTF-8 \
+               sr_Latn_RS.ISO8859-2 \
+               sr_Cyrl_RS.ISO8859-5 \
+               sr_Latn_RS.UTF-8 \
                sv_SE.ISO8859-1 \
                tr_TR.ISO8859-9 \
                uk_UA.CP1251 \
                uk_UA.ISO8859-5 \
                uk_UA.KOI8-U \
                uk_UA.UTF-8 \
-               zh_CN.eucCN \
-               zh_CN.GB18030 \
-               zh_CN.GB2312 \
-               zh_CN.UTF-8 \
-               zh_HK.UTF-8 \
-               zh_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_TW
+Big5_UTF-8=    zh_hant_TW
 eucJP_SJIS=    ja_JP
 eucKR_CP949=   ko_KR
-GB2312_GBK=    zh_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_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
 
similarity index 83%
rename from share/monetdef/mn_MN.UTF-8.src
rename to share/monetdef/mn_Cyrl_MN.UTF-8.src
index 9041b79..d646a2e 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/mn_MN.UTF-8.src,v 1.2 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 82%
rename from share/monetdef/sr_YU.ISO8859-5.src
rename to share/monetdef/sr_Cyrl_RS.ISO8859-5.src
index 807f9ab..b9be4c3 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/sr_YU.ISO8859-5.src,v 1.2 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 82%
rename from share/monetdef/sr_YU.ISO8859-2.src
rename to share/monetdef/sr_Latn_RS.ISO8859-2.src
index 5523675..fcf91f2 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/sr_YU.ISO8859-2.src,v 1.2 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 83%
rename from share/monetdef/sr_YU.UTF-8.src
rename to share/monetdef/sr_Latn_RS.UTF-8.src
index f9c9f28..478b127 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/sr_YU.UTF-8.src,v 1.2 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 82%
rename from share/monetdef/zh_CN.GB18030.src
rename to share/monetdef/zh_hans_CN.GB18030.src
index 7331019..a763646 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/zh_CN.GB18030.src,v 1.3 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 83%
rename from share/monetdef/zh_CN.eucCN.src
rename to share/monetdef/zh_hans_CN.GB2312.src
index db88fec..a763646 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/zh_CN.eucCN.src,v 1.3 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 83%
rename from share/monetdef/zh_CN.UTF-8.src
rename to share/monetdef/zh_hans_CN.UTF-8.src
index 12bde0f..a5f09bd 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/zh_CN.UTF-8.src,v 1.3 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 82%
rename from share/monetdef/zh_CN.GB2312.src
rename to share/monetdef/zh_hans_CN.eucCN.src
index e4793da..a763646 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/zh_CN.GB2312.src,v 1.3 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 83%
rename from share/monetdef/zh_HK.UTF-8.src
rename to share/monetdef/zh_hant_HK.UTF-8.src
index 9f442f6..638f476 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/zh_HK.UTF-8.src,v 1.2 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 83%
rename from share/monetdef/zh_TW.Big5.src
rename to share/monetdef/zh_hant_TW.Big5.src
index 4c97eee..d371fc6 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/monetdef/zh_TW.Big5.src,v 1.3 2012/11/17 01:50:59 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
index 1debd18..a477fad 100644 (file)
@@ -42,7 +42,7 @@ LOCALES=      af_ZA.ISO8859-1 \
                lt_LT.ISO8859-13 \
                lv_LV.ISO8859-13 \
                lv_LV.UTF-8 \
-               mn_MN.UTF-8 \
+               mn_Cyrl_MN.UTF-8 \
                nl_NL.ISO8859-1 \
                nb_NO.ISO8859-1 \
                pl_PL.ISO8859-2 \
@@ -54,21 +54,21 @@ LOCALES=    af_ZA.ISO8859-1 \
                ru_RU.KOI8-R \
                ru_RU.UTF-8 \
                sl_SI.ISO8859-2 \
-               sr_YU.ISO8859-2 \
-               sr_YU.ISO8859-5 \
-               sr_YU.UTF-8 \
+               sr_Latn_RS.ISO8859-2 \
+               sr_Cyrl_RS.ISO8859-5 \
+               sr_Latn_RS.UTF-8 \
                sv_SE.ISO8859-1 \
                tr_TR.ISO8859-9 \
                uk_UA.CP1251 \
                uk_UA.ISO8859-5 \
                uk_UA.KOI8-U \
                uk_UA.UTF-8 \
-               zh_CN.eucCN \
-               zh_CN.GB18030 \
-               zh_CN.GB2312 \
-               zh_CN.UTF-8 \
-               zh_TW.Big5 \
-               zh_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_TW:zh_HK
+Big5_Big5HKSCS=        zh_hant_TW:zh_hant_HK
 eucKR_CP949=   ko_KR
-GB2312_GBK=    zh_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,8 +121,8 @@ 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 \
-               ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS} zh_TW:zh_HK
+               en_GB:en_IE zh_hant_TW:zh_hant_HK \
+               ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
similarity index 67%
rename from share/msgdef/mn_MN.UTF-8.src
rename to share/msgdef/mn_Cyrl_MN.UTF-8.src
index 3c17bf4..28fc75d 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/mn_MN.UTF-8.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 64%
rename from share/msgdef/sr_YU.ISO8859-5.src
rename to share/msgdef/sr_Cyrl_RS.ISO8859-5.src
index 2dcb406..088b8bb 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/sr_YU.ISO8859-5.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 61%
rename from share/msgdef/sr_YU.ISO8859-2.src
rename to share/msgdef/sr_Latn_RS.ISO8859-2.src
index 2376f15..f0b80db 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/sr_YU.ISO8859-2.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 66%
rename from share/msgdef/sr_YU.UTF-8.src
rename to share/msgdef/sr_Latn_RS.UTF-8.src
index 9999240..5d6510f 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/sr_YU.UTF-8.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 66%
rename from share/msgdef/zh_CN.GB2312.src
rename to share/msgdef/zh_hans_CN.GB18030.src
index beae4fe..4ba9485 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/zh_CN.GB2312.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 67%
rename from share/msgdef/zh_CN.eucCN.src
rename to share/msgdef/zh_hans_CN.GB2312.src
index 288ae10..4ba9485 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/zh_CN.eucCN.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 68%
rename from share/msgdef/zh_TW.UTF-8.src
rename to share/msgdef/zh_hans_CN.UTF-8.src
index ece7137..9f4e511 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/zh_TW.UTF-8.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 66%
rename from share/msgdef/zh_CN.GB18030.src
rename to share/msgdef/zh_hans_CN.eucCN.src
index c830f8d..4ba9485 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/zh_CN.GB18030.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 67%
rename from share/msgdef/zh_TW.Big5.src
rename to share/msgdef/zh_hant_TW.Big5.src
index b927021..0466eb0 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/zh_TW.Big5.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 68%
rename from share/msgdef/zh_CN.UTF-8.src
rename to share/msgdef/zh_hant_TW.UTF-8.src
index 9f90dcc..9f4e511 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/msgdef/zh_CN.UTF-8.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
index b018f99..2ffff2d 100644 (file)
@@ -40,12 +40,12 @@ LOCALES=    af_ZA.ISO8859-1 \
                ru_RU.KOI8-R \
                sk_SK.ISO8859-2 \
                sl_SI.ISO8859-2 \
-               sr_YU.ISO8859-2 \
-               sr_YU.ISO8859-5 \
+               sr_Latn_RS.ISO8859-2 \
+               sr_Cyrl_RS.ISO8859-5 \
                sv_SE.ISO8859-1 \
                tr_TR.ISO8859-9 \
                uk_UA.KOI8-U \
-               zh_CN.eucCN
+               zh_hans_CN.eucCN
 
 LOCALEDIR=     /usr/share/locale
 
@@ -89,8 +89,13 @@ US_LINKS=    en_US:en_CA en_US:en_GB
 
 DOT_COMMA_3=   en_US:am_ET en_US:en_AU en_US:en_CA en_US:en_GB \
                en_US:en_IE en_US:en_NZ en_US:he_IL en_US:ja_JP \
-               en_US:ko_KR en_US:mn_MN en_US:sr_YU en_US:zh_CN \
-               en_US:zh_HK en_US:zh_TW
+               en_US:ko_KR \
+               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
 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 \
@@ -105,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_CN:zh_TW
-eucCN_Big5HKSCS= zh_CN:zh_HK
-eucCN_GB18030= zh_CN
-eucCN_GB2312=  zh_CN
-eucCN_GBK=     zh_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 \
similarity index 64%
rename from share/numericdef/sr_YU.ISO8859-5.src
rename to share/numericdef/sr_Cyrl_RS.ISO8859-5.src
index d8c03da..36d75f1 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/numericdef/sr_YU.ISO8859-5.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 64%
rename from share/numericdef/sr_YU.ISO8859-2.src
rename to share/numericdef/sr_Latn_RS.ISO8859-2.src
index bc55c5f..1f97901 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/numericdef/sr_YU.ISO8859-2.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 65%
rename from share/numericdef/zh_CN.eucCN.src
rename to share/numericdef/zh_hans_CN.eucCN.src
index 644a547..adb7622 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/numericdef/zh_CN.eucCN.src,v 1.2 2012/11/17 01:51:00 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
index 842e40a..de9b9ef 100644 (file)
@@ -55,7 +55,7 @@ LOCALES=      am_ET.UTF-8 \
                lt_LT.UTF-8 \
                lv_LV.ISO8859-13 \
                lv_LV.UTF-8 \
-               mn_MN.UTF-8 \
+               mn_Cyrl_MN.UTF-8 \
                nb_NO.ISO8859-1 \
                nb_NO.UTF-8 \
                nl_NL.ISO8859-1 \
@@ -78,9 +78,9 @@ LOCALES=      am_ET.UTF-8 \
                sk_SK.UTF-8 \
                sl_SI.ISO8859-2 \
                sl_SI.UTF-8 \
-               sr_YU.ISO8859-2 \
-               sr_YU.ISO8859-5 \
-               sr_YU.UTF-8 \
+               sr_Latn_RS.ISO8859-2 \
+               sr_Cyrl_RS.ISO8859-5 \
+               sr_Latn_RS.UTF-8 \
                sv_SE.ISO8859-1 \
                sv_SE.UTF-8 \
                tr_TR.ISO8859-9 \
@@ -89,12 +89,12 @@ LOCALES=    am_ET.UTF-8 \
                uk_UA.ISO8859-5 \
                uk_UA.KOI8-U \
                uk_UA.UTF-8 \
-               zh_CN.eucCN \
-               zh_CN.GB18030 \
-               zh_CN.GB2312 \
-               zh_CN.UTF-8 \
-               zh_TW.Big5 \
-               zh_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_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_TW:zh_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_TW:zh_HK
+               en_GB:en_IE en_US:af_ZA zh_hant_TW:zh_hant_HK
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
similarity index 93%
rename from share/timedef/mn_MN.UTF-8.src
rename to share/timedef/mn_Cyrl_MN.UTF-8.src
index b915e43..6f5a4c9 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/mn_MN.UTF-8.src,v 1.4 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 88%
rename from share/timedef/sr_YU.ISO8859-5.src
rename to share/timedef/sr_Cyrl_RS.ISO8859-5.src
index f7a8edd..23c1052 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/sr_YU.ISO8859-5.src,v 1.4 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 88%
rename from share/timedef/sr_YU.ISO8859-2.src
rename to share/timedef/sr_Latn_RS.ISO8859-2.src
index a4cd923..3c85662 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/sr_YU.ISO8859-2.src,v 1.4 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 91%
rename from share/timedef/sr_YU.UTF-8.src
rename to share/timedef/sr_Latn_RS.UTF-8.src
index 43214a8..3c4fd67 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/sr_YU.UTF-8.src,v 1.4 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 88%
rename from share/timedef/zh_CN.GB2312.src
rename to share/timedef/zh_hans_CN.GB18030.src
index 9dde005..eaee6b7 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/zh_CN.GB2312.src,v 1.4 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 88%
rename from share/timedef/zh_CN.eucCN.src
rename to share/timedef/zh_hans_CN.GB2312.src
index 3c4512e..eaee6b7 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/zh_CN.eucCN.src,v 1.15 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 89%
rename from share/timedef/zh_CN.UTF-8.src
rename to share/timedef/zh_hans_CN.UTF-8.src
index 9f68c75..2acfc2f 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/zh_CN.UTF-8.src,v 1.4 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 88%
rename from share/timedef/zh_CN.GB18030.src
rename to share/timedef/zh_hans_CN.eucCN.src
index bd79263..eaee6b7 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/zh_CN.GB18030.src,v 1.5 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 87%
rename from share/timedef/zh_TW.Big5.src
rename to share/timedef/zh_hant_TW.Big5.src
index c1d12dc..bfdb230 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/zh_TW.Big5.src,v 1.13 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
similarity index 88%
rename from share/timedef/zh_TW.UTF-8.src
rename to share/timedef/zh_hant_TW.UTF-8.src
index 38d2ed7..14e7383 100644 (file)
@@ -1,5 +1,3 @@
-# $FreeBSD: src/share/timedef/zh_TW.UTF-8.src,v 1.4 2012/11/17 01:51:03 svnexp Exp $
-#
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #