[Pkg-kbd-commit] r206 - in people/zinoviev/console-setup: Keyboard debian debian/po

[Anton Zinoviev]

Author: zinoviev
Date: 2006-09-16 11:02:31 +0000 (Sat, 16 Sep 2006)
New Revision: 206

Modified:
   people/zinoviev/console-setup/Keyboard/kbdcompiler
   people/zinoviev/console-setup/debian/changelog
   people/zinoviev/console-setup/debian/config.proto
   people/zinoviev/console-setup/debian/console-setup.templates
   people/zinoviev/console-setup/debian/po/POTFILES.in
   people/zinoviev/console-setup/debian/po/bg.po
   people/zinoviev/console-setup/debian/po/cs.po
   people/zinoviev/console-setup/debian/po/fr.po
   people/zinoviev/console-setup/debian/po/templates.pot
   people/zinoviev/console-setup/debian/po/tr.po
Log:
console-setup: fix Debian bugs #386835, #386837, #386838 and #387631


Modified: people/zinoviev/console-setup/Keyboard/kbdcompiler
===================================================================
--- people/zinoviev/console-setup/Keyboard/kbdcompiler	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/Keyboard/kbdcompiler	2006-09-16 11:02:31 UTC (rev 206)
@@ -24,7 +24,7 @@
 }
 
 # Don't forget to update also the list in config.proto
-my $nonlatin = ' am ara ben bd bg bt by cs deva ge gh gr guj guru \
+my $nonlatin = ' am ara ben bd bg bt by deva ge gh gr guj guru \
                  il in ir iku jp kan kh la lao lk mk mm mn mv mal \
                  ori pk ru scc sy syr tel th tj tam ua uz ';
 
@@ -71,18 +71,38 @@
 			    ? "us,$layout"
 			    : $layout));
     if (! -f "$dir/$model-$layout") {
-	execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
-		 ." -model $model -layout $actual_layout"
-		 ." >$dir/$model-$layout")
-	    and die "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout");
+	if ($layout eq 'cs') {
+	    execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
+		     ." -model $model"
+		     ." -layout $actual_layout -variant latin,"
+		     ." >$dir/$model-$layout");
+	} else {
+	    execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
+		     ." -model $model -layout $actual_layout"
+		     ." >$dir/$model-$layout");
+	}
+	die "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout");
     }
     if (-f "$dir/$model-$layout") {
 	read_temp_kmap $layout;
     }
     for my $variant (values %{$KeyboardNames::variants{$layout}}) {
-	my $actual_variant = (($actual_layout =~ /,/)
-			      ? ",$variant"
-			      : $variant);
+	my $actual_variant;
+	if ($actual_layout eq 'cs,cs') {
+	    if ($variant =~ /latin/) {
+		$actual_variant = "$variant,$variant";
+	    } elsif ($variant eq 'yz') {
+		$actual_variant = "latinyz,$variant";
+	    } elsif ($variant eq 'alternatequotes') {
+		$actual_variant = "latinalternatequotes,$variant";
+	    } else {
+		$actual_variant = "latin,$variant";
+	    }
+	} elsif ($actual_layout =~ /,/) {
+	    $actual_variant = ",$variant";
+	} else {
+	    $actual_variant = $variant;
+	}
 	if (! -f "$dir/$model-$layout:$variant") {
 	    execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
 		     ." -model $model"

Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/changelog	2006-09-16 11:02:31 UTC (rev 206)
@@ -3,11 +3,19 @@
   * setupcon: new option --force to skip the 'are we on the console'
     check.  To be used for d-i because there /proc/self/fd/2 points to
     pipe.  Thanks to Tollef Fog Heen.
-  * console-setup.config: Handle C locale with debian-installer/locale not
-    being available.  Thanks to Colin Watson for the bug report and the
-    patch, closes: #386835.
+  * config.proto: Handle C locale with debian-installer/locale not being
+    available.  Thanks to Colin Watson for the bug report and the patch,
+    closes: #386835.
+  * config.proto: Handle properly the case when the user backs up from the
+    first Debconf question.  In the template file change "none" to "this
+    default value is completely ignored".  Thanks to Colin Watson, 
+    closes: #386837.
+  * Handle properly the cs layout in config.proto and kbdcompiler.  Thanks
+    to Colin Watson, closes: #386838.
+  * Supply correct debian/po/POTFILES.in.  Thanks to Thomas Huriaux,
+    closes: #387631.
 
- -- Anton Zinoviev <zinoviev at debian.org>  Fri, 15 Sep 2006 21:12:35 +0300
+ -- Anton Zinoviev <zinoviev at debian.org>  Sat, 16 Sep 2006 12:55:56 +0300
 
 console-setup (1.7) unstable; urgency=low
 

Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/config.proto	2006-09-16 11:02:31 UTC (rev 206)
@@ -1144,12 +1144,6 @@
 	    then
 		variant="$RET"
 		case "$layout" in
-		    # TODO: make s.t. to not forget to update this list
-                    # Don't forget to update also the list in kbdcompiler
-		    am|ara|ben|bd|bg|bt|by|cs|deva|ge|gh|gr|guj|guru|il|in|ir|iku|jp|kan|kh|la|lao|lk|mk|mm|mn|mv|mal|ori|pk|ru|scc|sy|syr|tel|th|tj|tam|ua|uz)
-			latin=no
-			real_layout=us,$layout
-			;;
 		    cs)
 			case "$variant" in
 			    latin*)
