summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>1999-11-22 17:45:18 +0000
committerPablo Saratxaga <pablo@mandriva.com>1999-11-22 17:45:18 +0000
commit2fd3662221221de552a42cd29e6e256bb5915c11 (patch)
tree04c479d5d1de03e2a6be8659fe73adaa90c6da1f
parent0abd5cf46cb4b4d9b4febfd54448852fa0ac8237 (diff)
downloaddrakx-2fd3662221221de552a42cd29e6e256bb5915c11.tar
drakx-2fd3662221221de552a42cd29e6e256bb5915c11.tar.gz
drakx-2fd3662221221de552a42cd29e6e256bb5915c11.tar.bz2
drakx-2fd3662221221de552a42cd29e6e256bb5915c11.tar.xz
drakx-2fd3662221221de552a42cd29e6e256bb5915c11.zip
updated keyboard.pm file
-rw-r--r--perl-install/keyboard.pm22
-rw-r--r--perl-install/lang.pm44
2 files changed, 34 insertions, 32 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 69ed013ce..d3fac5abd 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -30,13 +30,13 @@ my %keyboards = (
"am" => [ __("Armenian"), "am-armscii8", "am" ],
"be" => [ __("Belgian"), "be-latin1", "be" ],
"bg" => [ __("Bulgarian"), "bg", "bg" ],
- "br" => [ __("Brazilian"), "br-latin1", "br" ],
- "ch_de" => [ __("Swiss (French layout)"), "sf-latin1", "fr_CH" ],
+ "br" => [ __("Brazilian"), "br-abnt2", "br" ],
+ "ch_de" => [ __("Swiss (French layout)"), "fr_CH-latin1", "fr_CH" ],
"ch_fr" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH" ],
"cz" => [ __("Czech"), "cz-latin2", "cs" ],
"de" => [ __("German"), "de-latin1", "de" ],
"dk" => [ __("Danish"), "dk-latin1", "dk" ],
- "dvorak" => [ __("Dvorak"), "dvorak", "dvorak" ],
+ "dvorak" => [ __("Dvorak"), "pc-dvorak-latin1", "dvorak" ],
"ee" => [ __("Estonian"), "ee-latin9", "ee" ],
"es" => [ __("Spanish"), "es-latin1", "es" ],
"fi" => [ __("Finnish"), "fi-latin1", "fi" ],
@@ -44,8 +44,7 @@ my %keyboards = (
#- georgian keyboards have to be written...
#-"ge_ru"=>[__("Georgian (\"Russian\" layout)","ge_ru-georgian_academy","ge_ru"],
#-"ge_la"=>[__("Georgian ("\Latin\" layout)","ge_la-georgian_academy","ge_la"],
-#- TO CHECK CHANGED AS NEXT ONE "gr" => [ __("Greek"), "gr-8859_7", "gr" ],
- "gr" => [ __("Greek"), "gr", "gr" ],
+ "gr" => [ __("Greek"), "gr-8859_7", "gr" ],
"hu" => [ __("Hungarian"), "hu-latin2", "hu" ],
"il" => [ __("Israeli"), "il-8859_8", "il" ],
"il" => [ __("Israeli (Phonetic)"),"hebrew", "il_phonetic" ],
@@ -53,24 +52,25 @@ my %keyboards = (
"it" => [ __("Italian"), "it-latin1", "it" ],
"la" => [ __("Latin American"), "la-latin1", "la" ],
"nl" => [ __("Dutch"), "nl-latin1", "nl" ],
- "lt" => [ __("Lithuanian AZERTY"), "lta-latin7", "lt" ],
+ "lt" => [ __("Lithuanian AZERTY"), "lt-latin7","lt" ],
"lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt_b" ],
"lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p" ],
"no" => [ __("Norwegian"), "no-latin1", "no" ],
"pl" => [ __("Polish"), "pl-latin2", "pl" ],
"pt" => [ __("Portuguese"), "pt-latin1", "pt" ],
"qc" => [ __("Canadian (Quebec)"), "qc-latin1","ca_enhanced" ],
- "ru" => [ __("Russian"), "ru", "ru" ],
+ "ru" => [ __("Russian"), "ru4", "ru" ],
+ "ru" => [ __("Russian (Yawerty)"),"ru-yawerty","ru_yawerty" ],
"se" => [ __("Swedish"), "se-latin1", "se_SE" ],
- "si" => [ __("Slovenian"), "si-latin1", "si" ],
- "sk" => [ __("Slovakian"), "sk-latin2", "czsk" ],
+ "si" => [ __("Slovenian"), "slovene", "si" ],
+ "sk" => [ __("Slovakian"), "sk-qwertz", "czsk" ],
"th" => [ __("Thai keyboard"), "th", "th" ],
- "tr_f" => [ __("Turkish (traditional \"F\" model)"), "tr_f-latin5", "tr_f" ],
+ "tr_f" => [ __("Turkish (traditional \"F\" model)"), "trf", "tr_f" ],
"tr_q" => [ __("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr_q" ],
"ua" => [ __("Ukrainian"), "ua", "ua" ],
"uk" => [ __("UK keyboard"), "uk-latin1", "gb" ],
"us" => [ __("US keyboard"), "us-latin1", "us_intl" ],
- "yu" => [ __("Yugoslavian (latin layout)"), "yu-latin2", "yu" ],
+ "yu" => [ __("Yugoslavian (latin layout)"), "sr", "yu" ],
);
#-######################################################################################
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index b019cd747..7853789ca 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -55,6 +55,7 @@ my %languages = (
'ru' => [ 'Russian', 'koi8-r', 'ru', 'ru' ],
'sk' => [ 'Slovak', 'iso-8859-2', 'sk', 'sk' ],
#- 'sr' => [ 'Serbian', 'iso-8859-5', 'sr', 'sr:sp' ],
+ 'th' => [ 'Thai', 'tis620', 'th', 'th' ],
'tr' => [ 'Turkish', 'iso-8859-9', 'tr', 'tr' ],
'uk' => [ 'Ukrainian', 'koi8-u', 'uk', 'uk' ],
'vi' => [ 'Vietnamese (TCVN)', 'tcvn', 'vi',
@@ -71,38 +72,39 @@ sub std_ { std2($_[0], 100), std2($_[0], 100) }
sub std { std2($_[0], 100), std2($_[0], 80) }
my %charsets = (
- "armscii-8" => [ "arm8", "armscii8", std_("armscii-8") ],
+ "armscii-8" => [ "arm8", "armscii8", std_("armscii-8") ],
#- chinese needs special console driver for text mode
- "Big5" => [ "?????", "????",
+ "Big5" => [ "?????", "????",
"-*-*-*-*-*-*-*-*-*-*-*-*-big5-0" ],
- "gb2312" => [ "?????", "????",
+ "gb2312" => [ "?????", "????",
"-isas-song ti-medium-r-normal--16-*-*-*-*-*-gb2312.1980-0" ],
- "iso-8859-1" => [ "lat0-sun16", "iso15", std("iso8859-1") ],
- "iso-8859-2" => [ "lat2-sun16", "iso02", std("iso8859-2") ],
- "iso-8859-3" => [ "iso03.f16", "iso03", std_("iso8859-3") ],
- "iso-8859-4" => [ "lat4u-16", "iso04", std_("iso8859-4") ],
- "iso-8859-5" => [ "iso05.f16", "iso05", std("iso8859-5") ],
+ "iso-8859-1" => [ "lat0-sun16", "iso15", std("iso8859-1") ],
+ "iso-8859-2" => [ "lat2-sun16", "iso02", std("iso8859-2") ],
+ "iso-8859-3" => [ "iso03.f16", "iso03", std_("iso8859-3") ],
+ "iso-8859-4" => [ "lat4u-16", "iso04", std_("iso8859-4") ],
+ "iso-8859-5" => [ "iso05.f16", "iso05", std("iso8859-5") ],
#- arabic needs special console driver for text mode [acon]
#- (and gtk support isn't done yet)
- "iso-8859-6" => [ "iso06.f16", "iso06", std_("iso8859-6") ],
- "iso-8859-7" => [ "iso07.f16", "iso07", std_("iso8859-7") ],
+ "iso-8859-6" => [ "iso06.f16", "iso06", std_("iso8859-6") ],
+ "iso-8859-7" => [ "iso07.f16", "iso07", std_("iso8859-7") ],
#- hebrew needs special console driver for text mode (none yet)
#- (and gtk support isn't done yet)
- "iso-8859-8" => [ "iso08.f16", "iso08", std_("iso8859-8") ],
- "iso-8859-9" => [ "lat5-16", "iso09", std("iso8859-9") ],
- "iso-8859-13" => [ "??????", "?????", std_("iso8859-13") ],
- "iso-8859-14" => [ "??????", "?????", std_("iso8859-14") ],
- "iso-8859-15" => [ "lat0-sun16", "iso15", std("iso8859-15") ],
+ "iso-8859-8" => [ "iso08.f16", "iso08", std_("iso8859-8") ],
+ "iso-8859-9" => [ "lat5-16", "iso09", std("iso8859-9") ],
+ "iso-8859-13" => [ "??????", "?????", std_("iso8859-13") ],
+ "iso-8859-14" => [ "??????", "?????", std_("iso8859-14") ],
+ "iso-8859-15" => [ "lat0-sun16", "iso15", std("iso8859-15") ],
#- japanese needs special console driver for text mode [kon2]
- "jisx0208" => [ "????", "????",
+ "jisx0208" => [ "????", "????",
"-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
- "koi8-r" => [ "Cyr_a8x16", "koi2alt", std("koi8-r") ],
- "koi8-u" => [ "ruscii_8x16", "koi2alt", std("koi8-u") ],
+ "koi8-r" => [ "Cyr_a8x16", "koi2alt", std("koi8-r") ],
+ "koi8-u" => [ "ruscii_8x16", "koi2alt", std("koi8-u") ],
#- korean needs special console driver for text mode
- "ksc5601" => [ "?????", "?????",
+ "ksc5601" => [ "?????", "?????",
"-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ],
- "tcvn" => [ "tcvn8x16", "tcvn", std2("tcvn-5712", 130), std2("tcvn-5712", 100) ],
- "viscii" => [ "viscii10-8x16", "viscii",
+ "tis620" => [ "????", "????", std2("tis620.2533-1",120) ],
+ "tcvn" => [ "tcvn8x16", "tcvn", std2("tcvn-5712", 130), std2("tcvn-5712", 100) ],
+ "viscii" => [ "viscii10-8x16", "viscii",
"-*-*-*-*-*-*-*-*-*-*-*-*-viscii1.1-1" ],
);