20 files changed, 41 insertions, 9 deletions
diff --git a/ca/appendix/preseed.xml b/ca/appendix/preseed.xml
index 8d5236db2..f79e33068 100644
--- a/ca/appendix/preseed.xml
+++ b/ca/appendix/preseed.xml
@@ -779,6 +779,7 @@ de teclat seleccionada.
 # Selecció del teclat.
 #d-i console-tools/archs select at
 d-i console-keymaps-at/keymap select es
+d-i keyboard-configuration/xkb-keymap select es
 # Exemple per a una arquitectura de teclat diferent
 #d-i console-keymaps-usb/keymap select mac-usb-es
 </screen></informalexample>
diff --git a/cs/appendix/preseed.xml b/cs/appendix/preseed.xml
index c92bf661d..45e1e3229 100644
--- a/cs/appendix/preseed.xml
+++ b/cs/appendix/preseed.xml
@@ -826,6 +826,7 @@ musí být platná v rámci daného typu a &d-i; ji musí znát.
 # Výběr klávesnice.
 #d-i console-tools/archs select at
 d-i console-keymaps-at/keymap select cz-lat2
+d-i keyboard-configuration/xkb-keymap select cz
 # Příklad pro jiný typ klávesnice
 #d-i console-keymaps-usb/keymap select mac-usb-us
 </screen></informalexample>
diff --git a/de/appendix/preseed.xml b/de/appendix/preseed.xml
index c264cf949..a180a9549 100644
--- a/de/appendix/preseed.xml
+++ b/de/appendix/preseed.xml
@@ -825,6 +825,7 @@ nicht voreingestellt werden muss. Die Tastaturbelegung muss dem
 # Auswahl der Tastatur.
 #d-i console-tools/archs select at
 d-i console-keymaps-at/keymap select de
+d-i keyboard-configuration/xkb-keymap select de
 # Beispiel für eine andere Tastaturarchitektur.
 #d-i console-keymaps-usb/keymap select mac-usb-us
 </screen></informalexample>
diff --git a/debian/changelog b/debian/changelog
index d6257e65b..be1536eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-installation-guide (2010xxxx) UNRELEASED; urgency=low
+installation-guide (2011xxxx) UNRELEASED; urgency=low
 
   [ Frans Pop ]
   * List myself as one of the main authors in the administrativa appendix.
@@ -50,6 +50,8 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Enable Spanish and Swedish translations (almost up-to-date).
   * Reword i386 and amd64 arch names to be consistent with the corresponding
     release-notes change: Intel x86 → 32-bit PC, AMD64 → 64-bit PC.
