svn commit: r193908 - in head: etc/mtree share/colldef
share/mklocale share/monetdef share/msgdef share/numericdef
share/timedef
Edwin Groothuis
edwin at FreeBSD.org
Wed Jun 10 12:20:13 UTC 2009
Author: edwin
Date: Wed Jun 10 12:20:11 2009
New Revision: 193908
URL: http://svn.freebsd.org/changeset/base/193908
Log:
add ca_AD, ca_FR and ca_IT locales
Catalan language is not only spoken in Spain (ca_ES), but also
in Andorra, France and Italy. In Andorra it is the official
language.
(see http://en.wikipedia.org/wiki/Catalan_language#Geographic_distribution)
Add a bunch of symlinks to between ca_ES and ca_AD, ca_FR and ca_IT.
PR: conf/92541
Submitted by: <rmh at io.debian.net>
MFC after: 1 week
Modified:
head/etc/mtree/BSD.local.dist
head/etc/mtree/BSD.usr.dist
head/share/colldef/Makefile
head/share/mklocale/Makefile
head/share/monetdef/Makefile
head/share/msgdef/Makefile
head/share/numericdef/Makefile
head/share/timedef/Makefile
Modified: head/etc/mtree/BSD.local.dist
==============================================================================
--- head/etc/mtree/BSD.local.dist Wed Jun 10 12:07:55 2009 (r193907)
+++ head/etc/mtree/BSD.local.dist Wed Jun 10 12:20:11 2009 (r193908)
@@ -541,12 +541,30 @@
..
bg_BG.UTF-8
..
+ ca_AD.ISO8859-1
+ ..
ca_ES.ISO8859-1
..
+ ca_FR.ISO8859-1
+ ..
+ ca_IT.ISO8859-1
+ ..
+ ca_AD.ISO8859-15
+ ..
ca_ES.ISO8859-15
..
+ ca_FR.ISO8859-15
+ ..
+ ca_IT.ISO8859-15
+ ..
+ ca_AD.UTF-8
+ ..
ca_ES.UTF-8
..
+ ca_FR.UTF-8
+ ..
+ ca_IT.UTF-8
+ ..
cs_CZ.ISO8859-2
..
cs_CZ.UTF-8
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Wed Jun 10 12:07:55 2009 (r193907)
+++ head/etc/mtree/BSD.usr.dist Wed Jun 10 12:20:11 2009 (r193908)
@@ -357,12 +357,30 @@
..
bg_BG.UTF-8
..
+ ca_AD.ISO8859-1
+ ..
ca_ES.ISO8859-1
..
+ ca_FR.ISO8859-1
+ ..
+ ca_IT.ISO8859-1
+ ..
+ ca_AD.ISO8859-15
+ ..
ca_ES.ISO8859-15
..
+ ca_FR.ISO8859-15
+ ..
+ ca_IT.ISO8859-15
+ ..
+ ca_AD.UTF-8
+ ..
ca_ES.UTF-8
..
+ ca_FR.UTF-8
+ ..
+ ca_IT.UTF-8
+ ..
cs_CZ.ISO8859-2
..
cs_CZ.UTF-8
Modified: head/share/colldef/Makefile
==============================================================================
--- head/share/colldef/Makefile Wed Jun 10 12:07:55 2009 (r193907)
+++ head/share/colldef/Makefile Wed Jun 10 12:20:11 2009 (r193908)
@@ -69,6 +69,7 @@ ISO8859-1_ISO8859-1= ${ISO8859-15_ISO885
LATIN1LINKS= af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \
fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL pt_PT
ISO8859-15_ISO8859-15= \
+ ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
de_DE:de_AT de_DE:de_CH \
no_NO:nb_NO no_NO:nn_NO \
${LATIN1LINKS:C/^/la_LN:/}
@@ -89,11 +90,11 @@ US-ASCII_SJIS= la_LN:ja_JP
ASCIILINKS= en_AU en_CA en_GB en_NZ en_US
US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
-UTF8LINKS= af_ZA am_ET be_BY bg_BG ca_ES 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 mn_MN \
+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 mn_MN \
nb_NO nl_BE nl_NL nn_NO no_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
Modified: head/share/mklocale/Makefile
==============================================================================
--- head/share/mklocale/Makefile Wed Jun 10 12:07:55 2009 (r193907)
+++ head/share/mklocale/Makefile Wed Jun 10 12:20:11 2009 (r193908)
@@ -52,8 +52,9 @@ ENCODINGS= CP1251 ISO8859-1 ISO8859
ASCIILINKS= en_AU en_CA en_GB en_NZ en_US
US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
-LATIN1XLINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \
- en_US es_ES eu_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
+LATIN1XLINKS= 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 eu_ES \
+ fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
it_IT nb_NO nl_BE nl_NL nn_NO no_NO pt_PT sv_SE
LATIN1LINKS= ${LATIN1XLINKS} pt_BR
ISO8859-1_ISO8859-1= ${LATIN1LINKS:C/^/la_LN:/}
@@ -73,7 +74,8 @@ ISO8859-5_ISO8859-5= ${LATIN5LINKS:C/^/r
CP1251LINKS= ru_RU be_BY uk_UA
CP1251_CP1251= ${CP1251LINKS:C/^/bg_BG:/}
-UTF8LINKS= af_ZA be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH de_DE el_GR \
+UTF8LINKS= af_ZA 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 \
Modified: head/share/monetdef/Makefile
==============================================================================
--- head/share/monetdef/Makefile Wed Jun 10 12:07:55 2009 (r193907)
+++ head/share/monetdef/Makefile Wed Jun 10 12:20:11 2009 (r193908)
@@ -100,13 +100,16 @@ Big5_UTF-8= zh_TW
eucJP_SJIS= ja_JP
eucKR_CP949= ko_KR
GB2312_GBK= zh_CN
-ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
-ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA \
- en_GB en_NZ en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR \
+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 no_NO:nb_NO no_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 \
+ en_AU en_CA en_GB en_NZ en_US es_ES \
+ fi_FI fr_BE fr_CA fr_CH fr_FR \
is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO pt_PT sv_SE
ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US
-ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \
- en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
+ISO8859-1_UTF-8= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
+ en_AU en_CA en_NZ en_US es_ES \
+ fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
nl_NL nb_NO nn_NO no_NO pt_BR pt_PT sv_SE
ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU
ISO8859-7_UTF-8= el_GR
@@ -116,7 +119,8 @@ ISO8859-13_UTF-8= lt_LT
ISO8859-15_ISO8859-15= es_ES:eu_ES
ISO8859-15_UTF-8= et_EE
UTF-8_Big5HKSCS= zh_HK
-UTF-8_UTF-8= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
+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
SYMLINKS=
.for enc1 in ${ENCODINGS}
Modified: head/share/msgdef/Makefile
==============================================================================
--- head/share/msgdef/Makefile Wed Jun 10 12:07:55 2009 (r193907)
+++ head/share/msgdef/Makefile Wed Jun 10 12:20:11 2009 (r193908)
@@ -84,6 +84,7 @@ FILESDIR_${locale}.out= ${LOCALEDIR}/${l
CLEANFILES= ${FILES}
+CA_LINKS= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
CZ_LINKS= cs_CZ:sk_SK
DE_LINKS= de_DE:de_AT de_DE:de_CH
FR_LINKS= fr_FR:fr_CA
@@ -100,12 +101,12 @@ ENCODINGS= Big5 Big5HKSCS CP949 eucKR GB
Big5_Big5HKSCS= zh_TW:zh_HK
eucKR_CP949= ko_KR
GB2312_GBK= zh_CN
-ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
- ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
+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 \
eu_ES fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \
pt_PT sv_SE \
- ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
+ ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
${NL_LINKS} ${NO_LINKS}
ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US
ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \
@@ -117,7 +118,8 @@ ISO8859-9_UTF-8= tr_TR
ISO8859-13_ISO8859-4= lt_LT
ISO8859-13_UTF-8= lt_LT
ISO8859-15_UTF-8= et_EE
-UTF-8_UTF-8= ${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
+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
SYMLINKS=
Modified: head/share/numericdef/Makefile
==============================================================================
--- head/share/numericdef/Makefile Wed Jun 10 12:07:55 2009 (r193907)
+++ head/share/numericdef/Makefile Wed Jun 10 12:20:11 2009 (r193908)
@@ -68,6 +68,7 @@ ENCODINGS= ARMSCII-8 Big5 Big5HKSCS \
KOI8-R KOI8-U PT154 SJIS US-ASCII UTF-8
BE_LINKS= fr_BE:nl_BE
+CA_LINKS= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
DE_LINKS= de_DE:de_AT
FR_LINKS= fr_FR:fr_CA fr_FR:fr_CH
GB_LINKS= en_GB:en_AU en_GB:en_NZ
@@ -92,11 +93,11 @@ eucJP_UTF-8= ja_JP
eucKR_CP949= ko_KR
eucKR_UTF-8= ko_KR
ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \
- fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT \
- sv_SE ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
- ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
-ISO8859-1_ISO8859-1= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
+ fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT sv_SE \
+ ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
${IT_LINKS} ${NO_LINKS} ${US_LINKS}
+ISO8859-1_ISO8859-1= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} \
+ ${GB_LINKS} ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
ISO8859-1_US-ASCII= en_US ${GB_LINKS} ${US_LINKS}
ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES fi_FI \
fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE
@@ -114,8 +115,8 @@ KOI8-R_ISO8859-5= ru_RU
KOI8-U_ISO8859-5= uk_UA
PT154_UTF-8= kk_KZ
US-ASCII_UTF-8= en_US:he_IL
-UTF-8_UTF-8= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
- ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
+UTF-8_UTF-8= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
+ en_GB:en_IE ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
SYMLINKS=
.for enc1 in ${ENCODINGS}
Modified: head/share/timedef/Makefile
==============================================================================
--- head/share/timedef/Makefile Wed Jun 10 12:07:55 2009 (r193907)
+++ head/share/timedef/Makefile Wed Jun 10 12:20:11 2009 (r193908)
@@ -114,6 +114,7 @@ ENCODINGS= Big5HKSCS CP949 eucKR GB2312
ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-15 \
US-ASCII UTF-8
+CA_LINKS= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
DE_LINKS= de_DE:de_CH
FR_LINKS= fr_FR:fr_BE fr_FR:fr_CA fr_FR:fr_CH
IT_LINKS= it_IT:it_CH
@@ -123,20 +124,21 @@ GB_LINKS= en_GB:en_AU en_GB:en_CA en_GB:
eucKR_CP949= ko_KR
GB2312_GBK= zh_CN
-ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
- ${NL_LINKS} ${NO_LINKS} en_US:af_ZA
+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 \
fi_FI fr_FR is_IS it_IT la_LN nb_NO nl_NL nn_NO no_NO pt_PT \
sv_SE \
- ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS}
+ ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
+ ${NL_LINKS}
ISO8859-1_US-ASCII= ${GB_LINKS} en_GB en_US la_LN
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_UTF-8= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS} \
- ${NO_LINKS} \
+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
SYMLINKS=
More information about the svn-src-all
mailing list