@@ -1162,6 +1156,12 @@
 				;;
 			esac
 			;;
+		    # TODO: make s.t. to not forget to update this list
+		    # Don't forget to update also the list in kbdcompiler
+		    am|ara|ben|bd|bg|bt|by|deva|ge|gh|gr|guj|guru|il|in|ir|iku|jp|kan|kh|la|lao|lk|mk|mm|mn|mv|mal|ori|pk|ru|scc|sy|syr|tel|th|tj|tam|ua|uz)
+			latin=no
+			real_layout=us,$layout
+			;;
 		    *)
 			latin=yes
 			real_layout=$layout
@@ -1571,6 +1571,6 @@
     old_state=$starting_state
 done
 
-if [ $STATE -eq 1 ]; then
+if [ $STATE -eq 0 ]; then
     exit 10
 fi

Modified: people/zinoviev/console-setup/debian/console-setup.templates
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.templates	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/console-setup.templates	2006-09-16 11:02:31 UTC (rev 206)
@@ -168,25 +168,25 @@
 
 Template: console-setup/modelcode
 Type: string
-Default: none
+Default: this default value is completely ignored
 Description: for internal use
 
 Template: console-setup/layoutcode
 Type: string
-Default: none
+Default: this default value is completely ignored
 Description: for internal use
 
 Template: console-setup/variantcode
 Type: string
-Default: none
+Default: this default value is completely ignored
 Description: for internal use
 
 Template: console-setup/optionscode
 Type: string
-Default: none
+Default: this default value is completely ignored
 Description: for internal use
 
 Template: console-setup/fontsize
 Type: string
-Default: none
+Default: this default value is completely ignored
 Description: for internal use

Modified: people/zinoviev/console-setup/debian/po/POTFILES.in
===================================================================
--- people/zinoviev/console-setup/debian/po/POTFILES.in	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/po/POTFILES.in	2006-09-16 11:02:31 UTC (rev 206)
@@ -1 +1 @@
-[type: gettext/rfc822deb] templates
+[type: gettext/rfc822deb] console-setup.templates

Modified: people/zinoviev/console-setup/debian/po/bg.po
===================================================================
--- people/zinoviev/console-setup/debian/po/bg.po	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/po/bg.po	2006-09-16 11:02:31 UTC (rev 206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: console-setup\n"
 "Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-19 23:55+0200\n"
+"POT-Creation-Date: 2006-09-16 12:54+0300\n"
 "PO-Revision-Date: 2006-04-05 17:55+0300\n"
 "Last-Translator: Anton Zinoviev <zinoviev at debian.org>\n"
 "Language-Team: BULGARIAN <dict at fsa-bg.org>\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 "

Modified: people/zinoviev/console-setup/debian/po/cs.po
===================================================================
--- people/zinoviev/console-setup/debian/po/cs.po	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/po/cs.po	2006-09-16 11:02:31 UTC (rev 206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: console-setup\n"
 "Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-19 23:55+0200\n"
+"POT-Creation-Date: 2006-09-16 12:54+0300\n"
 "PO-Revision-Date: 2006-04-01 15:42+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\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 "

Modified: people/zinoviev/console-setup/debian/po/fr.po
===================================================================
--- people/zinoviev/console-setup/debian/po/fr.po	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/po/fr.po	2006-09-16 11:02:31 UTC (rev 206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: console-setup\n"
 "Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-19 23:55+0200\n"
+"POT-Creation-Date: 2006-09-16 12:54+0300\n"
 "PO-Revision-Date: 2006-03-28 18:08+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\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 caractères 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 "Modèle 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 "Paramètres non gérés 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 caractères 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 désirez 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 utilisées :"
 
 #. 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 "Méthode 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 indiquées 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 ""
 "Méthode de basculement temporaire entre les entrées de caractères 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 "

Modified: people/zinoviev/console-setup/debian/po/templates.pot
===================================================================
--- people/zinoviev/console-setup/debian/po/templates.pot	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/po/templates.pot	2006-09-16 11:02:31 UTC (rev 206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-19 23:55+0200\n"
+"POT-Creation-Date: 2006-09-16 12:54+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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,7 +457,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 "

Modified: people/zinoviev/console-setup/debian/po/tr.po
===================================================================
--- people/zinoviev/console-setup/debian/po/tr.po	2006-09-15 19:03:03 UTC (rev 205)
+++ people/zinoviev/console-setup/debian/po/tr.po	2006-09-16 11:02:31 UTC (rev 206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: console-setup\n"
 "Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-19 23:55+0200\n"
+"POT-Creation-Date: 2006-09-16 12:54+0300\n"
 "PO-Revision-Date: 2006-01-14 16:27+0200\n"
 "Last-Translator: Recai OktaÅŸ <roktas at debian.org>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\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 "