--- a/locale/be_BY.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/be_BY.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Belarusian, Belarus (UTF-8)
-locale_desc	Belarus (UTF-8)

--- a/locale/bg_BG.ISO8859-5.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/bg_BG.ISO8859-5.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-bg-extra
 prototype	legacy
-# Bulgarian, Bulgaria (ISO8859-5)
-locale_desc	Bulgaria (ISO8859-5)

--- a/locale/bg_BG.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/bg_BG.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Bulgarian, Bulgaria (UTF-8)
-locale_desc	Bulgaria (UTF-8)

--- a/locale/ca_ES.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/ca_ES.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,4 +2,3 @@
 cldr_variant	ca_ES@currency=ESP
 pkg_name	SUNWlang-ca-extra
 prototype	legacy
-locale_desc	Catalan, Spain (ISO8859-1)

--- a/locale/cs_CZ.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/cs_CZ.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,3 +1,2 @@
 pkg_name	SUNWlang-cs-extra
 prototype	legacy
-locale_desc	Czech Republic (ISO8859-2)

--- a/locale/cs_CZ.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/cs_CZ.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,1 +0,0 @@
-locale_description	Czech Republic (UTF-8)

--- a/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,4 @@
 cldr_variant	cs_CZ@currency=EUR
 pkg_name	SUNWlang-cs-extra
-locale_desc	Czech Republic (UTF-8 + Euro)
 prototype	cs_euro
+locale_desc	Czech, Czech Republic (UTF-8 - Euro)

--- a/locale/da_DK.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/da_DK.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-da-extra
 prototype	legacy
-# Danish, Denmark (ISO8859-1)
-locale_desc	Denmark (ISO8859-1)

--- a/locale/da_DK.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/da_DK.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-da-extra
 prototype	legacy
-# Danish, Denmark (ISO8859-15)
-locale_desc	Denmark (ISO8859-15)
 lc_messages	da_DK.ISO8859-1
 lc_time		da_DK.ISO8859-1

--- a/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:54 2010 +0200
@@ -1,7 +1,6 @@
 cldr_variant	da_DK@currency=EUR
 pkg_name	SUNWlang-da-extra
 prototype	legacy
-# Danish, Denmark (ISO8859-15 + Euro)
-locale_desc	Denmark (ISO8859-15 + Euro)
+locale_desc	Danish, Denmark (ISO8859-15 - Euro)
 lc_messages	da_DK.ISO8859-1
 lc_time		da_DK.ISO8859-1

--- a/locale/da_DK.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/da_DK.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Danish, Denmark (UTF-8)
-locale_desc	Denmark (UTF-8)

--- a/locale/de_AT.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/de_AT.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,7 +2,5 @@
 cldr_variant	de_AT@currency=ATS
 pkg_name	SUNWlang-de-extra
 prototype	legacy
-# German, Austria (ISO8859-1)
-locale_desc	Austria (ISO8859-1)
 lc_messages	de_DE.ISO8859-1
 lc_time		de_DE.ISO8859-1

--- a/locale/de_AT.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/de_AT.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-de-extra
 prototype	legacy
-# German, Austria (ISO8859-15)
-locale_desc	Austria (ISO8859-15)
 lc_messages	de_DE.ISO8859-1
 lc_time		de_DE.ISO8859-1

--- a/locale/de_AT.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/de_AT.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,3 +1,1 @@
-# German, Austria (UTF-8)
-locale_desc	Austria (UTF-8)
 lc_messages	de_DE.UTF-8

--- a/locale/de_DE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/de_DE.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,4 +2,3 @@
 cldr_variant	de_DE@currency=DEM
 pkg_name	SUNWlang-de-extra
 prototype	legacy
-locale_desc	Germany (ISO8859-1)

--- a/locale/de_DE.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/de_DE.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-de-extra
 prototype	legacy
-# German, Germany (ISO8859-15)
-locale_desc	Germany (ISO8859-15)
 lc_messages	de_DE.ISO8859-1
 lc_time		de_DE.ISO8859-1

--- a/locale/de_DE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/de_DE.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,3 +1,1 @@
-# German, Germany (UTF-8)
-locale_desc	Germany (UTF-8)
 pkg_name	SUNWlang-deDE

