diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/Keyboard/Makefile /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/Keyboard/Makefile --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/Keyboard/Makefile 2006-07-22 21:05:59.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/Keyboard/Makefile 2006-09-06 18:06:55.000000000 +0100 @@ -6,7 +6,7 @@ gziped_ekmaps = $(addsuffix .ekmap.gz, $(models)) -build-mini : $(gziped_ekmaps) +build-mini : $(gziped_ekmaps) macintosh_old.tree pc105.tree %.gz : % gzip -9 <$< >$@ @@ -14,6 +14,9 @@ %.ekmap : ./kbdcompiler $(@:%.ekmap=%) MyKeyboardNames.pl $(xkbdir) >$@ +%.tree : %.ekmap.gz + ./keymaptree -output $@ -useonly "$$(< keymaptree.use grep -v '^#' | xargs | sed 's/ /,/g')" $(@:%.tree=%) + acmfiles = $(wildcard acm/*.acm) gziped_acmfiles = $(addsuffix .gz, $(acmfiles)) @@ -52,7 +55,7 @@ -rm -f *~ -rm -f acm/*.acm.gz -rm -rf compose $(compose_files) - -rm -rf keymaps + -rm -rf keymaps tree-keymaps -rm -f keymaps.dir names.list -rm -f $(gziped_ekmaps) -rm -f MyKeyboardNames.pl diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/Keyboard/keymaptree /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/Keyboard/keymaptree --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/Keyboard/keymaptree 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/Keyboard/keymaptree 2006-09-06 16:39:22.000000000 +0100 @@ -0,0 +1,120 @@ +#!/bin/sh +set -e + +# keymaptree -- build decision trees covering every keymap we can think of +# Copyright (C) 2006 Canonical Ltd.; written by Colin Watson. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# If you have not received a copy of the GNU General Public License +# along with this program, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# Default values: +output='' +models='' +useonly="$(< keymaptree.use grep -v '^#' | xargs | sed 's/ /,/g')" +skip='' + +while [ "$1" ]; do + case "$1" in + -output) + shift + output="$1" + ;; + -useonly) + shift + useonly="$1" + ;; + -skip) + shift + skip="$1" + ;; + -\?|-help|--help) + cat >&2 < [...] +Legal options are: +-?,-help,--help Print this message +-output Write decision tree to file (default: stdout) +-useonly Include only these keymaps in the decision tree + (comma-separated) +-skip Exclude these keymaps from the decision tree + (comma-separated) +EOF + exit 0 + ;; + -*) + echo "keymaptree: Unrecognised option $1" >&2 + exit 1 + ;; + *) + models="${models:+$models }$1" + ;; + esac + shift +done + +if [ -z "$models" ]; then + echo "keymaptree: Need at least one model" >&2 + exit 1 +fi + +for model in $models; do + case $model in + amiga|ataritt|macintosh_old|pc105|sun4|sun5) + ;; + *) + echo "keymaptree: Unrecognised model $model" >&2 + exit 1 + ;; + esac +done + +variantpairs="$(./kbdnames-maker | grep 'variant\*' | sort -t '*' | \ + cut -d'*' --output-delimiter=: -f2,3 | sed 's/:$//' | \ + egrep -v '^(nec|nec_vndr)/jp')" + +rm -rf tree-keymaps +gkincludeopts='' +gkfiles='' + +for model in $models; do + mkdir -p "tree-keymaps/$model" + for variantpair in $variantpairs; do + case $variantpair in + *:*) + layout="${variantpair%%:*}" + variant="${variantpair#*:}" + ;; + *) + layout="$variantpair" + variant='' + ;; + esac + ./ckbcomp-mini -I. -model "$model" -layout "$layout" ${variant:+-variant "$variant"} | \ + perl -ne ' + if (/^keycode ([0-9]+)/) { + $keycodes{$1} = $_; + } else { + for $code (sort { $a <=> $b } keys %keycodes) { + print $keycodes{$code}; + } + %keycodes = (); + print; + }' \ + > "tree-keymaps/$model/$layout${variant:+:$variant}" + done + gkincludeopts="${gkincludeopts:+$gkincludeopts }-I tree-keymaps/$model" + echo "$variantpairs" > "tree-keymaps/$model.list" + gkfiles="${gkfiles:+$gkfiles }tree-keymaps/$model.list" +done +gen_keymap ${output:+-o $output} -v $gkincludeopts \ + ${useonly:+-u $useonly} ${skip:+-s $skip} $gkfiles diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/Keyboard/keymaptree.use /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/Keyboard/keymaptree.use --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/Keyboard/keymaptree.use 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/Keyboard/keymaptree.use 2006-09-06 16:41:36.000000000 +0100 @@ -0,0 +1,47 @@ +# This list was generated by taking the list of i386 and powerpc keymaps +# offered by console-keymaps-tree from console-data and converting them to X +# keymap layouts and variants. Feel free to add more keymaps to this list, +# as long as gen_keymap (called from keymaptree) still thinks they're +# distinguishable. + +be +bg +br +by +ca +ch +cs +cz +de:nodeadkeys +dk +ee +es +fi +fr +fr:latin9 +gb +gr +hr +hu +il +is +it +jp +latam +lt +lv +mk +no +pl +pt +ro +ru +se +sk:qwerty +th:tis +tr +tr:f +ua +us +us:dvorak +us:intl diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/changelog /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/changelog --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/changelog 2006-08-23 13:37:01.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/changelog 2006-09-06 18:13:59.000000000 +0100 @@ -1,3 +1,15 @@ +console-setup (1.7ubuntu3) UNRELEASED; urgency=low + + * Use keymapper to generate decision trees for a restricted subset of the + macintosh_old and pc105 models. (I tried building trees for the whole + model, but this took far too long.) + * If the detect-keyboard debconf plugin is available + (cdebconf-newt-detect-keys in the installer), then offer to use it to + detect the keyboard layout. + * Fix debian/po/POTFILES.in to point to console-setup.templates. + + -- Colin Watson Wed, 6 Sep 2006 18:07:54 +0100 + console-setup (1.7ubuntu2) edgy; urgency=low * Make console-setup-udeb depend on console-tools-udeb. diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/config.proto /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/config.proto --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/config.proto 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/config.proto 2006-09-06 18:03:11.000000000 +0100 @@ -92,6 +92,13 @@ # variant*it*nodeadkeys*Eliminate dead keys' db_capb backup +CAPB="$RET" +detect_keyboard=false +case $CAPB in + *plugin-detect-keyboard*) + detect_keyboard=: + ;; +esac # Set default value for a question only if it is not seen by the user db_default () { @@ -1113,6 +1120,45 @@ fi ;; 2) + db_get console-setup/modelcode + if \ + $detect_keyboard \ + && [ -e "/usr/share/console-setup-mini/$RET.tree" ] + then + db_input high console-setup/ask_detect + if db_go; then + STATE=$(($STATE + 1)) + else + STATE=$(($STATE - 1)) + fi + else + STATE=$(($STATE + $STATE - $old_state)) + fi + ;; + 3) + db_get console-setup/modelcode + if \ + $detect_keyboard \ + && [ -e "/usr/share/console-setup-mini/$RET.tree" ] \ + && db_get console-setup/ask_detect \ + && [ "$RET" = true ] + then + db_subst console-setup/detect FILENAME \ + "/usr/share/console-setup-mini/$RET.tree" + db_input critical console-setup/detect + if db_go; then + db_get console-setup/detect + detected_keyboard="$RET" + STATE=$(($STATE + 1)) + else + STATE=$(($STATE - 1)) + fi + else + detected_keyboard= + STATE=$(($STATE + $STATE - $old_state)) + fi + ;; + 4) if [ "$unsupported_layout" = yes ]; then if [ "$STATE" -ge "$old_state" ]; then db_input medium console-setup/dont_ask_layout || true @@ -1122,6 +1168,11 @@ else STATE=$(($STATE - 1)) fi + elif [ "$detected_keyboard" ]; then + layout="${detected_keyboard%%:*}" + db_set console-setup/layoutcode "$layout" + # skip the question without making Debconf loop + STATE=$(( $STATE + $STATE - $old_state )) elif \ ask_debconf console-setup/layout critical \ layout "$default_layout" @@ -1132,16 +1183,33 @@ STATE=$(($STATE - 1)) fi ;; - 3) + 5) + adjust_layout=false if [ "$unsupported_layout" = yes ]; then db_set console-setup/variantcode "$XKBVARIANT" # skip the question without making Debconf loop STATE=$(( $STATE + $STATE - $old_state )) + elif [ "$detected_keyboard" ]; then + case $detected_keyboard in + *:*) + variant="${detected_keyboard#*:}" + ;; + *) + variant= + ;; + esac + db_set console-setup/variantcode "$variant" + adjust_layout=: + # skip the question without making Debconf loop + STATE=$(( $STATE + $STATE - $old_state )) elif \ ask_debconf console-setup/variant critical \ "variant\*${layout}" "$default_variant" then variant="$RET" + adjust_layout=: + fi + if $adjust_layout; then case "$layout" in # TODO: make s.t. to not forget to update this list # Don't forget to update also the list in kbdcompiler @@ -1192,7 +1260,7 @@ STATE=$(($STATE - 1)) fi ;; - 4) + 6) if [ "$unsupported_layout" = yes ]; then db_set console-setup/optionscode "$XKBOPTIONS" # skip the questions without making Debconf loop @@ -1423,7 +1491,7 @@ db_set console-setup/optionscode "$options" fi ;; - 5) + 7) # add commas choices=`echo "$charmaps" | sed -e 's/$/,/g' | sort ` # remove newlines @@ -1439,7 +1507,7 @@ db_get console-setup/charmap charmap=$RET ;; - 6) + 8) db_default console-setup/codeset "$default_codeset" db_input $codeset_priority console-setup/codeset || true if db_go; then @@ -1450,7 +1518,7 @@ db_get console-setup/codeset codeset=$RET ;; - 7) + 9) fontfaces=`available_fontfaces` # add commas choices=`echo "$fontfaces" | sed -e 's/$/,/g'` @@ -1531,7 +1599,7 @@ db_get console-setup/fontface fontface=$RET ;; - 8) + 10) fontsizes=`available_fontsizes` # add commas choices=`echo "$fontsizes" | sed -e 's/$/,/g' ` @@ -1553,7 +1621,7 @@ fontsize=$RET db_set console-setup/fontsize "$fontsize" ;; - 9) + 11) db_input medium console-setup/ttys || true if db_go; then STATE=$(($STATE + 1)) diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/console-setup-mini.templates /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/console-setup-mini.templates --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/console-setup-mini.templates 2006-07-22 21:05:56.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/console-setup-mini.templates 2006-09-06 18:03:10.000000000 +0100 @@ -166,6 +166,19 @@ in Unicode mode, regardless of what you choose here, you can always use also the Alt+period combination as a Compose key. +Template: console-setup/ask_detect +Type: boolean +Default: true +_Description: Detect keyboard layout? + You can try to have your keyboard layout detected by asking you to press a + series of keys. If you do not want to do this, you will be able to select + your keyboard layout from a list. + +Template: console-setup/detect +Type: detect-keyboard +Choices: ${FILENAME} +_Description: Detecting your keyboard layout + Template: console-setup/modelcode Type: string Default: none diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/console-setup-udeb.templates /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/console-setup-udeb.templates --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/console-setup-udeb.templates 2006-07-22 21:05:56.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/console-setup-udeb.templates 2006-09-06 18:03:10.000000000 +0100 @@ -166,6 +166,19 @@ in Unicode mode, regardless of what you choose here, you can always use also the Alt+period combination as a Compose key. +Template: console-setup/ask_detect +Type: boolean +Default: true +_Description: Detect keyboard layout? + You can try to have your keyboard layout detected by asking you to press a + series of keys. If you do not want to do this, you will be able to select + your keyboard layout from a list. + +Template: console-setup/detect +Type: detect-keyboard +Choices: ${FILENAME} +_Description: Detecting your keyboard layout + Template: console-setup/modelcode Type: string Default: none diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/console-setup.templates /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/console-setup.templates --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/console-setup.templates 2006-07-22 21:05:56.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/console-setup.templates 2006-09-06 18:03:10.000000000 +0100 @@ -166,6 +166,19 @@ in Unicode mode, regardless of what you choose here, you can always use also the Alt+period combination as a Compose key. +Template: console-setup/ask_detect +Type: boolean +Default: true +_Description: Detect keyboard layout? + You can try to have your keyboard layout detected by asking you to press a + series of keys. If you do not want to do this, you will be able to select + your keyboard layout from a list. + +Template: console-setup/detect +Type: detect-keyboard +Choices: ${FILENAME} +_Description: Detecting your keyboard layout + Template: console-setup/modelcode Type: string Default: none diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/control /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/control --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/control 2006-08-23 13:36:40.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/control 2006-09-06 18:10:45.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Console utilities maintainers Uploaders: Anton Zinoviev -Build-Depends-Indep: debhelper (>= 5), perl, po-debconf, libxml-parser-perl, xkb-data | xkeyboard-config +Build-Depends-Indep: debhelper (>= 5), perl, po-debconf, libxml-parser-perl, xkb-data | xkeyboard-config, keymapper (>= 0.5.3-5) Build-Depends: debhelper (>= 5), perl, libxml-parser-perl Standards-Version: 3.7.2 @@ -44,7 +44,7 @@ Package: console-setup-udeb Section: debian-installer Priority: extra -Depends: console-setup-ekmap, archdetect, cdebconf-udeb, console-tools-udeb +Depends: console-setup-ekmap, archdetect, cdebconf-udeb, console-tools-udeb, cdebconf-newt-detect-keys Architecture: all Description: Configure the keyboard This is an experimental replacement of kbd-chooser. It depends on diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/POTFILES.in /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/POTFILES.in --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/POTFILES.in 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/POTFILES.in 2006-09-06 18:13:35.000000000 +0100 @@ -1 +1 @@ -[type: gettext/rfc822deb] templates +[type: gettext/rfc822deb] console-setup.templates diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/bg.po /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/bg.po --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/bg.po 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/bg.po 2006-09-06 18:13:40.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: console-setup\n" "Report-Msgid-Bugs-To: pkg-kbd-devel@lists.alioth.debian.org\n" -"POT-Creation-Date: 2006-03-19 23:55+0200\n" +"POT-Creation-Date: 2006-09-06 18:13+0100\n" "PO-Revision-Date: 2006-04-05 17:55+0300\n" "Last-Translator: Anton Zinoviev \n" "Language-Team: BULGARIAN \n" @@ -19,13 +19,15 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:9 +#: ../console-setup.templates:1001 msgid "Codeset for your language environment:" msgstr "Набор знаци за вашата езикова среда:" #. Type: select #. Description -#: ../templates:9 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:1001 msgid "" " - Lat15 covers ISO 8859-1, ISO 8859-15 and ISO 8859-9;\n" " - Lat2 covers ISO 8859-2, the Euro sign as well as the\n" @@ -50,25 +52,25 @@ #. Type: select #. Description -#: ../templates:26 +#: ../console-setup.templates:2001 msgid "Keyboard model:" msgstr "Модел на клавиатурата:" #. Type: select #. Description -#: ../templates:32 +#: ../console-setup.templates:3001 msgid "The origin of the keyboard:" msgstr "Произходът на вашата клавиатурна подредба:" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "Keyboard layout:" msgstr "Клавиатурна подредба:" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "" "There are more than one keyboard layouts with the origin you selected. " "Please select the layout matching your keyboard." @@ -78,13 +80,13 @@ #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "Unsupported settings in configuration file" msgstr "Неподдържани настройки в конфигурационния файл" #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "" "The configuration file /etc/default/console-setup specifies keyboard layout " "and variant that are not supported by the configuration program. Because of " @@ -100,13 +102,15 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:55 +#: ../console-setup.templates:6001 msgid "Font for the console:" msgstr "Шрифт за конзолата:" #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "Please choose the font face you would like to use on Linux console." msgstr "" "Моля, посочете шрифта, който бихте желали да се използва на конзолата на " @@ -114,7 +118,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" " - VGA is traditionally looking and has medium coverage\n" " of international scripts;\n" @@ -133,7 +139,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" "If you prefer bold version of the Terminus font and you don't use " "framebuffer then choose TerminusBoldVGA. If you use framebuffer then choose " @@ -145,7 +153,15 @@ #. Type: select #. Description -#: ../templates:75 +#. Type: select +#. Description +#: ../console-setup.templates:7001 ../console-setup.templates:8001 +msgid "Font size:" +msgstr "Размер на шрифта:" + +#. Type: select +#. Description +#: ../console-setup.templates:7001 msgid "" "Please select the size of the font for the Linux console. For a reference - " "the font your computer starts with has size 16." @@ -155,13 +171,7 @@ #. Type: select #. Description -#: ../templates:83 -msgid "Font size:" -msgstr "Размер на шрифта:" - -#. Type: select -#. Description -#: ../templates:83 +#: ../console-setup.templates:8001 #, fuzzy msgid "" "Please select the size of the font for the Linux console. When the size is " @@ -172,11 +182,19 @@ "console package (console-tools doesn't work for such fonts). Currently " "these fonts can not be used if the framebuffer you use is based on the " "RadeonFB kernel module." -msgstr "Моля, посочете размера на шрифта за конзолата на Линукс. Когато размерът е представен с обикновено число, тогава съответният шрифт може да се използва с всички конзолни драйвери, а числото показва височината на символите (в брой редове). В противен случай размерът има вида ВИСОЧИНАxШИРИНА, а съответните шрифтове могат да се използват само ако използвате фреймбуфер и конзолния пакет kbd (console-tools не работи с такива шрифтове). Понастоящем тези шрифтове не могат да се използват и ако вашият фреймбуфер е реализиран посредством модула на ядрото RadeonFB." +msgstr "" +"Моля, посочете размера на шрифта за конзолата на Линукс. Когато размерът е " +"представен с обикновено число, тогава съответният шрифт може да се използва " +"с всички конзолни драйвери, а числото показва височината на символите (в " +"брой редове). В противен случай размерът има вида ВИСОЧИНАxШИРИНА, а " +"съответните шрифтове могат да се използват само ако използвате фреймбуфер и " +"конзолния пакет kbd (console-tools не работи с такива шрифтове). " +"Понастоящем тези шрифтове не могат да се използват и ако вашият фреймбуфер е " +"реализиран посредством модула на ядрото RadeonFB." #. Type: select #. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "You can use the height of the fonts in order to figure out the real size of " "the symbols on the console. For a reference - the font your computer starts " @@ -188,19 +206,19 @@ #. Type: select #. Description -#: ../templates:101 +#: ../console-setup.templates:9001 msgid "Encoding on the console:" msgstr "Кодиране на конзолата:" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "Virtual consoles in use:" msgstr "Използвани виртуални конзоли:" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "Please enter a space delimited list of virtual consoles you use. The usual " "Unix filename wildcards are allowed (*, ? and [...])." @@ -211,7 +229,7 @@ #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "If you are unsure, then use the default /dev/tty[1-6] which stands for six " "virtual consoles. If you use devfs, then enter /dev/vc/[1-6] instead." @@ -222,79 +240,157 @@ #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:14001 +msgid "Caps Lock" +msgstr "Caps Lock" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Alt" +msgstr "Десен Alt" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Right Control" +msgstr "Десен Control" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Right Shift" msgstr "Десен Shift" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Logo key" +msgstr "Десен клавиш с лого" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Menu key" +msgstr "Клавиш меню" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Alt+Shift" msgstr "Alt+Shift" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Shift" msgstr "Control+Shift" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Shift+Caps Lock" msgstr "Shift+Caps Lock" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Alt" msgstr "Control+Alt" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Shift keys together" msgstr "Двата клавиша Shift едновременно" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Control keys together" msgstr "Двата клавиша Control едновременно" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Alt keys together" msgstr "Двата клавиша Alt едновременно" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Alt" +msgstr "Ляв Alt" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Left Control" msgstr "Десен Control" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Left Shift" msgstr "Ляв Shift" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Logo key" +msgstr "Ляв клавиш с лого" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "No toggling" msgstr "Без превключване" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Method for toggling between Latin and non-Latin mode:" msgstr "Метод за превключване между режими „латиница“ и „нелатински букви“:" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "Since your keyboard is a non-Latin one, you will need a way to toggle " "between the Latin and the non-Latin mode. Several options are available." @@ -305,7 +401,7 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "The most ergonomic choices seem to be the right Alt and the Caps Lock keys " "(in the later case use the combination Shift+Caps Lock for normal Caps " @@ -321,26 +417,34 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Notice the listed keys are not present on all keyboards." msgstr "" "Забележете, че някои от изброените клавиши отсъстват на някои клавиатури." #. Type: select #. Choices -#: ../templates:132 +#: ../console-setup.templates:12001 msgid "No temporary switch" msgstr "Без временно превключване" #. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:12001 ../console-setup.templates:13001 +msgid "Both Logo keys" +msgstr "И двата клавиша с лого" + +#. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "Method for temporarily toggle between Latin and non-Latin input:" msgstr "Метод за временна смяна между режими „латиница“ и „нелатински букви“:" #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "Sometimes the keyboard is in non-Latin mode and you want to type only few " "Latin letters. In this case it may be desirable to have a key for temporary " @@ -348,11 +452,18 @@ "non-Latin mode the keyboard types Latin letters and in reverse, when the " "keyboard is in Latin mode and you are pressing this key the keyboard will " "type non-Latin letters." -msgstr "Понякога клавиатурата се намира в режим за нелатински знаци и искате да въведете само няколко латински букви. В този случай може би е желателно да имате клавиш, с който да може да се преминава временно между режим „латиница“ и режим с нелатински букви. Докато този клавиш е натиснат в режим за нелатински букви, клавиатурата ще генерира латински букви и обратно, докато той е натиснат в режим „латиница“, клавиатурата ще генерира нелатински букви." +msgstr "" +"Понякога клавиатурата се намира в режим за нелатински знаци и искате да " +"въведете само няколко латински букви. В този случай може би е желателно да " +"имате клавиш, с който да може да се преминава временно между режим " +"„латиница“ и режим с нелатински букви. Докато този клавиш е натиснат в " +"режим за нелатински букви, клавиатурата ще генерира латински букви и " +"обратно, докато той е натиснат в режим „латиница“, клавиатурата ще генерира " +"нелатински букви." #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "If you don't like this feature, choose the option \"No temporary switch\"." msgstr "" @@ -361,37 +472,19 @@ #. Type: select #. Choices -#: ../templates:146 +#: ../console-setup.templates:13001 msgid "No AltGr key" msgstr "Без клавиш AltGr" #. Type: select -#. Choices -#: ../templates:146 -msgid "Left Logo key" -msgstr "Ляв клавиш с лого" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Both Logo keys" -msgstr "И двата клавиша с лого" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Left Alt" -msgstr "Ляв Alt" - -#. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "AltGr key replacement:" msgstr "Клавиш AltGr:" #. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "" "With some of the keyboard layouts, AltGr is a modifier key used to input " "some characters, primarily ones that are unusual for the language of the " @@ -409,49 +502,19 @@ #. Type: select #. Choices -#: ../templates:158 +#: ../console-setup.templates:14001 msgid "No compose key" msgstr "Без клавиш „Compose“" #. Type: select -#. Choices -#: ../templates:158 -msgid "Right Alt" -msgstr "Десен Alt" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Logo key" -msgstr "Десен клавиш с лого" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Control" -msgstr "Десен Control" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Menu key" -msgstr "Клавиш меню" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Caps Lock" -msgstr "Caps Lock" - -#. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "Compose key:" msgstr "Клавиш „Compose“:" #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "The Compose key (known also as Multi_key) is a key which is designated to " "signal the software to interpret the next keystrokes as a combination in " @@ -464,7 +527,7 @@ #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "On the text console the Compose key does not work in Unicode mode. If not in " "Unicode mode, regardless of what you choose here, you can always use also " @@ -474,6 +537,29 @@ "режимът не е „Уникод“, то независимо какво ще изберете тук, ще може да " "използвате също комбинацията Alt+точка като клавиш „Compose“." +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Клавиатурна подредба:" + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +msgid "" +"You can try to have your keyboard layout detected by asking you to press a " +"series of keys. If you do not want to do this, you will be able to select " +"your keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../console-setup.templates:16001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Клавиатурна подредба:" + #~ msgid "" #~ "Please select the size of the font for the Linux console. Correspondence " #~ "between font sizes and the number of the characters on the screen:\n" diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/cs.po /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/cs.po --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/cs.po 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/cs.po 2006-09-06 18:13:40.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: console-setup\n" "Report-Msgid-Bugs-To: pkg-kbd-devel@lists.alioth.debian.org\n" -"POT-Creation-Date: 2006-03-19 23:55+0200\n" +"POT-Creation-Date: 2006-09-06 18:13+0100\n" "PO-Revision-Date: 2006-04-01 15:42+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -19,13 +19,15 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:9 +#: ../console-setup.templates:1001 msgid "Codeset for your language environment:" msgstr "Znaková sada pro vaše jazykové prostředí:" #. Type: select #. Description -#: ../templates:9 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:1001 msgid "" " - Lat15 covers ISO 8859-1, ISO 8859-15 and ISO 8859-9;\n" " - Lat2 covers ISO 8859-2, the Euro sign as well as the\n" @@ -56,25 +58,25 @@ #. Type: select #. Description -#: ../templates:26 +#: ../console-setup.templates:2001 msgid "Keyboard model:" msgstr "Model klávesnice:" #. Type: select #. Description -#: ../templates:32 +#: ../console-setup.templates:3001 msgid "The origin of the keyboard:" msgstr "Původ klávesnice:" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "Keyboard layout:" msgstr "Rozložení klávesnice:" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "" "There are more than one keyboard layouts with the origin you selected. " "Please select the layout matching your keyboard." @@ -84,13 +86,13 @@ #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "Unsupported settings in configuration file" msgstr "Nepodporovaná nastavení v konfiguračním souboru" #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "" "The configuration file /etc/default/console-setup specifies keyboard layout " "and variant that are not supported by the configuration program. Because of " @@ -106,19 +108,23 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:55 +#: ../console-setup.templates:6001 msgid "Font for the console:" msgstr "Písmo pro konzoli:" #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "Please choose the font face you would like to use on Linux console." msgstr "Zvolte si prosím typ písma, které chcete na konzoli používat." #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" " - VGA is traditionally looking and has medium coverage\n" " of international scripts;\n" @@ -139,7 +145,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" "If you prefer bold version of the Terminus font and you don't use " "framebuffer then choose TerminusBoldVGA. If you use framebuffer then choose " @@ -150,7 +158,15 @@ #. Type: select #. Description -#: ../templates:75 +#. Type: select +#. Description +#: ../console-setup.templates:7001 ../console-setup.templates:8001 +msgid "Font size:" +msgstr "Velikost písma:" + +#. Type: select +#. Description +#: ../console-setup.templates:7001 msgid "" "Please select the size of the font for the Linux console. For a reference - " "the font your computer starts with has size 16." @@ -160,13 +176,7 @@ #. Type: select #. Description -#: ../templates:83 -msgid "Font size:" -msgstr "Velikost písma:" - -#. Type: select -#. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "Please select the size of the font for the Linux console. When the size is " "represented as a plain number then the corresponding font can be used with " @@ -182,13 +192,12 @@ "ovladači konzole. Číslo znamená výšku symbolů (měřeno počtem rozkladových " "řádků). V ostatních případech má velikost formát VÝŠKAxŠÍŘKA a příslušný " "font lze použít pouze pokud používáte framebuffer a konzolový balík kbd " -"(console-tools pro tyto fonty nefungují). Tato písma také nemůžete " -"použít v případech, kdy používáte framebuffer založený na jaderném modulu " -"RadeonFB." +"(console-tools pro tyto fonty nefungují). Tato písma také nemůžete použít v " +"případech, kdy používáte framebuffer založený na jaderném modulu RadeonFB." #. Type: select #. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "You can use the height of the fonts in order to figure out the real size of " "the symbols on the console. For a reference - the font your computer starts " @@ -199,19 +208,19 @@ #. Type: select #. Description -#: ../templates:101 +#: ../console-setup.templates:9001 msgid "Encoding on the console:" msgstr "Kódování na konzoli:" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "Virtual consoles in use:" msgstr "Používané virtuální konzoly:" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "Please enter a space delimited list of virtual consoles you use. The usual " "Unix filename wildcards are allowed (*, ? and [...])." @@ -222,7 +231,7 @@ #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "If you are unsure, then use the default /dev/tty[1-6] which stands for six " "virtual consoles. If you use devfs, then enter /dev/vc/[1-6] instead." @@ -232,79 +241,157 @@ #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:14001 +msgid "Caps Lock" +msgstr "Caps Lock" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Alt" +msgstr "Pravý Alt" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Right Control" +msgstr "Pravý Control" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Right Shift" msgstr "Pravý Shift" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Logo key" +msgstr "Pravá klávesa logo" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Menu key" +msgstr "Klávesa Menu" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Alt+Shift" msgstr "Alt+Shift" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Shift" msgstr "Control+Shift" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Shift+Caps Lock" msgstr "Shift+Caps Lock" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Alt" msgstr "Control+Alt" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Shift keys together" msgstr "Obě klávesy Shift současně" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Control keys together" msgstr "Obě klávesy Control současně" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Alt keys together" msgstr "Obě klávesy Alt současně" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Alt" +msgstr "Levý Alt" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Left Control" msgstr "Levý Control" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Left Shift" msgstr "Levý Shift" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Logo key" +msgstr "Levá klávesa logo" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "No toggling" msgstr "Bez přepínání" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Method for toggling between Latin and non-Latin mode:" msgstr "Způsob přepínání mezi vstupem latinky a jiných abeced:" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "Since your keyboard is a non-Latin one, you will need a way to toggle " "between the Latin and the non-Latin mode. Several options are available." @@ -315,7 +402,7 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "The most ergonomic choices seem to be the right Alt and the Caps Lock keys " "(in the later case use the combination Shift+Caps Lock for normal Caps " @@ -330,25 +417,33 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Notice the listed keys are not present on all keyboards." msgstr "Uvedené klávesy nejsou přítomny na všech klávesnicích." #. Type: select #. Choices -#: ../templates:132 +#: ../console-setup.templates:12001 msgid "No temporary switch" msgstr "Bez dočasného přepnutí" #. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:12001 ../console-setup.templates:13001 +msgid "Both Logo keys" +msgstr "Obě klávesy logo" + +#. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "Method for temporarily toggle between Latin and non-Latin input:" msgstr "Způsob pro dočasné přepnutí mezi vstupem latinky a jiné abecedy:" #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "Sometimes the keyboard is in non-Latin mode and you want to type only few " "Latin letters. In this case it may be desirable to have a key for temporary " @@ -365,7 +460,7 @@ #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "If you don't like this feature, choose the option \"No temporary switch\"." msgstr "" @@ -373,37 +468,19 @@ #. Type: select #. Choices -#: ../templates:146 +#: ../console-setup.templates:13001 msgid "No AltGr key" msgstr "Bez klávesy AltGr" #. Type: select -#. Choices -#: ../templates:146 -msgid "Left Logo key" -msgstr "Levá klávesa logo" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Both Logo keys" -msgstr "Obě klávesy logo" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Left Alt" -msgstr "Levý Alt" - -#. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "AltGr key replacement:" msgstr "Náhrada za klávesu AltGr:" #. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "" "With some of the keyboard layouts, AltGr is a modifier key used to input " "some characters, primarily ones that are unusual for the language of the " @@ -420,49 +497,19 @@ #. Type: select #. Choices -#: ../templates:158 +#: ../console-setup.templates:14001 msgid "No compose key" msgstr "Bez klávesy Compose" #. Type: select -#. Choices -#: ../templates:158 -msgid "Right Alt" -msgstr "Pravý Alt" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Logo key" -msgstr "Pravá klávesa logo" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Control" -msgstr "Pravý Control" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Menu key" -msgstr "Klávesa Menu" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Caps Lock" -msgstr "Caps Lock" - -#. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "Compose key:" msgstr "Klávesa Compose:" #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "The Compose key (known also as Multi_key) is a key which is designated to " "signal the software to interpret the next keystrokes as a combination in " @@ -474,7 +521,7 @@ #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "On the text console the Compose key does not work in Unicode mode. If not in " "Unicode mode, regardless of what you choose here, you can always use also " @@ -483,3 +530,26 @@ "Klávesa Compose bohužel nefunguje na textové konzoli v unicodovém režimu. " "Nezávisle na tom, co zde vyberete, můžete vždy místo klávesy Compose použít " "kombinaci Alt+tečka (tedy pouze pokud nepoužíváte režim unicode)." + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Rozložení klávesnice:" + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +msgid "" +"You can try to have your keyboard layout detected by asking you to press a " +"series of keys. If you do not want to do this, you will be able to select " +"your keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../console-setup.templates:16001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Rozložení klávesnice:" diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/fr.po /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/fr.po --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/fr.po 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/fr.po 2006-09-06 18:13:40.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: console-setup\n" "Report-Msgid-Bugs-To: pkg-kbd-devel@lists.alioth.debian.org\n" -"POT-Creation-Date: 2006-03-19 23:55+0200\n" +"POT-Creation-Date: 2006-09-06 18:13+0100\n" "PO-Revision-Date: 2006-03-28 18:08+0200\n" "Last-Translator: Jean-Luc Coulon (f5ibh) \n" "Language-Team: French \n" @@ -19,13 +19,15 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:9 +#: ../console-setup.templates:1001 msgid "Codeset for your language environment:" msgstr "Jeu de caractres correspondant votre environnement linguistique:" #. Type: select #. Description -#: ../templates:9 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:1001 msgid "" " - Lat15 covers ISO 8859-1, ISO 8859-15 and ISO 8859-9;\n" " - Lat2 covers ISO 8859-2, the Euro sign as well as the\n" @@ -55,25 +57,25 @@ #. Type: select #. Description -#: ../templates:26 +#: ../console-setup.templates:2001 msgid "Keyboard model:" msgstr "Modle du clavier:" #. Type: select #. Description -#: ../templates:32 +#: ../console-setup.templates:3001 msgid "The origin of the keyboard:" msgstr "Origine du clavier:" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "Keyboard layout:" msgstr "Disposition du clavier:" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "" "There are more than one keyboard layouts with the origin you selected. " "Please select the layout matching your keyboard." @@ -83,13 +85,13 @@ #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "Unsupported settings in configuration file" msgstr "Paramtres non grs dans le fichier de configuration" #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "" "The configuration file /etc/default/console-setup specifies keyboard layout " "and variant that are not supported by the configuration program. Because of " @@ -106,13 +108,15 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:55 +#: ../console-setup.templates:6001 msgid "Font for the console:" msgstr "Police de caractres pour la console:" #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "Please choose the font face you would like to use on Linux console." msgstr "" "Veuillez indiquer le type de police que vous dsirez utiliser pour la " @@ -120,7 +124,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" " - VGA is traditionally looking and has medium coverage\n" " of international scripts;\n" @@ -142,7 +148,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" "If you prefer bold version of the Terminus font and you don't use " "framebuffer then choose TerminusBoldVGA. If you use framebuffer then choose " @@ -155,7 +163,15 @@ #. Type: select #. Description -#: ../templates:75 +#. Type: select +#. Description +#: ../console-setup.templates:7001 ../console-setup.templates:8001 +msgid "Font size:" +msgstr "Taille de la police:" + +#. Type: select +#. Description +#: ../console-setup.templates:7001 msgid "" "Please select the size of the font for the Linux console. For a reference - " "the font your computer starts with has size 16." @@ -165,13 +181,7 @@ #. Type: select #. Description -#: ../templates:83 -msgid "Font size:" -msgstr "Taille de la police:" - -#. Type: select -#. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "Please select the size of the font for the Linux console. When the size is " "represented as a plain number then the corresponding font can be used with " @@ -194,7 +204,7 @@ #. Type: select #. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "You can use the height of the fonts in order to figure out the real size of " "the symbols on the console. For a reference - the font your computer starts " @@ -206,19 +216,19 @@ #. Type: select #. Description -#: ../templates:101 +#: ../console-setup.templates:9001 msgid "Encoding on the console:" msgstr "Codage de la console:" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "Virtual consoles in use:" msgstr "Consoles virtuelles utilises:" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "Please enter a space delimited list of virtual consoles you use. The usual " "Unix filename wildcards are allowed (*, ? and [...])." @@ -229,7 +239,7 @@ #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "If you are unsure, then use the default /dev/tty[1-6] which stands for six " "virtual consoles. If you use devfs, then enter /dev/vc/[1-6] instead." @@ -239,79 +249,157 @@ #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:14001 +msgid "Caps Lock" +msgstr "Verrouillage Majuscule" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Alt" +msgstr "Touche Alt de droite" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Right Control" +msgstr "Touche Ctrl de droite" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Right Shift" msgstr "Majuscule de droite" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Logo key" +msgstr "Touche logo de droite" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Menu key" +msgstr "Touche Menu" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Alt+Shift" msgstr "Alt + Majuscule" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Shift" msgstr "Ctrl + Majuscule" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Shift+Caps Lock" msgstr "Majuscule + Verrouillage majuscule" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Alt" msgstr "Ctrl + Alt" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Shift keys together" msgstr "Les deux touches Majuscule ensemble" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Control keys together" msgstr "Les deux touches Ctrl ensemble" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Alt keys together" msgstr "Les deux touches Alt ensemble" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Alt" +msgstr "Touche Alt de gauche" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Left Control" msgstr "Ctrl de gauche" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Left Shift" msgstr "Majuscule de gauche" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Logo key" +msgstr "Touche logo de gauche" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "No toggling" msgstr "Pas de basculement" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Method for toggling between Latin and non-Latin mode:" msgstr "Mthode de basculement entre les modes latin et non latin:" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "Since your keyboard is a non-Latin one, you will need a way to toggle " "between the Latin and the non-Latin mode. Several options are available." @@ -321,7 +409,7 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "The most ergonomic choices seem to be the right Alt and the Caps Lock keys " "(in the later case use the combination Shift+Caps Lock for normal Caps " @@ -339,7 +427,7 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Notice the listed keys are not present on all keyboards." msgstr "" "Veuillez noter que les touches indiques ne font pas partie de tous les " @@ -347,13 +435,21 @@ #. Type: select #. Choices -#: ../templates:132 +#: ../console-setup.templates:12001 msgid "No temporary switch" msgstr "Pas de basculement temporaire" #. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:12001 ../console-setup.templates:13001 +msgid "Both Logo keys" +msgstr "Les deux touches logo" + +#. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "Method for temporarily toggle between Latin and non-Latin input:" msgstr "" "Mthode de basculement temporaire entre les entres de caractres latins et " @@ -361,7 +457,7 @@ #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "Sometimes the keyboard is in non-Latin mode and you want to type only few " "Latin letters. In this case it may be desirable to have a key for temporary " @@ -379,7 +475,7 @@ #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "If you don't like this feature, choose the option \"No temporary switch\"." msgstr "" @@ -388,37 +484,19 @@ #. Type: select #. Choices -#: ../templates:146 +#: ../console-setup.templates:13001 msgid "No AltGr key" msgstr "Pas de touche AltGr" #. Type: select -#. Choices -#: ../templates:146 -msgid "Left Logo key" -msgstr "Touche logo de gauche" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Both Logo keys" -msgstr "Les deux touches logo" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Left Alt" -msgstr "Touche Alt de gauche" - -#. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "AltGr key replacement:" msgstr "Touche de remplacement d'AltGr:" #. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "" "With some of the keyboard layouts, AltGr is a modifier key used to input " "some characters, primarily ones that are unusual for the language of the " @@ -438,49 +516,19 @@ #. Type: select #. Choices -#: ../templates:158 +#: ../console-setup.templates:14001 msgid "No compose key" msgstr "Pas de touche compose" #. Type: select -#. Choices -#: ../templates:158 -msgid "Right Alt" -msgstr "Touche Alt de droite" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Logo key" -msgstr "Touche logo de droite" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Control" -msgstr "Touche Ctrl de droite" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Menu key" -msgstr "Touche Menu" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Caps Lock" -msgstr "Verrouillage Majuscule" - -#. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "Compose key:" msgstr "Touche compose:" #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "The Compose key (known also as Multi_key) is a key which is designated to " "signal the software to interpret the next keystrokes as a combination in " @@ -493,7 +541,7 @@ #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "On the text console the Compose key does not work in Unicode mode. If not in " "Unicode mode, regardless of what you choose here, you can always use also " @@ -503,3 +551,26 @@ "mode Unicode. Si l'on n'est pas en mode Unicode, indpendemment de ce que " "vous avez choisi ici, vous pouvez toujours utiliser la combinaison Alt + " "point comme touche compose." + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Disposition du clavier:" + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +msgid "" +"You can try to have your keyboard layout detected by asking you to press a " +"series of keys. If you do not want to do this, you will be able to select " +"your keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../console-setup.templates:16001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Disposition du clavier:" diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/templates.pot /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/templates.pot --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/templates.pot 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/templates.pot 2006-09-06 18:13:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pkg-kbd-devel@lists.alioth.debian.org\n" -"POT-Creation-Date: 2006-03-19 23:55+0200\n" +"POT-Creation-Date: 2006-09-06 18:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,13 +20,15 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:9 +#: ../console-setup.templates:1001 msgid "Codeset for your language environment:" msgstr "" #. Type: select #. Description -#: ../templates:9 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:1001 msgid "" " - Lat15 covers ISO 8859-1, ISO 8859-15 and ISO 8859-9;\n" " - Lat2 covers ISO 8859-2, the Euro sign as well as the\n" @@ -44,25 +46,25 @@ #. Type: select #. Description -#: ../templates:26 +#: ../console-setup.templates:2001 msgid "Keyboard model:" msgstr "" #. Type: select #. Description -#: ../templates:32 +#: ../console-setup.templates:3001 msgid "The origin of the keyboard:" msgstr "" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "Keyboard layout:" msgstr "" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "" "There are more than one keyboard layouts with the origin you selected. " "Please select the layout matching your keyboard." @@ -70,13 +72,13 @@ #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "Unsupported settings in configuration file" msgstr "" #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "" "The configuration file /etc/default/console-setup specifies keyboard layout " "and variant that are not supported by the configuration program. Because of " @@ -88,19 +90,23 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:55 +#: ../console-setup.templates:6001 msgid "Font for the console:" msgstr "" #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "Please choose the font face you would like to use on Linux console." msgstr "" #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" " - VGA is traditionally looking and has medium coverage\n" " of international scripts;\n" @@ -114,7 +120,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" "If you prefer bold version of the Terminus font and you don't use " "framebuffer then choose TerminusBoldVGA. If you use framebuffer then choose " @@ -123,21 +131,23 @@ #. Type: select #. Description -#: ../templates:75 -msgid "" -"Please select the size of the font for the Linux console. For a reference - " -"the font your computer starts with has size 16." +#. Type: select +#. Description +#: ../console-setup.templates:7001 ../console-setup.templates:8001 +msgid "Font size:" msgstr "" #. Type: select #. Description -#: ../templates:83 -msgid "Font size:" +#: ../console-setup.templates:7001 +msgid "" +"Please select the size of the font for the Linux console. For a reference - " +"the font your computer starts with has size 16." msgstr "" #. Type: select #. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "Please select the size of the font for the Linux console. When the size is " "represented as a plain number then the corresponding font can be used with " @@ -151,7 +161,7 @@ #. Type: select #. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "You can use the height of the fonts in order to figure out the real size of " "the symbols on the console. For a reference - the font your computer starts " @@ -160,19 +170,19 @@ #. Type: select #. Description -#: ../templates:101 +#: ../console-setup.templates:9001 msgid "Encoding on the console:" msgstr "" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "Virtual consoles in use:" msgstr "" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "Please enter a space delimited list of virtual consoles you use. The usual " "Unix filename wildcards are allowed (*, ? and [...])." @@ -180,7 +190,7 @@ #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "If you are unsure, then use the default /dev/tty[1-6] which stands for six " "virtual consoles. If you use devfs, then enter /dev/vc/[1-6] instead." @@ -188,79 +198,157 @@ #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:14001 +msgid "Caps Lock" +msgstr "" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Alt" +msgstr "" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Right Control" +msgstr "" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Right Shift" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Logo key" +msgstr "" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Menu key" +msgstr "" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Alt+Shift" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Shift" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Shift+Caps Lock" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Alt" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Shift keys together" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Control keys together" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Alt keys together" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Alt" +msgstr "" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Left Control" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Left Shift" msgstr "" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Logo key" +msgstr "" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "No toggling" msgstr "" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Method for toggling between Latin and non-Latin mode:" msgstr "" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "Since your keyboard is a non-Latin one, you will need a way to toggle " "between the Latin and the non-Latin mode. Several options are available." @@ -268,7 +356,7 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "The most ergonomic choices seem to be the right Alt and the Caps Lock keys " "(in the later case use the combination Shift+Caps Lock for normal Caps " @@ -279,25 +367,33 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Notice the listed keys are not present on all keyboards." msgstr "" #. Type: select #. Choices -#: ../templates:132 +#: ../console-setup.templates:12001 msgid "No temporary switch" msgstr "" #. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:12001 ../console-setup.templates:13001 +msgid "Both Logo keys" +msgstr "" + +#. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "Method for temporarily toggle between Latin and non-Latin input:" msgstr "" #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "Sometimes the keyboard is in non-Latin mode and you want to type only few " "Latin letters. In this case it may be desirable to have a key for temporary " @@ -309,44 +405,26 @@ #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "If you don't like this feature, choose the option \"No temporary switch\"." msgstr "" #. Type: select #. Choices -#: ../templates:146 +#: ../console-setup.templates:13001 msgid "No AltGr key" msgstr "" #. Type: select -#. Choices -#: ../templates:146 -msgid "Left Logo key" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Both Logo keys" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Left Alt" -msgstr "" - -#. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "AltGr key replacement:" msgstr "" #. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "" "With some of the keyboard layouts, AltGr is a modifier key used to input " "some characters, primarily ones that are unusual for the language of the " @@ -358,49 +436,19 @@ #. Type: select #. Choices -#: ../templates:158 +#: ../console-setup.templates:14001 msgid "No compose key" msgstr "" #. Type: select -#. Choices -#: ../templates:158 -msgid "Right Alt" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Logo key" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Control" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Menu key" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Caps Lock" -msgstr "" - -#. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "Compose key:" msgstr "" #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "The Compose key (known also as Multi_key) is a key which is designated to " "signal the software to interpret the next keystrokes as a combination in " @@ -409,9 +457,30 @@ #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "On the text console the Compose key does not work in Unicode mode. If not in " "Unicode mode, regardless of what you choose here, you can always use also " "the Alt+period combination as a Compose key." msgstr "" + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +msgid "Detect keyboard layout?" +msgstr "" + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +msgid "" +"You can try to have your keyboard layout detected by asking you to press a " +"series of keys. If you do not want to do this, you will be able to select " +"your keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../console-setup.templates:16001 +msgid "Detecting your keyboard layout" +msgstr "" diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/tr.po /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/tr.po --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/po/tr.po 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/po/tr.po 2006-09-06 18:13:40.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: console-setup\n" "Report-Msgid-Bugs-To: pkg-kbd-devel@lists.alioth.debian.org\n" -"POT-Creation-Date: 2006-03-19 23:55+0200\n" +"POT-Creation-Date: 2006-09-06 18:13+0100\n" "PO-Revision-Date: 2006-01-14 16:27+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Debian L10n Turkish \n" @@ -18,14 +18,16 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:9 +#: ../console-setup.templates:1001 #, fuzzy msgid "Codeset for your language environment:" msgstr "Kullandığınız dil için uygun karakter kümesi hangisi?" #. Type: select #. Description -#: ../templates:9 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:1001 #, fuzzy msgid "" " - Lat15 covers ISO 8859-1, ISO 8859-15 and ISO 8859-9;\n" @@ -49,26 +51,26 @@ #. Type: select #. Description -#: ../templates:26 +#: ../console-setup.templates:2001 msgid "Keyboard model:" msgstr "" #. Type: select #. Description -#: ../templates:32 +#: ../console-setup.templates:3001 #, fuzzy msgid "The origin of the keyboard:" msgstr "Klavyenizin modeli nedir?" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 msgid "Keyboard layout:" msgstr "" #. Type: select #. Description -#: ../templates:37 +#: ../console-setup.templates:4001 #, fuzzy msgid "" "There are more than one keyboard layouts with the origin you selected. " @@ -79,13 +81,13 @@ #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "Unsupported settings in configuration file" msgstr "" #. Type: note #. Description -#: ../templates:43 +#: ../console-setup.templates:5001 msgid "" "The configuration file /etc/default/console-setup specifies keyboard layout " "and variant that are not supported by the configuration program. Because of " @@ -101,14 +103,16 @@ #. Description #. The languages with many non-ASCII letters should not use formated #. list. In you decide to use formated list keep the lines relatively short. -#: ../templates:55 +#: ../console-setup.templates:6001 #, fuzzy msgid "Font for the console:" msgstr "Bir uçbirim yazıtipi seçin." #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 #, fuzzy msgid "Please choose the font face you would like to use on Linux console." msgstr "" @@ -117,7 +121,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 #, fuzzy msgid "" " - VGA is traditionally looking and has medium coverage\n" @@ -137,7 +143,9 @@ #. Type: select #. Description -#: ../templates:55 +#. The languages with many non-ASCII letters should not use formated +#. list. In you decide to use formated list keep the lines relatively short. +#: ../console-setup.templates:6001 msgid "" "If you prefer bold version of the Terminus font and you don't use " "framebuffer then choose TerminusBoldVGA. If you use framebuffer then choose " @@ -146,21 +154,23 @@ #. Type: select #. Description -#: ../templates:75 -msgid "" -"Please select the size of the font for the Linux console. For a reference - " -"the font your computer starts with has size 16." +#. Type: select +#. Description +#: ../console-setup.templates:7001 ../console-setup.templates:8001 +msgid "Font size:" msgstr "" #. Type: select #. Description -#: ../templates:83 -msgid "Font size:" +#: ../console-setup.templates:7001 +msgid "" +"Please select the size of the font for the Linux console. For a reference - " +"the font your computer starts with has size 16." msgstr "" #. Type: select #. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "Please select the size of the font for the Linux console. When the size is " "represented as a plain number then the corresponding font can be used with " @@ -174,7 +184,7 @@ #. Type: select #. Description -#: ../templates:83 +#: ../console-setup.templates:8001 msgid "" "You can use the height of the fonts in order to figure out the real size of " "the symbols on the console. For a reference - the font your computer starts " @@ -183,21 +193,21 @@ #. Type: select #. Description -#: ../templates:101 +#: ../console-setup.templates:9001 #, fuzzy msgid "Encoding on the console:" msgstr "Bir uçbirim yazıtipi seçin." #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 #, fuzzy msgid "Virtual consoles in use:" msgstr "Hangi sanal uçbirimleri kullanıyorsunuz?" #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 msgid "" "Please enter a space delimited list of virtual consoles you use. The usual " "Unix filename wildcards are allowed (*, ? and [...])." @@ -208,7 +218,7 @@ #. Type: string #. Description -#: ../templates:106 +#: ../console-setup.templates:10001 #, fuzzy msgid "" "If you are unsure, then use the default /dev/tty[1-6] which stands for six " @@ -220,80 +230,158 @@ #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:14001 +msgid "Caps Lock" +msgstr "Caps Lock (Büyük Harf Kilidi)" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Alt" +msgstr "Sağ Alt" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Right Control" +msgstr "Sağ Control" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Right Shift" msgstr "Sağ Shift" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 ../console-setup.templates:14001 +msgid "Right Logo key" +msgstr "Sağ Logo tuşu" + +#. Type: select +#. Choices +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:13001 +#: ../console-setup.templates:14001 +msgid "Menu key" +msgstr "Menü tuşu" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Alt+Shift" msgstr "Alt+Shift" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Shift" msgstr "Control+Shift" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Shift+Caps Lock" msgstr "Shift+Caps Lock (Büyük Harf Kilidi)" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Control+Alt" msgstr "Control+Alt" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Shift keys together" msgstr "Her iki Shift tuşu birlikte" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Control keys together" msgstr "Her iki Control tuşu birlikte" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Both Alt keys together" msgstr "Her iki Alt tuşu birlikte" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Alt" +msgstr "Sol Alt" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "Left Control" msgstr "Sol Control" #. Type: select #. Choices -#: ../templates:115 +#: ../console-setup.templates:11001 msgid "Left Shift" msgstr "Sol Shift" #. Type: select #. Choices -#: ../templates:115 +#. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:11001 ../console-setup.templates:12001 +#: ../console-setup.templates:13001 +msgid "Left Logo key" +msgstr "Sol Logo tuşu" + +#. Type: select +#. Choices +#: ../console-setup.templates:11001 msgid "No toggling" msgstr "Kip değiştirme yok" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 #, fuzzy msgid "Method for toggling between Latin and non-Latin mode:" msgstr "Latin ve Latin olmayan kipler arasında geçiş" #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "Since your keyboard is a non-Latin one, you will need a way to toggle " "between the Latin and the non-Latin mode. Several options are available." @@ -304,7 +392,7 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "" "The most ergonomic choices seem to be the right Alt and the Caps Lock keys " "(in the later case use the combination Shift+Caps Lock for normal Caps " @@ -321,26 +409,34 @@ #. Type: select #. Description -#: ../templates:117 +#: ../console-setup.templates:11002 msgid "Notice the listed keys are not present on all keyboards." msgstr "" #. Type: select #. Choices -#: ../templates:132 +#: ../console-setup.templates:12001 msgid "No temporary switch" msgstr "Geçici geçiş yok" #. Type: select +#. Choices +#. Type: select +#. Choices +#: ../console-setup.templates:12001 ../console-setup.templates:13001 +msgid "Both Logo keys" +msgstr "Her iki Logo tuşu" + +#. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 #, fuzzy msgid "Method for temporarily toggle between Latin and non-Latin input:" msgstr "Latin ve Latin olmayan kipler arasında geçici geçiş" #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "Sometimes the keyboard is in non-Latin mode and you want to type only few " "Latin letters. In this case it may be desirable to have a key for temporary " @@ -358,44 +454,26 @@ #. Type: select #. Description -#: ../templates:134 +#: ../console-setup.templates:12002 msgid "" "If you don't like this feature, choose the option \"No temporary switch\"." msgstr "Böyle bir özellik istemiyorsanız \"Geçici geçiş yok\"u seçin." #. Type: select #. Choices -#: ../templates:146 +#: ../console-setup.templates:13001 msgid "No AltGr key" msgstr "AltGr tuşu yok" #. Type: select -#. Choices -#: ../templates:146 -msgid "Left Logo key" -msgstr "Sol Logo tuşu" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Both Logo keys" -msgstr "Her iki Logo tuşu" - -#. Type: select -#. Choices -#: ../templates:146 -msgid "Left Alt" -msgstr "Sol Alt" - -#. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 msgid "AltGr key replacement:" msgstr "" #. Type: select #. Description -#: ../templates:148 +#: ../console-setup.templates:13002 #, fuzzy msgid "" "With some of the keyboard layouts, AltGr is a modifier key used to input " @@ -415,50 +493,20 @@ #. Type: select #. Choices -#: ../templates:158 +#: ../console-setup.templates:14001 msgid "No compose key" msgstr "Birleştirme (Compose) tuşu yok" #. Type: select -#. Choices -#: ../templates:158 -msgid "Right Alt" -msgstr "Sağ Alt" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Logo key" -msgstr "Sağ Logo tuşu" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Right Control" -msgstr "Sağ Control" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Menu key" -msgstr "Menü tuşu" - -#. Type: select -#. Choices -#: ../templates:158 -msgid "Caps Lock" -msgstr "Caps Lock (Büyük Harf Kilidi)" - -#. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 #, fuzzy msgid "Compose key:" msgstr "Birleştirme (Compose) tuşu yok" #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 #, fuzzy msgid "" "The Compose key (known also as Multi_key) is a key which is designated to " @@ -471,7 +519,7 @@ #. Type: select #. Description -#: ../templates:160 +#: ../console-setup.templates:14002 msgid "" "On the text console the Compose key does not work in Unicode mode. If not in " "Unicode mode, regardless of what you choose here, you can always use also " @@ -481,6 +529,27 @@ "haricindeki her durumda Alt+nokta bileşimini birleştirme tuşu olarak daima " "kullanabilirsiniz." +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +msgid "Detect keyboard layout?" +msgstr "" + +#. Type: boolean +#. Description +#: ../console-setup.templates:15001 +msgid "" +"You can try to have your keyboard layout detected by asking you to press a " +"series of keys. If you do not want to do this, you will be able to select " +"your keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../console-setup.templates:16001 +msgid "Detecting your keyboard layout" +msgstr "" + #, fuzzy #~ msgid "" #~ "Please select the size of the font for the Linux console. Correspondence " diff -Nru /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/rules /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/rules --- /tmp/TI7Av2SBgh/console-setup-1.7ubuntu2/debian/rules 2006-07-22 21:05:55.000000000 +0100 +++ /tmp/1SUOdEKWw5/console-setup-1.7ubuntu3/debian/rules 2006-09-06 18:07:49.000000000 +0100 @@ -106,9 +106,9 @@ usr/share/console-setup-mini dh_install -pconsole-setup-ataritt-ekmap Keyboard/ataritt.ekmap.gz \ usr/share/console-setup-mini - dh_install -pconsole-setup-macintoshold-ekmap Keyboard/macintosh_old.ekmap.gz \ + dh_install -pconsole-setup-macintoshold-ekmap Keyboard/macintosh_old.ekmap.gz Keyboard/macintosh_old.tree \ usr/share/console-setup-mini - dh_install -pconsole-setup-pc-ekmap Keyboard/pc105.ekmap.gz \ + dh_install -pconsole-setup-pc-ekmap Keyboard/pc105.ekmap.gz Keyboard/pc105.tree \ usr/share/console-setup-mini dh_install -pconsole-setup-sun4-ekmap Keyboard/sun4.ekmap.gz \ usr/share/console-setup-mini