+  * Add keyboard-configuration/xkb-keymap preseed variable.
+    (Closes: Bug#599772)
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index e7ebe7f1c..3ce35af61 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -777,6 +777,7 @@ be known to the &d-i; for the selected keyboard architecture.
 # Keyboard selection.
 #d-i console-tools/archs select at
 d-i console-keymaps-at/keymap select us
+d-i keyboard-configuration/xkb-keymap select us
 # Example for a different keyboard architecture
 #d-i console-keymaps-usb/keymap select mac-usb-us
 </screen></informalexample>
diff --git a/fr/appendix/preseed.xml b/fr/appendix/preseed.xml
index 8b0e02267..76d93726e 100644
--- a/fr/appendix/preseed.xml
+++ b/fr/appendix/preseed.xml
@@ -739,7 +739,8 @@ le préconfigurer. La carte clavier doit être connue par l'installateur debian
 <informalexample role="example"><screen>
 # Choix du clavier.
 #d-i console-tools/archs select at
-d-i console-keymaps-at/keymap select fr
+d-i console-keymaps-at/keymap select fr-latin9
+d-i keyboard-configuration/xkb-keymap select fr(latin9)
 # Une architecture différente
 #d-i console-keymaps-usb/keymap select mac-usb-us
 </screen></informalexample>
diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml
index abc5e8d04..8297cea87 100644
--- a/it/appendix/preseed.xml
+++ b/it/appendix/preseed.xml
@@ -1417,7 +1417,8 @@ essere ritenuta da &d-i; valida per l'architettura della tastiera scelta.
 # Keyboard selection.
 --># Selezione della tastiera.
 #d-i console-tools/archs select at
-d-i console-keymaps-at/keymap select us
+d-i console-keymaps-at/keymap select it
+d-i keyboard-configuration/xkb-keymap select it
 <!--
 # Example for a different keyboard architecture
 --># Esempio con una diversa architettura della tastiera
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 5abb888af..7852323b8 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -765,6 +765,7 @@ be known to the &d-i; for the selected keyboard architecture.
 # Keyboard selection.
 #d-i console-tools/archs select at
 d-i console-keymaps-at/keymap select us
+d-i keyboard-configuration/xkb-keymap select us
 # Example for a different keyboard architecture
 #d-i console-keymaps-usb/keymap select mac-usb-us
 </screen></informalexample>
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 1be3236cc..1137ef0c5 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -1475,12 +1475,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Επιλογή πληκτρολογίου.\n"
 "#d-i console-tools/archs select at\n"
-"d-i console-keymaps-at/keymap select us\n"
+"d-i console-keymaps-at/keymap select gr\n"
+"d-i keyboard-configuration/xkb-keymap select gr\n"
 "# Παράδειγμα για μια διαφορετική αρχιτεκτονική πληκτρολογίου\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/es/preseed.po b/po/es/preseed.po
index 7d979d077..2717e967e 100644
--- a/po/es/preseed.po
+++ b/po/es/preseed.po
@@ -1470,12 +1470,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Selección de teclado\n"
 "#d-i console-tools/archs select at\n"
-"d-i console-keymaps-at/keymap select us\n"
+"d-i console-keymaps-at/keymap select es\n"
+"d-i keyboard-configuration/xkb-keymap select es\n"
 "# Ejemplo de cómo configurar una arquitectura de teclado distinta\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index 381fad147..07511e906 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -1403,12 +1403,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Näppäimistön valinta.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select fi\n"
 "# Esimerkki muusta näppäimistön arkkitehtuurista\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index 656fc40f4..c43fca694 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -1347,12 +1347,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Billentyűzet választás.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select hu\n"
+"d-i keyboard-configuration/xkb-keymap select hu\n"
 "# Példa egy más billentyűzet architektúrára\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-hu"
 
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 7d53297b5..361596e54 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1354,12 +1354,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select jp\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index e8037bd4b..ecc3d5d34 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -1363,12 +1363,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# 키보드 선택.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# 다른 키보드 아키텍처를 사용하는 예제.\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index b888de5d8..2758dc3cf 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -1422,12 +1422,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Selecção de teclado.\n"
 "#d-i console-tools/archs select at\n"
-"d-i console-keymaps-at/keymap select us\n"
+"d-i console-keymaps-at/keymap select pt-latin1\n"
+"d-i keyboard-configuration/xkb-keymap select pt\n"
 "# Exemplo para uma arquitectura de teclado diferente\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index a50e543c5..26cb23706 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -1402,12 +1402,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Выбор клавиатуры.\n"
 "#d-i console-tools/archs select at\n"
-"d-i console-keymaps-at/keymap select us\n"
+"d-i console-keymaps-at/keymap select ru\n"
+"d-i keyboard-configuration/xkb-keymap select ru\n"
 "# Пример другой архитектуры клавиатуры\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 091fb715b..b0aaab9d0 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -1418,12 +1418,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Tangentbordsval.\n"
 "#d-i console-tools/archs select at\n"
-"d-i console-keymaps-at/keymap select se\n"
+"d-i console-keymaps-at/keymap select se-latin1\n"
+"d-i keyboard-configuration/xkb-keymap select se(basic)\n"
 "# Exempel på en annan tangentbordsarkitektur\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index 3ab913ecf..7ef121e6c 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -1405,12 +1405,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Chọn bàn phím.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Thí dụ cho kiến trúc bàn phím khác\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index bd55bfd37..b5d406fee 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1274,12 +1274,14 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
+"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/pt_BR/appendix/preseed.xml b/pt_BR/appendix/preseed.xml
index 5ab696087..8ca341433 100644
--- a/pt_BR/appendix/preseed.xml
+++ b/pt_BR/appendix/preseed.xml
@@ -762,7 +762,8 @@ selecionada.
 <informalexample role="example"><screen>
 # Keyboard selection.
 #d-i console-tools/archs select at
-d-i console-keymaps-at/keymap select us
+d-i console-keymaps-at/keymap select br-latin1
+d-i keyboard-configuration/xkb-keymap select br
 # Example for a different keyboard architecture
 #d-i console-keymaps-usb/keymap select mac-usb-us
 </screen></informalexample>