diff options
| -rw-r--r-- | ca/appendix/preseed.xml | 22 | ||||
| -rw-r--r-- | cs/appendix/preseed.xml | 21 | ||||
| -rw-r--r-- | de/appendix/preseed.xml | 22 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 20 | ||||
| -rw-r--r-- | fr/appendix/preseed.xml | 22 | ||||
| -rw-r--r-- | it/appendix/preseed.xml | 41 | ||||
| -rw-r--r-- | nl/appendix/preseed.xml | 21 | ||||
| -rw-r--r-- | po/el/preseed.po | 42 | ||||
| -rw-r--r-- | po/es/preseed.po | 42 | ||||
| -rw-r--r-- | po/fi/preseed.po | 41 | ||||
| -rw-r--r-- | po/hu/preseed.po | 47 | ||||
| -rw-r--r-- | po/ja/preseed.po | 46 | ||||
| -rw-r--r-- | po/ko/preseed.po | 30 | ||||
| -rw-r--r-- | po/pt/preseed.po | 46 | ||||
| -rw-r--r-- | po/ru/preseed.po | 43 | ||||
| -rw-r--r-- | po/sv/preseed.po | 41 | ||||
| -rw-r--r-- | po/vi/preseed.po | 43 | ||||
| -rw-r--r-- | po/zh_CN/preseed.po | 40 | ||||
| -rw-r--r-- | pt_BR/appendix/preseed.xml | 22 |
20 files changed, 134 insertions, 519 deletions
diff --git a/ca/appendix/preseed.xml b/ca/appendix/preseed.xml index f79e33068..3014799e3 100644 --- a/ca/appendix/preseed.xml +++ b/ca/appendix/preseed.xml @@ -769,37 +769,23 @@ d-i debian-installer/locale string ca_ES </para><para> -La configuració del teclat consisteix en la selecció d'una arquitectura i -un mapa de teclat. En la majoria de casos l'arquitectura de teclat correcta -és seleccionada per defecte, de manera que normalment no cal configurar-la -prèviament. El mapa de teclat ha de ser conegut pel &d-i; per a l'arquitectura -de teclat seleccionada. +La configuració del teclat consisteix en la selecció d'un mapa de teclat. <informalexample role="example"><screen> # 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 +# keymap is an alias for keyboard-configuration/xkb-keymap +d-i keymap select es </screen></informalexample> </para><para> Per a ometre la configuració prèvia del teclat, empreu -<classname>console-tools/archs</classname> amb +<classname>keymap</classname> amb <userinput>skip-config</userinput>. Això farà que romanga actiu el mapa de teclat del nucli. </para> -<note><para> - -Els canvis en l'estrat d'entrada dels nuclis 2.6 han fet pràcticament -obsoleta l'arquitectura de teclat. Per als nuclis 2.6 normalment s'ha de -seleccionar un mapa de teclat <quote>PC</quote> (<userinput>at</userinput>). - -</para></note> </sect2> <sect2 id="preseed-network"> diff --git a/cs/appendix/preseed.xml b/cs/appendix/preseed.xml index b4fc8d4f2..15a2b82bc 100644 --- a/cs/appendix/preseed.xml +++ b/cs/appendix/preseed.xml @@ -820,36 +820,23 @@ platnou zemi. </para><para> Nastavení klávesnice se skládá z výběru typu klávesnice a z výběru -klávesové mapy. Ve většině případů je typ klávesnice rozpoznán -automaticky, takže není potřeba jej přednastavovat. Klávesová mapa -musí být platná v rámci daného typu a &d-i; ji musí znát. +klávesové mapy. <informalexample role="example"><screen> # Výběr klávesnice. -#d-i console-tools/archs select at -# keymap je alias pro console-keymaps-at -d-i 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 +# keymap je alias pro keyboard-configuration/xkb-keymap +d-i keymap select cz </screen></informalexample> </para><para> Nastavení klávesnice můžete přeskočit nastavením proměnné -<classname>console-tools/archs</classname> na hodnotu +<classname>keymap</classname> na hodnotu <userinput>skip-config</userinput>. Tím se zachová výchozí klávesová mapa jádra. </para> -<note><para> - -Změny ve vstupní vrstvě jader 2.6 v podstatě smazaly význam typů -klávesnic, takže by většinou měl stačit typ <quote>PC</quote> -(<userinput>at</userinput>). - -</para></note> </sect2> <sect2 id="preseed-network"> diff --git a/de/appendix/preseed.xml b/de/appendix/preseed.xml index d0b37da34..bb66d8396 100644 --- a/de/appendix/preseed.xml +++ b/de/appendix/preseed.xml @@ -822,39 +822,23 @@ d-i debian-installer/locale string de_DE </para><para> -Die Tastaturkonfiguration besteht aus der Auswahl der Tastaturarchitektur -und der Tastaturbelegung. In den meisten Fällen ist die richtige -Architektur bereits standardmäßig vorgewählt, sodass Sie normalerweise -nicht voreingestellt werden muss. Die Tastaturbelegung muss dem -&d-i; für die ausgewählte Architektur bekannt sein. +Die Tastaturkonfiguration besteht aus der Auswahl der Tastaturbelegung. <informalexample role="example"><screen> # Auswahl der Tastatur. -#d-i console-tools/archs select at -# "keymap" ist ein Alias für console-keymaps-at +# "keymap" ist ein Alias für keyboard-configuration/xkb-keymap d-i 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> </para><para> Um die Konfiguration der Tastatur zu überspringen, stellen Sie -für <classname>console-tools/archs</classname> den Wert +für <classname>keymap</classname> den Wert <userinput>skip-config</userinput> ein. Dies bewirkt, dass die Tastaturbelegung des Kernels weiter verwendet wird. </para> -<note><para> - -Die Änderungen am Input-Layer für 2.6-Kernels haben die -Tastatur-Architektur virtuell überflüssig gemacht. -Für 2.6-Kernels sollte normalerweise eine -<quote>PC</quote>-Tastaturbelegung (<userinput>at</userinput>) gewählt werden. - -</para></note> </sect2> <sect2 id="preseed-network"> diff --git a/debian/changelog b/debian/changelog index d3446203e..8432e93e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low * Use dd of= instead of cat >, to save users who use sudo. Advise to make sure the stick is unmounted. Closes: #660776. * Rename kbd-chooser component to console-setup. + * Fix preseeding for keyboard-configuration. [ Joey Hess ] * Fix typo in example preseed. Closes: #612631 diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 1f153c20a..f02d7be11 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -769,37 +769,23 @@ d-i debian-installer/locale string en_US </para><para> -Keyboard configuration consists of selecting a keyboard architecture and a -keymap. In most cases the correct keyboard architecture is selected by -default, so there's normally no need to preseed it. The keymap must -be known to the &d-i; for the selected keyboard architecture. +Keyboard configuration consists of selecting a keymap. <informalexample role="example"><screen> # Keyboard selection. -#d-i console-tools/archs select at -# keymap is an alias for console-keymaps-at +# keymap is an alias for keyboard-configuration/xkb-keymap d-i 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> </para><para> To skip keyboard configuration, preseed -<classname>console-tools/archs</classname> with +<classname>keymap</classname> with <userinput>skip-config</userinput>. This will result in the kernel keymap remaining active. </para> -<note><para> - -The changes in the input layer for 2.6 kernels have made the keyboard -architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</quote> -(<userinput>at</userinput>) keymap should be selected. - -</para></note> </sect2> <sect2 id="preseed-network"> diff --git a/fr/appendix/preseed.xml b/fr/appendix/preseed.xml index b2ad809bd..487ac4037 100644 --- a/fr/appendix/preseed.xml +++ b/fr/appendix/preseed.xml @@ -732,37 +732,23 @@ d-i debian-installer/locale string en_US </para><para> -La configuration du clavier consiste à déclarer son architecture et la carte clavier. -La plupart du temps le type est correctement détecté et il n'y a pas besoin de -le préconfigurer. La carte clavier doit être connue par l'installateur debian et -être compatible avec le type du clavier. +La configuration du clavier consiste à déclarer la carte clavier. <informalexample role="example"><screen> # Choix du clavier : -#d-i console-tools/archs select at -# keymap est un alias de console-keymaps-at -d-i keymap select fr-latin9 -d-i keyboard-configuration/xkb-keymap select fr(latin9) -# Choix d'une architecture différente : -#d-i console-keymaps-usb/keymap select mac-usb-us +# keymap est un alias de keyboard-configuration/xkb-keymap +d-i keymap select fr(latin9) </screen></informalexample> </para><para> Pour éviter la configuration du clavier, préconfigurez -<classname>console-tools/archs</classname> avec +<classname>keymap</classname> avec <userinput>skip-config</userinput>. La carte clavier du noyau restera active. </para> -<note><para> - -Les modifications apportées à la gestion des entrées par les noyaux 2.6 ont rendu presque -obsolète l'architecture des claviers. Normalement, une carte clavier <quote>PC</quote> -(<userinput>at</userinput>) devrait être sélectionnée. - -</para></note> </sect2> <sect2 id="preseed-network"> diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml index c19c0d6f5..b8072b8ad 100644 --- a/it/appendix/preseed.xml +++ b/it/appendix/preseed.xml @@ -1403,66 +1403,37 @@ d-i debian-installer/locale string it_IT </para><para> <!-- -Keyboard configuration consists of selecting a keyboard architecture and a -keymap. In most cases the correct keyboard architecture is selected by -default, so there's normally no need to preseed it. The keymap must -be known to the &d-i; for the selected keyboard architecture. +Keyboard configuration consists of selecting a keymap. --> -La configurazione della tastiera consiste nella scelta di una architettura -della tastiera e di una mappa di tastiera. Nella maggior parte dei casi -l'architettura della tastiera viene riconosciuta automaticamente e quindi -non è necessario farne la preconfigurazione. La mappa di tastiera deve -essere ritenuta da &d-i; valida per l'architettura della tastiera scelta. +La configurazione della tastiera consiste nella scelta di una mappa di tastiera. <informalexample role="example"><screen> <!-- # Keyboard selection. --># Selezione della tastiera. -#d-i console-tools/archs select at <!-- -# keymap is an alias for console-keymaps-at +# keymap is an alias for keyboard-configuration/xkb-keymap d-i 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 ---># keymap è un alias per console-keymaps-at +--># keymap è un alias per keyboard-configuration/xkb-keymap d-i keymap select it -d-i console-keymaps-at/keymap select it -d-i keyboard-configuration/xkb-keymap select it -# Esempio con una diversa architettura della tastiera -#d-i console-keymaps-usb/keymap select mac-usb-us </screen></informalexample> </para><para> <!-- To skip keyboard configuration, preseed -<classname>console-tools/archs</classname> with +<classname>keymap</classname> with <userinput>skip-config</userinput>. This will result in the kernel keymap remaining active. --> Per saltare la configurazione della tastiera si deve preconfigurare -<classname>console-tools/archs</classname> con +<classname>keymap</classname> con <userinput>skip-config</userinput>. Questo comporta che la mappa di tastiera del kernel rimane attiva. </para> -<note><para> - -<!-- -The changes in the input layer for 2.6 kernels have made the keyboard -architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</quote> -(<userinput>at</userinput>) keymap should be selected. ---> - -I cambiamenti nella gestione dell'input fatti nei kernel 2.6 hanno reso -l'architettura della tastiera virtualmente obsoleta. Normalmente per i -kernel 2.6 si deve selezionare una mappa di tastiera <quote>PC</quote> -(<userinput>at</userinput>). - -</para></note> </sect2> <sect2 id="preseed-network"> diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml index 7852323b8..d54a367da 100644 --- a/nl/appendix/preseed.xml +++ b/nl/appendix/preseed.xml @@ -756,36 +756,23 @@ d-i debian-installer/locale string en_US </para><para> -Keyboard configuration consists of selecting a keyboard architecture and a -keymap. In most cases the correct keyboard architecture is selected by -default, so there's normally no need to preseed it. The keymap must -be known to the &d-i; for the selected keyboard architecture. +Keyboard configuration consists of selecting a keymap. <informalexample role="example"><screen> # 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 +# keymap is an alias for keyboard-configuration/xkb-keymap +d-i keymap select us </screen></informalexample> </para><para> To skip keyboard configuration, preseed -<classname>console-tools/archs</classname> with +<classname>keymap</classname> with <userinput>skip-config</userinput>. This will result in the kernel keymap remaining active. </para> -<note><para> - -The changes in the input layer for 2.6 kernels have made the keyboard -architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</quote> -(<userinput>at</userinput>) keymap should be selected. - -</para></note> </sect2> <sect2 id="preseed-network"> diff --git a/po/el/preseed.po b/po/el/preseed.po index 1137ef0c5..0dd406c58 100644 --- a/po/el/preseed.po +++ b/po/el/preseed.po @@ -1458,60 +1458,36 @@ msgstr "" #, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" "Η ρύθμιση του πληκτρολογίου συνίσταται στην επιλογή μιας αρχιτεκτονικής " -"πληκτρολογίου κι ενός \"χάρτη\" πληκτρολογίου. Στις περισσότερες περιπτώσεις " -"η σωστή αρχιτεκτονική για το πληκτρολόγιο επιλέγεται εξ' ορισμού, οπότε " -"συνήθως δεν υπάρχει ανάγκη να κάνετε μια προρύθμιση γι' αυτό. Ο χάρτης για " -"την αρχιτεκτονική που έχει επιλεγεί θα πρέπει να είναι γνωστός στον &d-i;." +"πληκτρολογίου κι ενός \"χάρτη\" πληκτρολογίου." #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" msgstr "" "# Επιλογή πληκτρολογίου.\n" -"#d-i console-tools/archs select at\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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select gr\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" "Για να παρακάμψετε την ρύθμιση του πληκτρολογίου προρυθμίστε το " -"<classname>console-tools/archs</classname> σαν <userinput>skip-config</" +"<classname>keymap</classname> σαν <userinput>skip-config</" "userinput>. Αυτό θα έχει σαν αποτέλεσμα να παραμείνει ενεργό το keymap του " "πυρήνα." -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"Οι αλλαγές στο \"στρώμα εισόδου\" (input layer) για πυρήνες 2.6 έχουν " -"καταστήσει την αρχιτεκτονική του πληκτρολογίου ουσιαστικά παρωχημένη. Για " -"πυρήνες 2.6 θα πρέπει συνήθως να επιλέξετε ένα keymap τύπου <quote>PC</" -"quote> (<userinput>at</userinput>)." - #. Tag: title #: preseed.xml:758 #, no-c-format diff --git a/po/es/preseed.po b/po/es/preseed.po index 0cd50e317..f678dea07 100644 --- a/po/es/preseed.po +++ b/po/es/preseed.po @@ -1461,62 +1461,34 @@ msgstr "" #: preseed.xml:731 #, no-c-format msgid "" -"Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"Keyboard configuration consists of selecting a keymap." msgstr "" -"La configuración del teclado consiste en la selección de una arquitectura de " -"teclado y un mapa de teclado. En la mayor parte de los casos se selecciona " -"una arquitectura de teclado correcta por omisión y no es necesario " -"preconfigurarla. El mapa de teclado debe ser conocido por el &d-i; para la " -"arquitectura de teclado seleccionada." +"La configuración del teclado consiste en la selección de un mapa de teclado." #. Tag: screen #: preseed.xml:738 #, no-c-format msgid "" "# Keyboard selection.\n" -"#d-i console-tools/archs select at\n" -"# keymap is an alias for console-keymaps-at\n" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" "d-i 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" -"# keymap es el alias de console-keymaps-at\n" +"# keymap es el alias de keyboard-configuration/xkb-keymap\n" "d-i 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" #. Tag: para #: preseed.xml:740 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"Para omitir la configuración del teclado preconfigure <classname>console-" -"tools/archs</classname> con <userinput>skip-config</userinput>. Esto hará " +"Para omitir la configuración del teclado preconfigure <classname>keymap" +"</classname> con <userinput>skip-config</userinput>. Esto hará " "que el mapa de teclado del núcleo permanezca activo." -#. Tag: para -#: preseed.xml:749 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"Los cambios en la capa de entrada para los núcleos 2.6 han hecho que la " -"arquitectura de teclado esté prácticamente obsoleta. En el caso de los " -"núcleos 2.6, se debería seleccionar habitualmente un mapa de teclado " -"<quote>PC</quote> (<userinput>at</userinput>)." - #. Tag: title #: preseed.xml:759 #, no-c-format diff --git a/po/fi/preseed.po b/po/fi/preseed.po index 07511e906..8f5aec010 100644 --- a/po/fi/preseed.po +++ b/po/fi/preseed.po @@ -1387,57 +1387,34 @@ msgstr "" #, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" "Näppämistön asetuksissa valitaan näppäimistön arkkitehtuuri ja asettelu. " -"Useimmissa tapauksissa oikea näppäimistön arkkitehtuuri on oletusarvona, " -"joten se ei tavallisesti tarvitse valmista vastausta. &d-i;:in pitää tuntea " -"näppäinasettelu valitulle näppäimistöarkkitehtuurille." #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select fi\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"Näppäimistön asetukset ohitetaan antamalla kysymykseen <classname>console-" -"tools/archs</classname> valmis vastaus <userinput>skip-config</userinput>. " +"Näppäimistön asetukset ohitetaan antamalla kysymykseen <classname>keymap" +"</classname> valmis vastaus <userinput>skip-config</userinput>. " "Tällöin ytimen näppäinasettelu jää käyttöön." -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"2.6-ytimien syötetason muutoksien seurauksena näppäinarkkitehtuuri on " -"melkein poistunut käytöstä. 2.6-ytimille olisi tavallisesti valittava " -"näppäinasetteluksi <quote>PC</quote> (<userinput>at</userinput>)." - #. Tag: title #: preseed.xml:758 #, no-c-format diff --git a/po/hu/preseed.po b/po/hu/preseed.po index c43fca694..d7189d810 100644 --- a/po/hu/preseed.po +++ b/po/hu/preseed.po @@ -1323,65 +1323,38 @@ msgstr "" #. Tag: para #: preseed.xml:730 -#, fuzzy, no-c-format -#| msgid "" -#| "Keyboard configuration consists of selecting a keyboard architecture and " -#| "a keymap. In most cases the correct keyboard architecture is selected by " -#| "default, so there's normally no need to preseed it. The keymap must be " -#| "valid for the selected keyboard architecture." +#, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" "A billentyűzet beállítás egy billentyűzet architektúra és billentyű-kiosztás " -"választásából áll. Általában alapból a helyes billentyűzet architektúra " -"került kiválasztásra, így nem kell előírni. A kiosztás érvényes kell legyen " -"a választott billentyűzet architektúrára." +"választásából áll." #. Tag: screen #: preseed.xml:737 #, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select hu\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"A billentyűzet beállítás átugrására írd elő ezt: <classname>console-tools/" -"archs</classname> így: <userinput>skip-config</userinput>. Így a kernel " +"A billentyűzet beállítás átugrására írd elő ezt: <classname>keymap" +"</classname> így: <userinput>skip-config</userinput>. Így a kernel " "billentyű-kiosztás marad aktív." -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"A 2.6 kernel beviteli rétege módosításai a billentyűzet architektúrát " -"virtuálisan elavulttá teszik. 2.6 kernelekhez alapban egy <quote>PC</quote> " -"(<userinput>at</userinput>) billentyű-kiosztás választandó." - #. Tag: title #: preseed.xml:758 #, no-c-format diff --git a/po/ja/preseed.po b/po/ja/preseed.po index ade460c3d..15fd12400 100644 --- a/po/ja/preseed.po +++ b/po/ja/preseed.po @@ -1355,65 +1355,35 @@ msgstr "" #, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" "キーボード設定は、キーボードアーキテクチャとキーマップを選択することから成っ" -"ています。ほとんどの場合、正しいキーボードアーキテクチャはデフォルトで選択さ" -"れています。そのため、通常 preseed する必要はありません。キーマップは選択した" -"キーボードアーキテクチャ向けに、&d-i; で有効でなくてはなりません。" +"ています。" #. Tag: screen #: preseed.xml:738 -#, no-c-format -#| msgid "" -#| "# Keyboard selection.\n" -#| "#d-i console-tools/archs select at\n" -#| "d-i console-keymaps-at/keymap select us\n" -#| "# Example for a different keyboard architecture\n" -#| "#d-i console-keymaps-usb/keymap select mac-usb-us" +#, fuzzy, no-c-format msgid "" "# Keyboard selection.\n" -"#d-i console-tools/archs select at\n" -"# keymap is an alias for console-keymaps-at\n" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" "d-i 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" -"# keymap is an alias for console-keymaps-at\n" -"d-i 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select jp\n" #. Tag: para #: preseed.xml:740 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"キーボード設定をスキップするには、<classname>console-tools/archs</classname> " +"キーボード設定をスキップするには、<classname>keymap</classname> " "を <userinput>skip-config</userinput> と preseed してください。これにより、" "カーネルのキーマップが有効になったままとなります。" -#. Tag: para -#: preseed.xml:749 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"カーネル 2.6 では入力レイヤが変更され、キーボードアーキテクチャは事実上時代遅" -"れです。カーネル 2.6 では通常、<quote>PC</quote> (<userinput>at</userinput>) " -"キーマップが既に選択されています。" - #. Tag: title #: preseed.xml:759 #, no-c-format diff --git a/po/ko/preseed.po b/po/ko/preseed.po index 47a858a6e..dce3e8b0c 100644 --- a/po/ko/preseed.po +++ b/po/ko/preseed.po @@ -856,38 +856,26 @@ msgstr "" #. Tag: para #: preseed.xml:730 #, no-c-format -msgid "Keyboard configuration consists of selecting a keyboard architecture and a keymap. In most cases the correct keyboard architecture is selected by default, so there's normally no need to preseed it. The keymap must be known to the &d-i; for the selected keyboard architecture." -msgstr "키보드 설정은 키보드 아키텍처와 키맵을 선택하는 일입니다. 대부분 기본값으로 키보드 아키텍처가 올바르게 선택되어 있으므로, 보통 미리 설정할 필요가 없습니다. 선택한 키보드 아키텍처에 대해 &d-i;에 들어 있는 키맵을 지정해야 합니다." +msgid "Keyboard configuration consists of selecting a keyboard architecture and a keymap." +msgstr "키보드 설정은 키보드 아키텍처와 키맵을 선택하는 일입니다." #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select kr\n" #. Tag: para #: preseed.xml:739 #, no-c-format -msgid "To skip keyboard configuration, preseed <classname>console-tools/archs</classname> with <userinput>skip-config</userinput>. This will result in the kernel keymap remaining active." -msgstr "키보드 설정을 건너뛰려면 <classname>console-tools/archs</classname> 값을 <userinput>skip-config</userinput>로 하면 됩니다. 그러면 커널 키맵을 사용합니다." - -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "The changes in the input layer for 2.6 kernels have made the keyboard architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "2.6 커널의 입력 레이어때문에 키보드 아키텍처는 사실상 필요없게 되었습니다. 2.6 커널의 경우 <quote>PC</quote> (<userinput>at</userinput>) 키맵을 선택해야 합니다." +msgid "To skip keyboard configuration, preseed <classname>keymap</classname> with <userinput>skip-config</userinput>. This will result in the kernel keymap remaining active." +msgstr "키보드 설정을 건너뛰려면 <classname>keymap</classname> 값을 <userinput>skip-config</userinput>로 하면 됩니다. 그러면 커널 키맵을 사용합니다." #. Tag: title #: preseed.xml:758 diff --git a/po/pt/preseed.po b/po/pt/preseed.po index 829c504f4..37251f3c7 100644 --- a/po/pt/preseed.po +++ b/po/pt/preseed.po @@ -1406,60 +1406,34 @@ msgstr "" #: preseed.xml:730 #, no-c-format msgid "" -"Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"Keyboard configuration consists of selecting a keymap." msgstr "" -"A configuração do teclado consiste na selecção da arquitectura de teclado e " -"um keymap. Na maioria dos casos a arquitectura de teclado correcta é a que é " -"escolhida por omissão, por isso não é necessário fazer o preseed disso. O " -"keymap tem de ser conhecido pelo &d-i; para a arquitectura de teclado " -"escolhida." +"A configuração do teclado consiste na selecção da um keymap." #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" msgstr "" "# Selecção de teclado.\n" -"#d-i console-tools/archs select at\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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select pt\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"Para saltar a configuração do teclado, faça preseed a <classname>console-" -"tools/archs</classname> com <userinput>skip-config</userinput>. Isto irá " +"Para saltar a configuração do teclado, faça preseed a <classname>keymap" +"</classname> com <userinput>skip-config</userinput>. Isto irá " "resultar em que o keymap do kernel continue activo." -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"As alterações na camada de entrada para os kernels 2.6 tornaram a " -"arquitectura do teclado virtualmente obsoletos. Para os kernels 2.6 " -"normalmente deve ser seleccionado um keymap <quote>PC</quote> " -"(<userinput>at</userinput>)" - #. Tag: title #: preseed.xml:758 #, no-c-format diff --git a/po/ru/preseed.po b/po/ru/preseed.po index 9ea7ea3a5..21d419ccd 100644 --- a/po/ru/preseed.po +++ b/po/ru/preseed.po @@ -1388,57 +1388,34 @@ msgstr "" #, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" -"При настройке клавиатуры выбирается архитектура клавиатуры и раскладка. В " -"большинстве случаев правильная архитектура клавиатуры уже выбрана по " -"умолчанию, поэтому обычно не нужно задавать автоматический ответ. Раскладка " -"клавиатуры должна быть известна &d-i; для выбранной архитектуры клавиатуры." +"При настройке клавиатуры выбирается архитектура клавиатуры и раскладка." #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" msgstr "" "# Выбор клавиатуры.\n" -"#d-i console-tools/archs select at\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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select ru\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"Чтобы не выполнять настройку клавиатуры укажите в <classname>console-tools/" -"archs</classname> значение <userinput>skip-config</userinput>. В результате " +"Чтобы не выполнять настройку клавиатуры укажите в <classname>keymap" +"</classname> значение <userinput>skip-config</userinput>. В результате " "останется активной клавиатурная раскладка ядра." -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"Изменения в уровне ввода в ядрах версии 2.6 сделали архитектуру клавиатуры " -"виртуально ненужной. Для ядер версии 2.6 обычно нужно выбирать клавиатурную " -"раскладку <quote>PC</quote> (<userinput>at</userinput>)." - #. Tag: title #: preseed.xml:758 #, no-c-format diff --git a/po/sv/preseed.po b/po/sv/preseed.po index b0aaab9d0..87556a8d1 100644 --- a/po/sv/preseed.po +++ b/po/sv/preseed.po @@ -1401,59 +1401,36 @@ msgstr "" #, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" "Tangentbordskonfiguration består av val av tangentbordsarkitektur och en " -"tangentlayout. I de flesta fall är den korrekta tangentbordsarkitekturen " -"vald som standard, så den behöver man normalt sett inte förinställa. " -"Tangentlayouten måste vara känd för &d-i; för den valda " -"tangentbordsarkitekturen." +"tangentlayout." #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" msgstr "" "# Tangentbordsval.\n" -"#d-i console-tools/archs select at\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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select se\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" "För att hoppa över konfiguration av tangentbordet kan du förinställa " -"<classname>console-tools/archs</classname> med <userinput>skip-config</" +"<classname>keymap</classname> med <userinput>skip-config</" "userinput>. Det här kommer att resultera i att kärnans tangentlayout " "fortsätter vara aktiv." -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"Ändringarna i inmatningslagret för 2.6-kärnor har gjort att " -"tangentbordsarkitekturen nästa föråldrad. För 2.6-kärnor bör normalt sett " -"tangentlayouten <quote>PC</quote> (<userinput>at</userinput>) väljas." - #. Tag: title #: preseed.xml:758 #, no-c-format diff --git a/po/vi/preseed.po b/po/vi/preseed.po index 7ef121e6c..37e190b1f 100644 --- a/po/vi/preseed.po +++ b/po/vi/preseed.po @@ -1388,58 +1388,35 @@ msgstr "" #, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" "Tiến trình cấu hình bàn phím là bao gồm việc chọn kiến trúc bàn phím (phần " -"cứng) và bố trí bàn phím (phần mềm). Trong phần lớn trường hợp, kiến trúc " -"bàn phím đúng được chọn theo mặc định, vì vậy bình thường không cần chèn " -"trước nó. Bố trí bàn phím phải được &d-i; nhận ra đối với kiến trúc bàn phím " -"đã chọn." +"cứng) và bố trí bàn phím (phần mềm)." #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select vn\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"Để bỏ qua bước cấu hình bàn phím, hãy chèn sẵn <classname>console-tools/" -"archs</classname> bằng <userinput>skip-config</userinput> (bỏ qua cấu hình). " +"Để bỏ qua bước cấu hình bàn phím, hãy chèn sẵn <classname>keymap" +"</classname> bằng <userinput>skip-config</userinput> (bỏ qua cấu hình). " "Kết quả là bố trí bàn phím của hạt nhân còn lại hoạt động." -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"Các thay đổi trong lớp nhập cho hạt nhân phiên bản 2.6 đã làm cho kiến trúc " -"bàn phím hầu như quá cũ. Đối với hạt nhân 2.6, bình thường nên chọn bố trí " -"bàn phím kiểu <quote>PC</quote> (<userinput>at</userinput>)." - #. Tag: title #: preseed.xml:758 #, no-c-format diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po index 7cbfb28ec..97228fefe 100644 --- a/po/zh_CN/preseed.po +++ b/po/zh_CN/preseed.po @@ -1260,52 +1260,32 @@ msgstr "" #, no-c-format msgid "" "Keyboard configuration consists of selecting a keyboard architecture and a " -"keymap. In most cases the correct keyboard architecture is selected by " -"default, so there's normally no need to preseed it. The keymap must be known " -"to the &d-i; for the selected keyboard architecture." +"keymap." msgstr "" -"键盘设置由键盘体系和 keymap 组成。大多数情况下，默认可以选择正确的键盘体系，" -"因此通常不必预置。keymap 必须对 &d-i; 所选择的键盘体系有效。" +"键盘设置由键盘体系和 keymap 组成。" #. Tag: screen #: preseed.xml:737 -#, no-c-format +#, fuzzy, no-c-format 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select us\n" 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" +"# keymap is an alias for keyboard-configuration/xkb-keymap\n" +"d-i keymap select cn\n" #. Tag: para #: preseed.xml:739 #, no-c-format msgid "" -"To skip keyboard configuration, preseed <classname>console-tools/archs</" +"To skip keyboard configuration, preseed <classname>keymap</" "classname> with <userinput>skip-config</userinput>. This will result in the " "kernel keymap remaining active." msgstr "" -"使用 <userinput>skip-config</userinput> 可以跳过键盘预置 <classname>console-" -"tools/archs</classname>。这将导致内核 keymap 保持活动。" - -#. Tag: para -#: preseed.xml:748 -#, no-c-format -msgid "" -"The changes in the input layer for 2.6 kernels have made the keyboard " -"architecture virtually obsolete. For 2.6 kernels normally a <quote>PC</" -"quote> (<userinput>at</userinput>) keymap should be selected." -msgstr "" -"2.6 内核的输入层的变更实际上让键盘体系已经作废。对于 2.6 内核，通常应该选择 " -"<quote>PC</quote> (<userinput>at</userinput>) keymap。" +"使用 <userinput>skip-config</userinput> 可以跳过键盘预置 <classname>keymap" +"</classname>。这将导致内核 keymap 保持活动。" #. Tag: title #: preseed.xml:758 diff --git a/pt_BR/appendix/preseed.xml b/pt_BR/appendix/preseed.xml index 8ca341433..eaee6e8fc 100644 --- a/pt_BR/appendix/preseed.xml +++ b/pt_BR/appendix/preseed.xml @@ -753,37 +753,23 @@ d-i debian-installer/locale string pt_BR </para><para> -A configuração de teclado consiste na seleção da arquitetura do teclado e do -mapa de teclas. Na maioria dos casos a arquitetura de teclado correta é -selecionada por padrão, então normalmente não é necessário pré-configurar. O -mapa de teclas deve ser conhecido pelo &d-i; para a arquitetura de teclado -selecionada. +A configuração de teclado consiste na seleção do mapa de teclas. <informalexample role="example"><screen> # Keyboard selection. -#d-i console-tools/archs select at -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 +# keymap is an alias for keyboard-configuration/xkb-keymap +d-i keymap select br </screen></informalexample> </para><para> Para pular a pré-configuração de teclado, pré-configure -<classname>console-tools/archs</classname> com +<classname>keymap</classname> com <userinput>skip-config</userinput>. Isto resultará em manter ativo o mapa de teclas do kernel </para> -<note><para> - -As mudanças na camada de entrada para os kernels 2.6 tornaram a arquitetura -de teclado virtualmente obsoleta. Para os kernels 2.6 normalmente o mapa de -teclas <quote>PC</quote> (<userinput>at</userinput>) pode ser selecionado. - -</para></note> </sect2> <sect2 id="preseed-network"> |