improved default fonts for KDE, completed the geographic location

by continent for a few remaining country codes

1 files changed, 41 insertions, 36 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 298d57860..1066a43d9 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -148,7 +148,7 @@ my %countries = (
 'AS' => [ N_("American Samoa"), 'en_US', '4' ], #
 'AT' => [ N_("Austria"),        'de_AT', '1' ],
 'AU' => [ N_("Australia"),      'en_AU', '4' ],
-'AW' => [ N_("Aruba"),          'en_US', '?' ], #
+'AW' => [ N_("Aruba"),          'en_US', '5' ], #
 'AZ' => [ N_("Azerbaijan"),     'az_AZ', '1' ],
 'BA' => [ N_("Bosnia and Herzegovina"), 'bs_BA', '1' ],
 'BB' => [ N_("Barbados"),       'en_US', '5' ], #
@@ -165,18 +165,18 @@ my %countries = (
 'BR' => [ N_("Brazil"),         'pt_BR', '5' ],
 'BS' => [ N_("Bahamas"),        'en_US', '5' ], #
 'BT' => [ N_("Bhutan"),         'en_IN', '2' ], #
-'BV' => [ N_("Bouvet Island"),  'en_US', '?' ], #
+'BV' => [ N_("Bouvet Island"),  'en_US', '3' ], #
 'BW' => [ N_("Botswana"),       'en_BW', '3' ],
 'BY' => [ N_("Belarus"),        'be_BY', '1' ],
 'BZ' => [ N_("Belize"),         'en_US', '5' ], #
 'CA' => [ N_("Canada"),         'en_CA', '5' ],
-'CC' => [ N_("Cocos (Keeling) Islands"), 'en_US', '?' ], #
+'CC' => [ N_("Cocos (Keeling) Islands"), 'en_US', '4' ], #
 'CD' => [ N_("Congo (Kinshasa)"), 'fr_FR', '3' ], #
 'CF' => [ N_("Central African Republic"), 'fr_FR', '3' ], #
 'CG' => [ N_("Congo (Brazzaville)"), 'fr_FR', '3' ], #
 'CH' => [ N_("Switzerland"),    'de_CH', '1' ],
 'CI' => [ N_("Cote d'Ivoire"),  'fr_FR', '3' ], #
-'CK' => [ N_("Cook Islands"),   'en_US', '?' ], #
+'CK' => [ N_("Cook Islands"),   'en_US', '4' ], #
 'CL' => [ N_("Chile"),          'es_CL', '5' ],
 'CM' => [ N_("Cameroon"),       'fr_FR', '3' ], #
 'CN' => [ N_("China"),          'zh_CN', '2' ],
@@ -184,7 +184,7 @@ my %countries = (
 'CR' => [ N_("Costa Rica"),     'es_CR', '5' ],
 'CU' => [ N_("Cuba"),           'es_DO', '5' ], #
 'CV' => [ N_("Cape Verde"),     'pt_PT', '3' ], #
-'CX' => [ N_("Christmas Island"), 'en_US', '?' ], #
+'CX' => [ N_("Christmas Island"), 'en_US', '4' ], #
 'CY' => [ N_("Cyprus"),         'en_US', '1' ], #
 'CZ' => [ N_("Czech Republic"), 'cs_CZ', '2' ],
 'DE' => [ N_("Germany"),        'de_DE', '1' ],
@@ -219,13 +219,13 @@ my %countries = (
 'GP' => [ N_("Guadeloupe"),     'fr_FR', '5' ], #
 'GQ' => [ N_("Equatorial Guinea"), 'en_US', '3' ], #
 'GR' => [ N_("Greece"),         'el_GR', '1' ],
-'GS' => [ N_("South Georgia and the South Sandwich Islands"), 'en_US', '?' ], #
+'GS' => [ N_("South Georgia and the South Sandwich Islands"), 'en_US', '4' ], #
 'GT' => [ N_("Guatemala"),      'es_GT', '5' ],
 'GU' => [ N_("Guam"),           'en_US', '4' ], #
 'GW' => [ N_("Guinea-Bissau"),  'pt_PT', '3' ], #
 'GY' => [ N_("Guyana"),         'en_US', '5' ], #
 'HK' => [ N_("Hong Kong"),      'zh_HK', '2' ],
-'HM' => [ N_("Heard and McDonald Islands"), 'en_US', '?' ], #
+'HM' => [ N_("Heard and McDonald Islands"), 'en_US', '4' ], #
 'HN' => [ N_("Honduras"),       'es_HN', '5' ],
 'HR' => [ N_("Croatia"),        'hr_HR', '1' ],
 'HT' => [ N_("Haiti"),          'fr_FR', '5' ], #
@@ -247,7 +247,7 @@ my %countries = (
 'KH' => [ N_("Cambodia"),       'en_US', '2' ], # kh_KH not released yet
 'KI' => [ N_("Kiribati"),       'en_US', '3' ], #
 'KM' => [ N_("Comoros"),        'en_US', '2' ], #
-'KN' => [ N_("Saint Kitts and Nevis"), 'en_US', '?' ], #
+'KN' => [ N_("Saint Kitts and Nevis"), 'en_US', '5' ], #
 'KP' => [ N_("Korea (North)"),  'ko_KR', '2' ], #
 'KR' => [ N_("Korea"),          'ko_KR', '2' ],
 'KW' => [ N_("Kuwait"),         'ar_KW', '2' ],
@@ -273,12 +273,12 @@ my %countries = (
 'ML' => [ N_("Mali"),           'en_US', '3' ], #
 'MM' => [ N_("Myanmar"),        'en_US', '2' ], #
 'MN' => [ N_("Mongolia"),       'mn_MN', '2' ],
-'MP' => [ N_("Northern Mariana Islands"), 'en_US', '?' ], #
+'MP' => [ N_("Northern Mariana Islands"), 'en_US', '2' ], #
 'MQ' => [ N_("Martinique"),     'fr_FR', '5' ], #
 'MR' => [ N_("Mauritania"),     'en_US', '3' ], #
-'MS' => [ N_("Montserrat"),     'en_US', '?' ], #
+'MS' => [ N_("Montserrat"),     'en_US', '5' ], #
 'MT' => [ N_("Malta"),          'mt_MT', '1' ],
-'MU' => [ N_("Mauritius"),      'en_US', '?' ], #
+'MU' => [ N_("Mauritius"),      'en_US', '3' ], #
 'MV' => [ N_("Maldives"),       'en_US', '4' ], #
 'MW' => [ N_("Malawi"),         'en_US', '3' ], #
 'MX' => [ N_("Mexico"),         'es_MX', '5' ],
@@ -287,14 +287,14 @@ my %countries = (
 'NA' => [ N_("Namibia"),        'en_US', '3' ], #
 'NC' => [ N_("New Caledonia"),  'fr_FR', '4' ], #
 'NE' => [ N_("Niger"),          'en_US', '3' ], #
-'NF' => [ N_("Norfolk Island"), 'en_GB', '?' ], #
+'NF' => [ N_("Norfolk Island"), 'en_GB', '4' ], #
 'NG' => [ N_("Nigeria"),        'en_US', '3' ], #
 'NI' => [ N_("Nicaragua"),      'es_NI', '5' ],
 'NL' => [ N_("Netherlands"),    'nl_NL', '1' ],
 'NO' => [ N_("Norway"),         'no_NO', '1' ],
 'NP' => [ N_("Nepal"),          'en_IN', '2' ], #
-'NR' => [ N_("Nauru"),          'en_US', '?' ], #
-'NU' => [ N_("Niue"),           'en_US', '?' ], #
+'NR' => [ N_("Nauru"),          'en_US', '4' ], #
+'NU' => [ N_("Niue"),           'en_US', '4' ], #
 'NZ' => [ N_("New Zealand"),    'en_NZ', '4' ],
 'OM' => [ N_("Oman"),           'ar_OM', '2' ],
 'PA' => [ N_("Panama"),         'es_PA', '5' ],
@@ -310,9 +310,9 @@ my %countries = (
 'PS' => [ N_("Palestine"),      'ar_JO', '2' ], #
 'PT' => [ N_("Portugal"),       'pt_PT', '1' ],
 'PY' => [ N_("Paraguay"),       'es_PY', '5' ],
-'PW' => [ N_("Palau"),          'en_US', '?' ], #
+'PW' => [ N_("Palau"),          'en_US', '2' ], #
 'QA' => [ N_("Qatar"),          'ar_QA', '2' ],
-'RE' => [ N_("Reunion"),        'fr_FR', '?' ], #
+'RE' => [ N_("Reunion"),        'fr_FR', '2' ], #
 'RO' => [ N_("Romania"),        'ro_RO', '1' ],
 'RU' => [ N_("Russia"),         'ru_RU', '1' ],
 'RW' => [ N_("Rwanda"),         'fr_FR', '3' ], #
@@ -324,7 +324,7 @@ my %countries = (
 'SG' => [ N_("Singapore"),      'en_SG', '2' ],
 'SH' => [ N_("Saint Helena"),   'en_GB', '5' ], #
 'SI' => [ N_("Slovenia"),       'sl_SI', '1' ],
-'SJ' => [ N_("Svalbard and Jan Mayen Islands"), 'en_US', '?' ], #
+'SJ' => [ N_("Svalbard and Jan Mayen Islands"), 'en_US', '1' ], #
 'SK' => [ N_("Slovakia"),       'sk_SK', '1' ],
 'SL' => [ N_("Sierra Leone"),   'en_US', '3' ], #
 'SM' => [ N_("San Marino"),     'it_IT', '1' ], #
@@ -335,39 +335,39 @@ my %countries = (
 'SV' => [ N_("El Salvador"),    'es_SV', '5' ],
 'SY' => [ N_("Syria"),          'ar_SY', '2' ],
 'SZ' => [ N_("Swaziland"),      'en_BW', '3' ], #
-'TC' => [ N_("Turks and Caicos Islands"), 'en_US', '?' ], #
+'TC' => [ N_("Turks and Caicos Islands"), 'en_US', '5' ], #
 'TD' => [ N_("Chad"),           'en_US', '3' ], #
-'TF' => [ N_("French Southern Territories"), 'fr_FR', '?' ], #
+'TF' => [ N_("French Southern Territories"), 'fr_FR', '4' ], #
 'TG' => [ N_("Togo"),           'fr_FR', '3' ], #
 'TH' => [ N_("Thailand"),       'th_TH', '2' ],
 'TJ' => [ N_("Tajikistan"),     'tg_TJ', '2' ],
-'TK' => [ N_("Tokelau"),        'en_US', '?' ], #
+'TK' => [ N_("Tokelau"),        'en_US', '4' ], #
 'TL' => [ N_("East Timor"),     'pt_PT', '4' ], #
 'TM' => [ N_("Turkmenistan"),   'en_US', '2' ], #
 'TN' => [ N_("Tunisia"),        'ar_TN', '5' ],
 'TO' => [ N_("Tonga"),          'en_US', '3' ], #
 'TR' => [ N_("Turkey"),         'tr_TR', '2' ],
 'TT' => [ N_("Trinidad and Tobago"), 'en_US', '5' ], #
-'TV' => [ N_("Tuvalu"),         'en_US', '?' ], #
+'TV' => [ N_("Tuvalu"),         'en_US', '4' ], #
 'TW' => [ N_("Taiwan"),         'zh_TW', '2' ],
 'TZ' => [ N_("Tanzania"),       'en_US', '3' ], #
 'UA' => [ N_("Ukraine"),        'uk_UA', '1' ],
 'UG' => [ N_("Uganda"),         'en_US', '3' ], #
-'UM' => [ N_("United States Minor Outlying Islands"), 'en_US', '?' ], #
+'UM' => [ N_("United States Minor Outlying Islands"), 'en_US', '5' ], #
 'US' => [ N_("United States"),  'en_US', '5' ],
 'UY' => [ N_("Uruguay"),        'es_UY', '5' ],
 'UZ' => [ N_("Uzbekistan"),     'uz_UZ', '2' ],
-'VA' => [ N_("Vatican"),       'it_IT', '1' ], #
+'VA' => [ N_("Vatican"),        'it_IT', '1' ], #
 'VC' => [ N_("Saint Vincent and the Grenadines"), 'en_US', '5' ], 
 'VE' => [ N_("Venezuela"),      'es_VE', '5' ],
 'VG' => [ N_("Virgin Islands (British)"), 'en_GB', '5' ], #
 'VI' => [ N_("Virgin Islands (U.S.)"), 'en_US', '5' ], #
 'VN' => [ N_("Vietnam"),        'vi_VN', '2' ],
-'VU' => [ N_("Vanuatu"),        'en_US', '?' ], #
+'VU' => [ N_("Vanuatu"),        'en_US', '4' ], #
 'WF' => [ N_("Wallis and Futuna"), 'fr_FR', '4' ], #
 'WS' => [ N_("Samoa"),          'en_US', '4' ], #
 'YE' => [ N_("Yemen"),          'ar_YE', '2' ],
-'YT' => [ N_("Mayotte"),        'fr_FR', '?' ], #
+'YT' => [ N_("Mayotte"),        'fr_FR', '3' ], #
 'YU' => [ N_("Serbia"),         'sp_YU', '1' ],
 'ZA' => [ N_("South Africa"),   'en_ZA', '5' ],
 'ZM' => [ N_("Zambia"),         'en_US', '3' ], #
@@ -610,24 +610,29 @@ sub charset2kde_charset {
 #- font+size for different charsets; the field [0] is the default,
 #- others are overrridens for fixed(1), toolbar(2), menu(3) and taskbar(4)
 my %charset2kde_font = (
-  'C' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
-  'iso-8859-1'  => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
-  'iso-8859-2'  => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
-  'iso-8859-9'  => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
-  'iso-8859-15' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
+  'C' => [ "Nimbus Sans,12", "courier,10", "Nimbus Sans,11" ],
+  'iso-8859-1'  => [ "Nimbus Sans,12", "Nimbus Mono,10", "Nimbus Sans,11" ],
+  'iso-8859-2'  => [ "Nimbus Sans,12", "Nimbus Mono,10", "Nimbus Sans,11" ],
+  'iso-8859-7'  => [ "Helvetica,12", "courier,10", "Helvetica,11" ],
+  'iso-8859-9'  => [ "Nimbus Sans,12", "Nimbus Mono,10", "Nimbus Sans,11" ],
+  'iso-8859-13' => [ "Nimbus Sans,12", "Nimbus Mono,10", "Nimbus Sans,11" ],
+  'iso-8859-15' => [ "Nimbus Sans,12", "Nimbus Mono,10", "Nimbus Sans,11" ],
   'jisx0208' => [ "misc-fixed,14", "Kochi-Gothic,13" ],
   'ksc5601' => [ "daewoo-gothic,16" ],
   'gb2312' => [ "default-ming,16" ],
   'Big5' => [ "taipei-fixed,16" ],
-  'tis620' => [ "misc-norasi,17", ],
+  'tis620' => [ "Norasi,16", "Norasi,15" ],
+  'utf_ar' => [ "Kacs_qr,13", "Courier New,13", "Kacs_qr,12" ], 
+  'utf_az' => [ "Nimbus Sans,12", "Nimbus Mono,10", "Nimbus Sans,11" ],
+  'utf_hy' => [ "Artsounk,12", "courier,10", "Artsounk,11" ],
+  'utf_ta' => [ "Tscu_paranar,14", "Tsc_avarangalfxd,10", "Tscu_paranar,12", ],
   #- the following should be changed to better defaults when better fonts
   #- get available
-  'utf_am' => [ "clearlyu,17" ],
-  'utf_hy' => [ "clearlyu,17" ],
-  'utf_ka' => [ "clearlyu,17" ],
-  'utf_ta' => [ "TSCu_Paranar,14", "TSC_Avarangalfxd,10", "TSCu_Paranar,12", ],
   'utf_vi' => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
-  'default' => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
+  'utf_am' => [ "clearlyu,15" ],
+  'utf_he' => [ "clearlyu,15" ],
+  'utf_ka' => [ "clearlyu,15" ],
+  'default' => [ "Nimbus Sans,12", "Nimbus Mono,10", "Nimbus Sans,11" ],
 );
 
 sub charset2kde_font {