--- a/locale/el_GR.ISO8859-7.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/el_GR.ISO8859-7.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-el-extra
 prototype	legacy
-# Greek, Greece (ISO8859-7)
-locale_desc	Greece (ISO8859-7)

--- a/locale/en_AU.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_AU.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-en-extra
 prototype	legacy
-# English, Australia (ISO8859-1)
-locale_desc	Australia (ISO8859-1)

--- a/locale/en_GB.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_GB.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-en-extra
 prototype	legacy
-# English, United Kingdom (ISO8859-1)
-locale_desc	United Kingdom (ISO8859-1)

--- a/locale/en_GB.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_GB.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-en-extra
 prototype	legacy
-# English, United Kingdom (ISO8859-15)
-locale_desc	United Kingdom (ISO8859-15)

--- a/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:54 2010 +0200
@@ -1,5 +1,4 @@
 cldr_variant	en_GB@currency=EUR
 pkg_name	SUNWlang-en-extra
 prototype	legacy
-# English, United Kingdom (ISO8859-15 + Euro)
-locale_desc	United Kingdom (ISO8859-15 + Euro)
+locale_desc	English, United Kingdom (ISO8859-15 - Euro)

--- a/locale/en_GB.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_GB.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# English, United Kingdom (UTF-8)
-locale_desc	United Kingdom (UTF-8)

--- a/locale/en_NZ.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_NZ.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-en-extra
 prototype	legacy
-# English, New Zealand (ISO8859-1)
-locale_desc	New Zealand (ISO8859-1)

--- a/locale/en_US.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_US.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
 prototype	legacy en_extra
 # English, United States (ISO8859-1)
-locale_desc	U.S.A. (en_US.ISO8859-1)
+locale_desc	English, U.S.A. (ISO8859-1)

--- a/locale/en_US.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_US.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
 prototype	legacy
 # English, United States (ISO8859-15)
-locale_desc	U.S.A. (en_US.ISO8859-15)
+locale_desc	English, U.S.A. (ISO8859-15)

--- a/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:54 2010 +0200
@@ -2,4 +2,4 @@
 pkg_name	SUNWlang-en-extra
 prototype	legacy
 # English, United States (ISO8859-15 + Euro)
-locale_desc	U.S.A. (en_US.ISO8859-15 + Euro)
+locale_desc	English, U.S.A. (ISO8859-15 - Euro)

--- a/locale/en_US.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/en_US.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,3 +1,3 @@
-locale_desc	U.S.A. (UTF-8)
 pkg_name	SUNWlang-enUS
 prototype	utf8 enUS
+locale_desc	English, U.S.A. (UTF-8)

