diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/keyboard.pm | 51 | ||||
| -rw-r--r-- | perl-install/share/fonts.tar.bz2 | bin | 1117395 -> 1136373 bytes | |||
| -rw-r--r-- | perl-install/share/locales-skeleton.tar.bz2 | bin | 25768 -> 26740 bytes |
3 files changed, 31 insertions, 20 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 82d3346a4..b5889ee1d 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -24,7 +24,7 @@ my $KMAP_MAGIC = 0x8B39C07F; my %lang2keyboard = ( 'af' => 'us_intl', -#-'ar' => 'ar:80', +#-'ar' => 'ar:80 ar_d:70 ar_azerty:60 ar_azerty_d:50', 'az' => 'az:80 tr:10 us_intl:5', 'be' => 'by:80 ru:50 ru_yawerty:40', 'be_BY.CP1251' => 'by:80 ru:50 ru_yawerty:40', @@ -100,11 +100,11 @@ my %lang2keyboard = 'ru_RU.KOI8-R' => 'ru:90 ru_yawerty:80', 'sk' => 'sk_qwerty:80 sk:70 sk_prog:50', 'sl' => 'si:80 hr:50', - 'sp' => 'yu:80', + 'sp' => 'sr:80', 'sq' => 'al:80', 'sr' => 'yu:80', 'sv' => 'se:90 fi:20', - 'tg' => 'ru:50 ru_yawerty:40', + 'tg' => 'tj:80 ru_yawerty:40', 'th' => 'th:90', 'tr' => 'tr_q:90 tr_q:30', 'tt' => 'ru:50 ru_yawerty:40', @@ -123,7 +123,7 @@ my %lang2keyboard = #- [1] = name for loadkeys, [2] = name for XKB my %keyboards = ( arch() =~ /^sparc/ ? ( - "cz" => [ __("Czech (QWERTZ)"), "sunt5-cz-us", "czsk(cz_us_qwertz)" ], + "cz" => [ __("Czech (QWERTZ)"), "sunt5-cz-us", "cz" ], "de" => [ __("German"), "sunt5-de-latin1", "de" ], "dvorak" => [ __("Dvorak"), "sundvorak", "dvorak" ], "es" => [ __("Spanish"), "sunt5-es", "es" ], @@ -132,32 +132,37 @@ arch() =~ /^sparc/ ? ( "no" => [ __("Norwegian"), "sunt4-no-latin1", "no" ], "pl" => [ __("Polish"), "sun-pl-altgraph", "pl" ], "ru" => [ __("Russian"), "sunt5-ru", "ru" ], +# TODO: check the console map + "se" => [ __("Swedish"), "sunt5-fi-latin1", "se" ], "uk" => [ __("UK keyboard"), "sunt5-uk", "gb" ], "us" => [ __("US keyboard"), "sunkeymap", "us" ], ) : ( arch() eq "ppc" ? ( - "us" => [ __("US keyboard"), "mac-us-ext", "us" ], "de_nodeadkeys" => [ __("German"), "mac-de-latin1-nodeadkeys", "de(nodeadkeys)" ], "fr" => [ __("French"), "mac-fr2-ext", "fr" ], + "us" => [ __("US keyboard"), "mac-us-ext", "us" ], ) : ( "al" => [ __("Albanian"), "al", "al" ], "am_old" => [ __("Armenian (old)"), "am_old", "am(old)" ], "am" => [ __("Armenian (typewriter)"), "am-armscii8", "am" ], "am_phonetic" => [ __("Armenian (phonetic)"), "am_phonetic", "am(phonetic)" ], -#- only xmodmap is currently available -#-"ar_azerty" => [ __("Arabic (AZERTY)"), "ar-8859_6", "ar" ], -#-"ar_qwerty" => [ __("Arabic (QWERTY)"), "ar-8859_6", "ar" ], +#-"ar_azerty" => [ __("Arabic (AZERTY)"), "ar-8859_6", "ar(azerty)" ], +#-"ar_azerty_d" => [ __("Arabic (AZERTY, arabic digits)"),"ar-8859_6","ar(azerty_digits)" ], +#-"ar" => [ __("Arabic (QWERTY)"), "ar-8859_6", "ar" ], +#-"ar_d" => [ __("Arabic (QWERTY, arabic digits)"),"ar-8859_6","ar(digits)" ], "az" => [ __("Azerbaidjani (latin)"), "az", "az" ], - "a3" => [ __("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)" ], +#"a3" => [ __("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)" ], "be" => [ __("Belgian"), "be-latin1", "be" ], "bg" => [ __("Bulgarian"), "bg", "bg" ], "br" => [ __("Brazilian (ABNT-2)"), "br-abnt2", "br" ], - "by" => [ __("Belarusian"), "by-cp1251", "byru" ], + "by" => [ __("Belarusian"), "by-cp1251", "by" ], "ch_de" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH" ], "ch_fr" => [ __("Swiss (French layout)"), "fr_CH-latin1", "fr_CH" ], - "cz" => [ __("Czech (QWERTZ)"), "cz-latin2", "czsk(cz_us_qwertz)" ], - "cz_qwerty" => [ __("Czech (QWERTY)"), "cz-lat2", "czsk(cz_us_qwerty)" ], - "cz_prog" => [ __("Czech (Programmers)"), "cz-lat2-prog", "czsk(us_cz_prog)" ], +#"cz" => [ __("Czech (QWERTZ)"), "cz-latin2", "czsk(cz_us_qwertz)" ], +#"cz_qwerty" => [ __("Czech (QWERTY)"), "cz-lat2", "czsk(cz_us_qwerty)" ], +#"cz_prog" => [ __("Czech (Programmers)"), "cz-lat2-prog", "czsk(us_cz_prog)" ], + "cz" => [ __("Czech (QWERTZ)"), "cz-latin2", "cz" ], + "cz_qwerty" => [ __("Czech (QWERTY)"), "cz-lat2", "cz_qwerty" ], "de" => [ __("German"), "de-latin1", "de" ], "de_nodeadkeys" => [ __("German (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)" ], "dk" => [ __("Danish"), "dk-latin1", "dk" ], @@ -171,7 +176,7 @@ arch() eq "ppc" ? ( "ge_la"=>[__("Georgian (\"Latin\" layout)"),"ge_la-georgian_academy","ge_la"], "gr" => [ __("Greek"), "gr-8859_7", "el" ], "hu" => [ __("Hungarian"), "hu-latin2", "hu" ], - "hr" => [ __("Croatian"), "croat", "yu" ], + "hr" => [ __("Croatian"), "croat", "hr" ], "il" => [ __("Israeli"), "il-8859_8", "il" ], "il_phonetic" => [ __("Israeli (Phonetic)"),"hebrew", "il_phonetic" ], "ir" => [ __("Iranian"), "ir-isiri3342","ir" ], @@ -180,13 +185,13 @@ arch() eq "ppc" ? ( "jp" => [ __("Japanese 106 keys"), "jp106", "jp" ], "kr" => [ __("Korean keyboard"),"us", "kr" ], "la" => [ __("Latin American"), "la-latin1", "la" ], - "mk" => [ __("Macedonian"), "mk", "mk" ], - "nl" => [ __("Dutch"), "nl-latin1", "nl" ], "lt" => [ __("Lithuanian AZERTY (old)"), "lt-latin7","lt_a" ], #- TODO: write a console kbd map for lt_new "lt_new" => [ __("Lithuanian AZERTY (new)"), "lt-latin7","lt_std" ], "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt" ], "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p" ], + "mk" => [ __("Macedonian"), "mk", "mk" ], + "nl" => [ __("Dutch"), "nl-latin1", "nl" ], "no" => [ __("Norwegian"), "no-latin1", "no" ], "pl" => [ __("Polish (qwerty layout)"), "pl", "pl" ], "pl2" => [ __("Polish (qwertz layout)"), "pl-latin2", "pl2" ], @@ -199,10 +204,16 @@ arch() eq "ppc" ? ( "ru_yawerty" => [ __("Russian (Yawerty)"),"ru-yawerty","ru_yawerty" ], "se" => [ __("Swedish"), "se-latin1", "se" ], "si" => [ __("Slovenian"), "slovene", "si" ], - "sk" => [ __("Slovakian (QWERTZ)"), "sk-qwertz", "czsk(sk_us_qwertz)" ], - "sk_qwerty" => [ __("Slovakian (QWERTY)"), "sk-qwerty", "czsk(sk_us_qwerty)" ], - "sk_prog" => [ __("Slovakian (Programmers)"), "sk-prog", "czsk(us_sk_prog" ], +# "sk" => [ __("Slovakian (QWERTZ)"), "sk-qwertz", "czsk(sk_us_qwertz)" ], +# "sk_qwerty" => [ __("Slovakian (QWERTY)"), "sk-qwerty", "czsk(sk_us_qwerty)" ], +# "sk_prog" => [ __("Slovakian (Programmers)"), "sk-prog", "czsk(us_sk_prog" ], + "sk" => [ __("Slovakian (QWERTZ)"), "sk-qwertz", "sk" ], + "sk_qwerty" => [ __("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty" ], +# TODO: console map + "sr" => [ __("Serbian (cyrillic)"), "yu", "sr" ], "th" => [ __("Thai keyboard"), "th", "th" ], +# TODO: console map + "tj" => [ __("Tajik keyboard"), "tj", "tj" ], "tr_f" => [ __("Turkish (traditional \"F\" model)"), "trf", "tr_f" ], "tr_q" => [ __("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr" ], "ua" => [ __("Ukrainian"), "ua", "ua" ], @@ -210,7 +221,7 @@ arch() eq "ppc" ? ( "us" => [ __("US keyboard"), "us", "us" ], "us_intl" => [ __("US keyboard (international)"), "us-latin1", "us_intl" ], "vn" => [ __("Vietnamese \"numeric row\" QWERTY"),"vn-tcvn", "vn" ], - "yu" => [ __("Yugoslavian (latin/cyrillic)"), "sr", "sr" ], + "yu" => [ __("Yugoslavian (latin)"), "yu", "hr" ], )), ); diff --git a/perl-install/share/fonts.tar.bz2 b/perl-install/share/fonts.tar.bz2 Binary files differindex 456b14e31..9b5a97b00 100644 --- a/perl-install/share/fonts.tar.bz2 +++ b/perl-install/share/fonts.tar.bz2 diff --git a/perl-install/share/locales-skeleton.tar.bz2 b/perl-install/share/locales-skeleton.tar.bz2 Binary files differindex 772c51eda..c8765905c 100644 --- a/perl-install/share/locales-skeleton.tar.bz2 +++ b/perl-install/share/locales-skeleton.tar.bz2 |