--- a/locale/es_AR.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_AR.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Argentina (ISO8859-1)
-locale_desc	Argentina (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_BO.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_BO.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Bolivia (ISO8859-1)
-locale_desc	Bolivia (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_CL.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_CL.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Chile (ISO8859-1)
-locale_desc	Chile (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_CO.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_CO.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Colombia (ISO8859-1)
-locale_desc	Colombia (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_CR.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_CR.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Costa Rica (ISO8859-1)
-locale_desc	Costa Rica (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_EC.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_EC.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Ecuador (ISO8859-1)
-locale_desc	Ecuador (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_ES.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_ES.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	es_ES@currency=ESP
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Spain (ISO8859-1)
-locale_desc	Spain (ISO8859-1)

--- a/locale/es_ES.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_ES.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Spain (ISO8859-15)
-locale_desc	Spain (ISO8859-15)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_ES.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_ES.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,3 +1,1 @@
 pkg_name	SUNWlang-esES
-# Spanish, Spain (UTF-8)
-locale_desc	Spain (UTF-8)

--- a/locale/es_GT.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_GT.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Guatemala (ISO8859-1)
-locale_desc	Guatemala (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_MX.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_MX.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Mexico (ISO8859-1)
-locale_desc	Mexico (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_NI.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_NI.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Nicaragua (ISO8859-1)
-locale_desc	Nicaragua (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_PA.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_PA.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Panama (ISO8859-1)
-locale_desc	Panama (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_PE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_PE.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Peru (ISO8859-1)
-locale_desc	Peru (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_PY.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_PY.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Paraguay (ISO8859-1)
-locale_desc	Paraguay (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_SV.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_SV.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, El Salvador (ISO8859-1)
-locale_desc	El Salvador (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_UY.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_UY.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Uruguay (ISO8859-1)
-locale_desc	Uruguay (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/es_VE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/es_VE.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-es-extra
 prototype	legacy
-# Spanish, Venezuela (ISO8859-1)
-locale_desc	Venezuela (ISO8859-1)
 lc_messages	es_ES.ISO8859-1
 lc_time		es_ES.ISO8859-1

--- a/locale/et_EE.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/et_EE.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-et-extra
 prototype	legacy
-# Estonian, Estonia (ISO8859-15)
-locale_desc	Estonia (ISO8859-15)

--- a/locale/et_EE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/et_EE.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Estonian, Estonia (UTF-8)
-locale_desc	Estonian (UTF-8)

--- a/locale/fi_FI.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/fi_FI.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	fi_FI@currency=FIM
 pkg_name	SUNWlang-fi-extra
 prototype	legacy
-# Finnish, Finland (ISO8859-1)
-locale_desc	Finland (ISO8859-1)

--- a/locale/fi_FI.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/fi_FI.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-fi-extra
 prototype	legacy
-# Finnish, Finland (ISO8859-15)
-locale_desc	Finland (ISO8859-15)

--- a/locale/fi_FI.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/fi_FI.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Finnish, Finland (UTF-8)
-locale_desc	Finland (UTF-8)

--- a/locale/fr_FR.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/fr_FR.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	fr_FR@currency=FRF
 pkg_name	SUNWlang-fr-extra
 prototype	legacy
-# French, France (ISO8859-1)
-locale_desc	France (ISO8859-1)

--- a/locale/fr_FR.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/fr_FR.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-fr-extra
 prototype	legacy
-# French, France (ISO8859-15)
-locale_desc	France (ISO8859-15)
 lc_messages	fr_FR.ISO8859-1
 lc_time		fr_FR.ISO8859-1

--- a/locale/fr_FR.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/fr_FR.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,3 +1,1 @@
 pkg_name	SUNWlang-frFR
-# French, France (UTF-8)
-locale_desc	France (UTF-8)

--- a/locale/he_IL.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/he_IL.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Hebrew, Israel (UTF-8)
-locale_desc	Israel (UTF-8)

--- a/locale/hr_HR.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/hr_HR.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-hr-extra
 prototype	legacy
-# Croatian, Croatia (ISO8859-2)
-locale_desc	Croatia (ISO8859-2)

--- a/locale/hr_HR.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/hr_HR.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Croatian, Croatia (UTF-8)
-locale_desc	Croatia (UTF-8)

--- a/locale/hu_HU.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/hu_HU.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-hu-extra
 prototype	legacy
-# Hungarian, Hungary (ISO8859-2)
-locale_desc	Hungary (ISO8859-2)

--- a/locale/hu_HU.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/hu_HU.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Hungarian, Hungary (UTF-8)
-locale_desc	Hungary (UTF-8)

--- a/locale/id_ID.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/id_ID.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Indonesian, Indonesia (UTF-8)
-locale_desc	Indonesian (UTF-8)

--- a/locale/is_IS.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/is_IS.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-is-extra
 prototype	legacy
-# Icelandic, Iceland (ISO8859-1)
-locale_desc	Iceland (ISO8859-1)

--- a/locale/is_IS.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/is_IS.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Icelandic, Iceland (UTF-8)
-locale_desc	Iceland (UTF-8)

--- a/locale/it_IT.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/it_IT.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	it_IT@currency=ITL
 pkg_name	SUNWlang-it-extra
 prototype	legacy
-# Italian, Italy (ISO8859-1)
-locale_desc	Italy (ISO8859-1)

--- a/locale/it_IT.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/it_IT.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-it-extra
 prototype	legacy
-# Italian, Italy (ISO8859-15)
-locale_desc	Italy (ISO8859-15 - Euro)
 lc_messages	it_IT.ISO8859-1
 lc_time		it_IT.ISO8859-1

--- a/locale/kk_KZ.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/kk_KZ.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 # because CLDR bug #2023, can not use kk_KZ@...
 cldr_variant	kk_Cyrl_KZ
-# Kazakh, Kazakhstan (UTF-8)
-locale_desc	Kazakhstan (UTF-8)

--- a/locale/lt_LT.ISO8859-13.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/lt_LT.ISO8859-13.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-lt-extra
 prototype	legacy
-# Lithuanian, Lithuania (ISO8859-13)
-locale_desc	Lithuania (ISO8859-13)

--- a/locale/lt_LT.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/lt_LT.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Lithuanian, Lithuania (UTF-8)
-locale_desc	Lithuanian (UTF-8)

--- a/locale/lv_LV.ISO8859-13.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/lv_LV.ISO8859-13.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-lv-extra
 prototype	legacy
-# Latvian, Latvia (ISO8859-13)
-locale_desc	Latvia (ISO8859-13)

--- a/locale/lv_LV.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/lv_LV.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Latvian, Latvia (UTF-8)
-locale_desc	Latvian (UTF-8)

--- a/locale/mk_MK.ISO8859-5.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/mk_MK.ISO8859-5.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-mk-extra
 prototype	legacy
-# Macedonian, Macedonia (ISO8859-5)
-locale_desc	Macedonia (ISO8859-5)

--- a/locale/mk_MK.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/mk_MK.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Macedonian, Macedonia (UTF-8)
-locale_desc	Macedonia (UTF-8)

--- a/locale/mt_MT.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/mt_MT.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Maltese, Malta (UTF-8)
-locale_desc	Malta (UTF-8)

--- a/locale/nl_NL.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/nl_NL.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	nl_NL@currency=NLG
 pkg_name	SUNWlang-nl-extra
 prototype	legacy
-# Dutch, Netherlands (ISO8859-1)
-locale_desc	Netherlands (ISO8859-1)

--- a/locale/nl_NL.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/nl_NL.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-nl-extra
 prototype	legacy
-# Dutch, Netherlands (ISO8859-15)
-locale_desc	Netherlands (ISO8859-15)

--- a/locale/pl_PL.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/pl_PL.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-pl-extra
 prototype	legacy
-# Polish, Poland (ISO8859-2)
-locale_desc	Poland (ISO8859-2)

--- a/locale/pl_PL.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/pl_PL.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Polish, Poland (UTF-8)
-locale_desc	Poland (UTF-8)

--- a/locale/pt_BR.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/pt_BR.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-ptBR-extra
 prototype	legacy
-# Portuguese, Brazil (ISO8859-1)
-locale_desc	Brazil (ISO8859-1)

--- a/locale/pt_BR.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/pt_BR.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,3 +1,1 @@
 pkg_name	SUNWlang-ptBR
-# Portuguese, Brazil (UTF-8)
-locale_desc	Brazil (UTF-8)

--- a/locale/pt_PT.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/pt_PT.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	pt_PT@currency=PTE
 pkg_name	SUNWlang-pt-extra
 prototype	legacy
-# Portuguese, Portugal (ISO8859-1)
-locale_desc	Portugal (ISO8859-1)

--- a/locale/pt_PT.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/pt_PT.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-pt-extra
 prototype	legacy
-# Portuguese, Portugal (ISO8859-15)
-locale_desc	Portugal (ISO8859-15)

--- a/locale/pt_PT.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/pt_PT.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Portuguese, Portugal (UTF-8)
-locale_desc	Portugal (UTF-8)

--- a/locale/ro_RO.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/ro_RO.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-ro-extra
 prototype	legacy
-# Romanian, Romania (ISO8859-2)
-locale_desc	Romania (ISO8859-2)

--- a/locale/ro_RO.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/ro_RO.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Romanian, Romania (UTF-8)
-locale_desc	Romania (UTF-8)

--- a/locale/ru_RU.ANSI1251.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/ru_RU.ANSI1251.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-ru-extra
 prototype	legacy_alt2
-# Russian, Russia (ANSI1251)
-locale_desc	Russia (ANSI1251)

--- a/locale/ru_RU.ISO8859-5.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/ru_RU.ISO8859-5.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-ru-extra
 prototype	legacy
-# Russian, Russia (ISO8859-5)
-locale_desc	Russia (ISO8859-5)

--- a/locale/ru_RU.KOI8-R.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/ru_RU.KOI8-R.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-ru-extra
 prototype	legacy_alt2
-# Russian, Russia (KOI8-R)
-locale_desc	Russia (KOI8-R)

--- a/locale/sk_SK.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sk_SK.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	sk_SK@currency=SKK
 pkg_name	SUNWlang-sk-extra
 prototype	legacy
-# Slovak, Slovakia (ISO8859-2)
-locale_desc	Slovakia (ISO8859-2)

--- a/locale/sk_SK.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sk_SK.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Slovak, Slovakia (UTF-8)
-locale_desc	Slovakia (UTF-8)

--- a/locale/sl_SI.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sl_SI.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -2,5 +2,3 @@
 cldr_variant	sl_SI@currency=SIT
 pkg_name	SUNWlang-sl-extra
 prototype	legacy
-# Slovenian, Slovenia (ISO8859-2)
-locale_desc	Slovenia (ISO8859-2)

--- a/locale/sl_SI.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sl_SI.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Slovenian, Slovenia (UTF-8)
-locale_desc	Slovenia (UTF-8)

--- a/locale/sq_AL.ISO8859-2.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sq_AL.ISO8859-2.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-sq-extra
 prototype	legacy
-# Albanian, Albania (ISO8859-2)
-locale_desc	Albania (ISO8859-2)

--- a/locale/sq_AL.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sq_AL.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Albanian, Albania (UTF-8)
-locale_desc	Albania (UTF-8)

--- a/locale/sv_SE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sv_SE.ISO8859-1.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-sv-extra
 prototype	legacy
-# Swedish, Sweden (ISO8859-1)
-locale_desc	Sweden (ISO8859-1)

--- a/locale/sv_SE.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sv_SE.ISO8859-15.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,6 +1,4 @@
 pkg_name	SUNWlang-sv-extra
 prototype	legacy
-# Swedish, Sweden (ISO8859-15)
-locale_desc	Sweden (ISO8859-15)
 lc_messages	sv_SE.ISO8859-1
 lc_time		sv_SE.ISO8859-1

--- a/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:54 2010 +0200
@@ -1,7 +1,7 @@
 cldr_variant	sv_SE@currency=EUR
 pkg_name	SUNWlang-sv-extra
 prototype	legacy
-# Swedish, Sweden (ISO8859-15 + Euro)
-locale_desc	Sweden (ISO8859-15 + Euro)
+# Swedish, Sweden (ISO8859-15 - Euro)
+locale_desc	Swedish, Sweden (ISO8859-15 - Euro)
 lc_messages	sv_SE.ISO8859-1
 lc_time		sv_SE.ISO8859-1

--- a/locale/sv_SE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/sv_SE.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Swedish, Sweden (UTF-8)
-locale_desc	Sweden (UTF-8)

--- a/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:54 2010 +0200
@@ -1,5 +1,5 @@
 cldr_variant	sv_SE@currency=EUR
 pkg_name	SUNWlang-sv-extra
-# Swedish, Sweden (UTF-8 + Euro)
-locale_desc	Sweden (UTF-8 + Euro)
+# Swedish, Sweden (UTF-8 - Euro)
+locale_desc	Swedish, Sweden (UTF-8 - Euro)
 prototype	utf8

--- a/locale/tr_TR.ISO8859-9.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/tr_TR.ISO8859-9.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,4 +1,2 @@
 pkg_name	SUNWlang-tr-extra
 prototype	legacy
-# Turkish, Turkey (ISO8859-9)
-locale_desc	Turkey (ISO8859-9)

--- a/locale/tr_TR.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/tr_TR.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Turkish, Turkey (UTF-8)
-locale_desc	Turkey (UTF-8)

--- a/locale/uk_UA.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
+++ b/locale/uk_UA.UTF-8.spec	Tue Aug 10 16:17:54 2010 +0200
@@ -1,2 +0,0 @@
-# Ukrainian, Ukraine (UTF-8)
-locale_desc	Ukraine (UTF-8)