129 files changed, 20224 insertions, 22018 deletions

diff --git a/po/el/administrivia.po b/po/el/administrivia.po
index 988205ba0..a59ba5058 100644
--- a/po/el/administrivia.po
+++ b/po/el/administrivia.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: administrivia\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2006-12-28 13:41+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <en@li.org>\n"
@@ -33,10 +33,15 @@ msgstr "Σχετικά με αυτό το κείμενο"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This manual was created for Sarge's debian-installer, based on the Woody "
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -216,7 +221,7 @@ msgstr ""
 #| "Kuře has documented a lot of the new functionality in Sarge's debian-"
 #| "installer."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/el/bookinfo.po b/po/el/bookinfo.po
index 01645b493..1a0c6d5dd 100644
--- a/po/el/bookinfo.po
+++ b/po/el/bookinfo.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-01-12 09:16+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <en@li.org>\n"
@@ -42,21 +42,33 @@ msgstr ""
 "Το κείμενο αυτό περιέχει οδηγίες για το σύστημα &debian-gnu; &release; για "
 "την αρχιτεκτονική  &arch-title; (<quote>&architecture;</quote>). Περιέχει "
 "επίσης δείκτες σε επιπλέον πληροφορίες και πληροφορία σχετικά με το πώς να  "
-"αξιοποιήσετε κατά τον καλύτερο δυνατό τρόπο το καινούριο σας σύστημα &debian;."
+"αξιοποιήσετε κατά τον καλύτερο δυνατό τρόπο το καινούριο σας σύστημα "
+"&debian;."
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Αυτός ο οδηγός εγκατάστασης βασίζεται σε ένα προγενέστερο που γράφτηκε για "
 "το παλιό σύστημα εγκατάστασης του Debian (τις <quote>δισκέττες εκκίνησης</"
diff --git a/po/el/hardware.po b/po/el/hardware.po
index d63308db0..d006928f9 100644
--- a/po/el/hardware.po
+++ b/po/el/hardware.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-01-16 16:33+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -68,10 +68,10 @@ msgstr ""
 "πυρήνας του Linux και τα εργαλεία του GNU. Κατά συνέπεια οποιαδήποτε "
 "αρχιτεκτονική ή πλατφόρμα στην οποία έχουν υλοποιηθεί ο πυρήνας του Linux, η "
 "libc, ο <command>gcc</command> κλπ. και για την οποία υπάρχει μια υλοποίηση "
-"του &debian; μπορεί να τρέξει το &debian;. Παρακαλούμε, δείτε τις σελίδες των "
-"υλοποιήσεων (Ports) στο <ulink url=\"&url-ports;\"></ulink> για περισσότερες "
-"λεπτομέρειες για συστήματα της αρχιτεκτονικής &arch-title; που έχουν "
-"δοκιμαστεί με το &debian-gnu;."
+"του &debian; μπορεί να τρέξει το &debian;. Παρακαλούμε, δείτε τις σελίδες "
+"των υλοποιήσεων (Ports) στο <ulink url=\"&url-ports;\"></ulink> για "
+"περισσότερες λεπτομέρειες για συστήματα της αρχιτεκτονικής &arch-title; που "
+"έχουν δοκιμαστεί με το &debian-gnu;."
 
 #. Tag: para
 #: hardware.xml:32
@@ -588,8 +588,8 @@ msgid ""
 msgstr ""
 "Κάθε ξεχωριστή αρχιτεκτονική ARM απαιτεί τον δικό της πυρήνα. Εξαιτίας αυτού "
 "η  διανομή του &debian; υποστηρίζει εγκατάσταση σε έναν αριθμό των πιο "
-"συνηθισμένων συστημάτων. Όμως η &debian; userland μπορεί να χρησιμοποιηθεί από "
-"<emphasis>οποιονδήποτε</emphasis> επεξεργαστή ARM περιλαμβανομένου του "
+"συνηθισμένων συστημάτων. Όμως η &debian; userland μπορεί να χρησιμοποιηθεί "
+"από <emphasis>οποιονδήποτε</emphasis> επεξεργαστή ARM περιλαμβανομένου του "
 "xscale."
 
 #. Tag: para
@@ -602,8 +602,8 @@ msgid ""
 msgstr ""
 "Οι περισσότεροι επεξεργαστές ARM μπορούν να τρέξουν και στις δυο καταστάσεις "
 "endian (big ή little). Παρ' όλα αυτά η πλειοψηφία των υπαρχόντων υλοποιήσεων "
-"χρησιμοποιούν την κατάσταση little-endian. Το &debian; υποστηρίζει για την ώρα "
-"μόνο συστήματα little-endian ΑRM."
+"χρησιμοποιούν την κατάσταση little-endian. Το &debian; υποστηρίζει για την "
+"ώρα μόνο συστήματα little-endian ΑRM."
 
 #. Tag: para
 #: hardware.xml:294
@@ -629,9 +629,9 @@ msgid ""
 "IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
 msgstr ""
 "Η γραμμή προϊόντων I/O Processor (IOP) της Intel απαντάται σε έναν αριθμό "
-"προϊόντων που σχετίζονται με αποθήκευση και επεξεργασία δεδομένων. Το &debian; "
-"υποστηρίζει προς το παρόν την πλατφόρμα IOP32x, που περιλαμβάνει τους "
-"επεξεργαστές IOP 80219 και 32x οι οποίοι απαντώνται σε συσκευές Network "
+"προϊόντων που σχετίζονται με αποθήκευση και επεξεργασία δεδομένων. Το "
+"&debian; υποστηρίζει προς το παρόν την πλατφόρμα IOP32x, που περιλαμβάνει "
+"τους επεξεργαστές IOP 80219 και 32x οι οποίοι απαντώνται σε συσκευές Network "
 "Attached Storage (NAS). To &debian; υποστηρίζει συγκεκριμένα δύο τέτοιες "
 "συσκευές: την <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> από "
 "την IO-Data και την <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</"
@@ -790,18 +790,18 @@ msgid ""
 "not be easily used by most &debian; packages; now they can. </para> </"
 "footnote>."
 msgstr ""
-"Όμως το &debian; GNU/Linux &releasename; <emphasis>δεν</emphasis> θα τρέξει σε "
-"επεξεργαστές 386 ή προγενέστερους. Παρά το όνομα της αρχιτεκτονικής "
+"Όμως το &debian; GNU/Linux &releasename; <emphasis>δεν</emphasis> θα τρέξει "
+"σε επεξεργαστές 386 ή προγενέστερους. Παρά το όνομα της αρχιτεκτονικής "
 "\"i386\", η υποστήριξη για πραγματικούς επεξεργαστές 80386 (και τους κλώνους "
 "τους) εγκαταλείφθηκε ήδη με την έκδοση Sarge του &debian; (r3.1)<footnote> "
 "<para> Είχαμε προσπαθήσει για πολύ καιρό να το αποφύγουμε αυτό, αλλά τελικά "
 "ήταν κάτι αναγκαίο εξαιτίας μιας σειράς ατυχών προβλημάτων με τον "
 "μεταγλωττιστή και τον πυρήνα, ξεκινώντας από ένα σφάλμα στην C++ ABI που "
-"παρέχει ο GCC. Μπορείτε ακόμα να τρέξετε το &debian; GNU/Linux σε πραγματικούς "
-"επεξεργαστές 80386 αν φτιάξετε τον δικό σας πυρήνα και χτίσετε όλα τα πακέτα "
-"από τον πηγαίο κώδικα, αλλά κάτι τέτοιο ξεφεύγει από τον σκοπό αυτού του "
-"εγχειριδίου.</para> </footnote>.(Καμμιά έκδοση του Linux δεν είχε ποτέ "
-"υποστηρίξει επεξεργαστές 286 ή προγενέσετερους στην σειρά). Όλοι οι "
+"παρέχει ο GCC. Μπορείτε ακόμα να τρέξετε το &debian; GNU/Linux σε "
+"πραγματικούς επεξεργαστές 80386 αν φτιάξετε τον δικό σας πυρήνα και χτίσετε "
+"όλα τα πακέτα από τον πηγαίο κώδικα, αλλά κάτι τέτοιο ξεφεύγει από τον σκοπό "
+"αυτού του εγχειριδίου.</para> </footnote>.(Καμμιά έκδοση του Linux δεν είχε "
+"ποτέ υποστηρίξει επεξεργαστές 286 ή προγενέσετερους στην σειρά). Όλοι οι "
 "επεξεργαστές i486 και μεταγενέστεροι εξακολουθούν να "
 "υποστηρίζονται<footnote> <para> Aρκετά πακέτα του &debian; θα τρέχουν στην "
 "πραγματικότητα λίγο γρηγορότερα σε σύγχρονους υπολογιστές σαν ένα θετικό "
@@ -837,16 +837,16 @@ msgstr "I/O Bus "
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "Ο δίαυλος του συστήματος (system bus) είναι το μέρος εκείνο της μητρικής που "
 "επιτρέπει την επικοινωνία της ΚΜΕ (CPU) με περιφερειακά όπως συσκευές "
 "αποθήκευσης. Ο υπολογιστής σας θα πρέπει να χρησιμοποιεί έναν από τους "
-"διαύλους ISA, EISA, PCI, PCIe, PCI-X,ή VESA Local Bus (VLB, μερικές φορές γνωστός "
-"και ως δίαυλος VL). Ουσιαστικά όλοι οι προσωπικοί υπολογιστές που πωλούνται "
-"τα τελευταία χρόνια χρησιμοποιούν έναν από αυτούς τους διαύλους."
+"διαύλους ISA, EISA, PCI, PCIe, PCI-X,ή VESA Local Bus (VLB, μερικές φορές "
+"γνωστός και ως δίαυλος VL). Ουσιαστικά όλοι οι προσωπικοί υπολογιστές που "
+"πωλούνται τα τελευταία χρόνια χρησιμοποιούν έναν από αυτούς τους διαύλους."
 
 #. Tag: para
 #: hardware.xml:484
@@ -881,9 +881,9 @@ msgstr ""
 "υποστηριζόμενα μηχανήματα mips/mipsel μπορούν να βρεθούν στη σελίδα <ulink "
 "url=\"&url-linux-mips;\">Linux-MIPS homepage </ulink>. Στη συνέχεια "
 "καλύπτονται μόνο συστήματα που υποστηρίζονται από τον εγκαταστάτη του "
-"&debian;. Αν ενδιαφέρεστε για υποστήριξη άλλων υποαρχιτεκτονικών, παρακαλούμε "
-"επικοινωνήστε με την λίστα αλληλογραφίας <ulink url=\"&url-list-subscribe;"
-"\">debian-&arch-listname; mailing list</ulink>."
+"&debian;. Αν ενδιαφέρεστε για υποστήριξη άλλων υποαρχιτεκτονικών, "
+"παρακαλούμε επικοινωνήστε με την λίστα αλληλογραφίας <ulink url=\"&url-list-"
+"subscribe;\">debian-&arch-listname; mailing list</ulink>."
 
 #. Tag: para
 #: hardware.xml:519
@@ -995,8 +995,8 @@ msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
-"Υπάρχουν δύο γεύσεις του πυρήνα για powerpc στο &debian;, ανάλογα με τον τύπο "
-"της CPU:"
+"Υπάρχουν δύο γεύσεις του πυρήνα για powerpc στο &debian;, ανάλογα με τον "
+"τύπο της CPU:"
 
 #. Tag: term
 #: hardware.xml:625
@@ -1521,8 +1521,8 @@ msgstr ""
 "Συστήματα NuBus δεν υποστηρίζονται αυτή τη στιγμή από το &debian;/powerpc.H "
 "αρχιτεκτονική του μονολιθικού πυρήνα Linux/PPC δεν έχει υποστήριξη για τα "
 "μηχανήματα αυτά, αντίθετα θα πρέπει κανείς να χρησιμοποιήσει τον μικροπυρήνα "
-"MkLinux Mach, τον οποίον δεν υποστηρίζει ακόμα το &debian;. Tα μηχανήματα αυτά "
-"περιλαμβάνουν τα: <itemizedlist> <listitem><para> Power Macintosh 6100, "
+"MkLinux Mach, τον οποίον δεν υποστηρίζει ακόμα το &debian;. Tα μηχανήματα "
+"αυτά περιλαμβάνουν τα: <itemizedlist> <listitem><para> Power Macintosh 6100, "
 "7100, 8100 </para></listitem> <listitem><para> Performa 5200, 6200, 6300 </"
 "para></listitem> <listitem><para> Powerbook 1400, 2300, and 5300 </para></"
 "listitem> <listitem><para> Workgroup Server 6150, 8150, 9150 </para></"
@@ -1593,33 +1593,25 @@ msgstr "Μηχανήματα τύπου S/390 και zSeries"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
-msgstr ""
-"Ολοκληρωμένες πληροφορίες σχετικά με τα υποστηριζόμενα συστήματα S/390 και "
-"zSeries μπορούν να βρεθούν στο Redbook της IBM <ulink url=\"http://www."
-"redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer "
-"zSeries and S/390: Distributions</ulink>στο κεφάλαιο 2.1 ή στο <ulink url="
-"\"http://www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries "
-"page at the developerWorks</ulink>. Σε συντομία, συστήματα G5, Multiprise "
-"3000, G6 και όλα τα zSeries υποστηρίζονται πλήρως; μηχανήματα Multiprise "
-"2000, G3 και G4 υποστηρίζονται με προσομοίωση κινητού σημείου ΙΕΕΕ και "
-"συνεπώς με μειωμένες απόδοση."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
+msgstr ""
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU και Υποστήριξη Μητρικών"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1634,13 +1626,13 @@ msgstr ""
 "κανείς για κάθε μια από αυτές."
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1654,26 +1646,26 @@ msgstr ""
 "en.wikipedia.org/wiki/SPARCstation\">Wikipedia SPARCstation page</ulink>."
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
 "already been discontinued after earlier releases."
 msgstr ""
-"Η τελευταία έκδοση του &debian; που υποστηρίζει τηνα ρχιτεκτονική sparc32 ήταν "
-"η Etch, αλλά και αυτή ακόμα μόνο για συστήματα sun4m. Υποστήριξη για τις "
-"άλλες υποαρχιτεκτονικές 32-μπιτ είχε ήδη σταματήσει από προγενέστερες "
+"Η τελευταία έκδοση του &debian; που υποστηρίζει τηνα ρχιτεκτονική sparc32 "
+"ήταν η Etch, αλλά και αυτή ακόμα μόνο για συστήματα sun4m. Υποστήριξη για "
+"τις άλλες υποαρχιτεκτονικές 32-μπιτ είχε ήδη σταματήσει από προγενέστερες "
 "εκδόσεις."
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term> "
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1693,13 +1685,13 @@ msgstr ""
 "πολυεπεξεργαστικές (SMP) διαμορφώσεις αντίστοιχα."
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term> "
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1714,7 +1706,7 @@ msgstr ""
 "πυρήνα sparc64-smp."
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1725,13 +1717,13 @@ msgstr ""
 "υποστήριξης στον πυρήνα του Linux."
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "Φορητοί υπολογιστές"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1748,13 +1740,13 @@ msgstr ""
 "τις σελίδες <ulink url=\"&url-x86-laptop;\">Linux Laptop pages</ulink>."
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "Πολλαπλοί Επεξεργαστές"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1766,14 +1758,14 @@ msgid ""
 msgstr ""
 "Υποστήριξη πολλαπλών επεξεργαστών &mdash; γνωστή και σαν <quote>συμμετρική "
 "πολυ-επεξεργασία</quote> ή SMP &mdash; είναι διαθέσιμη για την αρχιτεκτονική "
-"αυτή. Ο συνηθισμένος πυρήνας του &debian; &release; έχει χτιστεί με υποστήριξη "
-"SMP. Ο πυρήνας αυτός μπορεί να χρησιμοποιηθεί επίσης και σε μη-"
+"αυτή. Ο συνηθισμένος πυρήνας του &debian; &release; έχει χτιστεί με "
+"υποστήριξη SMP. Ο πυρήνας αυτός μπορεί να χρησιμοποιηθεί επίσης και σε μη-"
 "πολυεπεξεργαστικά συστήματα, αλλά αυτό έχει μια μικρή επιβάρυνση που θα "
 "προκαλέσει μια μικρή μείωση της απόδοσης. Για ένα συνηθισμένο σύστημα όμως "
 "κάτι τέτοιο δύσκολα θα το προσέξετε."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1784,16 +1776,16 @@ msgid ""
 "section;</quote> section of the kernel config.</phrase>"
 msgstr ""
 "Για να βελτιστοποιήσετε τον πυρήνα για συστήματα με ένα επεξεργαστή, θα "
-"πρέπει να αντικαταστήσετε τον προκαθορισμένο πυρήνα του &debian;. <phrase arch="
-"\"linux-any\">Μπορείτε να βρείτε μια συζήτηση του πώς να το κάνετε αυτό στο "
-"<xref linkend=\"kernel-baking\"/>. Προς το παρόν (με την έκδοση του πυρήνα "
-"&kernelversion;) ο τρόπος για να απενεργοποιήσετε την συμμετρική "
+"πρέπει να αντικαταστήσετε τον προκαθορισμένο πυρήνα του &debian;. <phrase "
+"arch=\"linux-any\">Μπορείτε να βρείτε μια συζήτηση του πώς να το κάνετε αυτό "
+"στο <xref linkend=\"kernel-baking\"/>. Προς το παρόν (με την έκδοση του "
+"πυρήνα &kernelversion;) ο τρόπος για να απενεργοποιήσετε την συμμετρική "
 "πολυεπεξεργασία (SMP) είναι αποεπιλέγοντας την<quote>&smp-config-option;</"
 "quote> στην ενότητα <quote>&smp-config-section;</quote> των ρυθμίσεων του "
 "πυρήνα.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1812,17 +1804,17 @@ msgstr ""
 "μονοεπεξεργαστικά συστήματα."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr ""
-"Η ποικιλία 486 των πακέτων του πυρήνα του &debian; για την αρχιτεκτονική &arch-"
-"title; δεν έχουν δημιουργηθεί με υποστήριξη SMP."
+"Η ποικιλία 486 των πακέτων του πυρήνα του &debian; για την αρχιτεκτονική "
+"&arch-title; δεν έχουν δημιουργηθεί με υποστήριξη SMP."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1840,7 +1832,7 @@ msgstr ""
 "πρώτο επεξεργαστή."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -1851,15 +1843,15 @@ msgid ""
 "quote> section of the kernel config.</phrase>"
 msgstr ""
 "Για να αξιοποιήσετε τους επιπλέον επεξεργαστές, θα πρέπει να αντικαταστήσετε "
-"τον προκαθορισμένο πυρήνα του &debian;. <phrase arch=\"linux-any\">Μπορείτε να "
-"βρείτε μια συζήτηση του πώς να το κάνετε αυτό στο <xref linkend=\"kernel-"
+"τον προκαθορισμένο πυρήνα του &debian;. <phrase arch=\"linux-any\">Μπορείτε "
+"να βρείτε μια συζήτηση του πώς να το κάνετε αυτό στο <xref linkend=\"kernel-"
 "baking\"/>. Προς το παρόν (με την έκδοση του πυρήνα &kernelversion;) ο "
 "τρόπος για να ενεργοποιήσετε την συμμετρική πολυεπεξεργασία (SMP) είναι "
 "επιλέγοντας <quote>&smp-config-option;</quote> στην ενότητα <quote>&smp-"
 "config-section;</quote> των ρυθμίσεων του πυρήνα.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1871,15 +1863,15 @@ msgid ""
 msgstr ""
 "Υποστήριξη για πολλούς επεξεργαστές &mdash; γνωστή και σαν <quote>συμμετρική "
 "πολυ-επεξεργασία</quote> ή SMP &mdash; είναι διαθέσιμη για την αρχιτεκτονική "
-"αυτή και υποστηρίζεται από έναν προκατασκευασμένο πυρήνα του &debian;. Ανάλογα "
-"με το μέσο εγκατάστασης που χρησιμοποιείτε, ο πυρήνας με δυνατότητα SMP "
-"μπορεί να εγκατασταθεί ή και να μην εγκατασταθεί αυτόματα. Αυτό δεν "
+"αυτή και υποστηρίζεται από έναν προκατασκευασμένο πυρήνα του &debian;. "
+"Ανάλογα με το μέσο εγκατάστασης που χρησιμοποιείτε, ο πυρήνας με δυνατότητα "
+"SMP μπορεί να εγκατασταθεί ή και να μην εγκατασταθεί αυτόματα. Αυτό δεν "
 "εμποδίζει την εγκατάσταση, αφού ο κανονικός, χωρίς υποστήριξη SMP, πυρήνας "
 "μπορεί να εκκινήσει σε πολυεπεξεργαστικά συστήματα. Απλά ο πυρήνας στην "
 "περίπτωση αυτή θα χρησιμοποιήσει μόνο τον πρώτο επεξεργαστή."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1891,7 +1883,7 @@ msgstr ""
 "διαλέξετε ένα κατάλληλο τέτοιο πακέτο."
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can also build your own customized kernel to support SMP. <phrase "
@@ -1916,20 +1908,27 @@ msgstr ""
 "quote> των ρυθμίσεων του πυρήνα.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "Υποστήριξη Κάρτας Γραφικών"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "Για την τερματική κονσόλα θα πρέπει να χρησιμοποιήσετε ένα interface οθόνης "
 "που να είναι συμβατό-με-VGA. Σχεδόν οποιαδήποτε σύγχρονη οθόνη είναι συμβατή-"
@@ -1939,24 +1938,24 @@ msgstr ""
 "παρόν κείμενο."
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
-"Η υποστήριξη που παρέχει το &debian; για γραφικά περιβάλλοντα καθορίζεται από "
-"την υποκείμενη υποστήριξη που υπάρχει στο σύστημα Χ11 του X.Org. Οι "
+"Η υποστήριξη που παρέχει το &debian; για γραφικά περιβάλλοντα καθορίζεται "
+"από την υποκείμενη υποστήριξη που υπάρχει στο σύστημα Χ11 του X.Org. Οι "
 "περισσότερες κάρτες οθόνης AGP, PCI, PCIe και PCI-X δουλεύουν με το X.Org. "
 "Λεπτομέρειες για τις υποστηριζόμενες κάρτες γραφικών, διαύλους, οθόνες και "
 "ποντίκια μπορούν να βρεθούν στο <ulink url=\"&url-xorg;\"></ulink>. Το "
 "&debian; &release; έρχεται με την έκδοση &x11ver; του XOrg."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr ""
@@ -1964,7 +1963,7 @@ msgstr ""
 "Indy και O2."
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1982,7 +1981,7 @@ msgstr ""
 "γραφικών ATI PGX24/PGX64 (oδηγός ati), και κάρτες PermediaII (οδηγός glint)."
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2012,13 +2011,13 @@ msgstr ""
 "του συστήματος."
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Υλικό Δικτυακής Σύνδεσης"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2035,7 +2034,7 @@ msgstr ""
 "πολλές παλιότερες κάρτες ISA.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2045,61 +2044,61 @@ msgstr ""
 "PCI) και τις ακόλουθες κάρτες δικτύου (NIC) από την Sun:"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE "
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal "
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC "
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet "
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet "
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "H λίστα των υποστηριζόμενων συσκευών δικτύου είναι:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Σύνδεση Channel to Channel (CTC) και ESCON (πραγματική ή εξομοιωμένη)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet και OSA-Express Fast Ethernet (όχι-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express σε κατάσταση QDIO, HiperSockets και Guest-LAN"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2120,19 +2119,19 @@ msgstr ""
 "\"&url-slug-firmware;\">Slug-Firmware site</ulink>."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "Υποστηρίζεται το ISDN, αλλά όχι στη διάρκεια της εγκατάστασης."
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Ασύρματες κάρτες δικτύου"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2151,7 +2150,7 @@ msgstr ""
 "της εγκατάστασης."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2163,7 +2162,7 @@ msgstr ""
 "gnu;, αλλά δεν υποστηρίζονται στη διάρκεια της εγκατάστασης."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2176,7 +2175,7 @@ msgstr ""
 "διαδικασία της εγκατάστασης."
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2196,7 +2195,7 @@ msgstr ""
 "ρυθμίσετε το δίκτυό σας με το χέρι."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2207,22 +2206,23 @@ msgid ""
 "which allows you to use a Windows driver.</phrase>"
 msgstr ""
 "Σε κάποιες περιπτώσεις ο οδηγός που πιθανόν να χρειάζεστε μπορεί να μην "
-"είναι διαθέσιμος σαν πακέτο του &debian;. Θα πρέπει τότε να ψάξετε αν υπάρχει "
-"κάποιος πηγαίος κώδικας διαθέσιμος στο Διαδίκτυο και να δημιουργήσετε/"
-"μεταγλωττίσετε τον οδηγό μόνοι σας. Το πώς μπορείτε να το κάνετε αυτό "
-"ξεφεύγει από τους σκοπούς του παρόντος εχγειριδίου.<phrase arch=\"x86\">Αν "
-"δεν υπάρχει διαθέσιμος οδηγός για το Linux, η τελευταία σας δυνατότητα είναι "
-"να χρησιμοποιήσετε το πακέτο <classname>ndiswrapper</classname> package, που "
-"σας επιτρέπει να χρησιμοποιήσετε έναν οδηγό για Windows.</phrase>"
+"είναι διαθέσιμος σαν πακέτο του &debian;. Θα πρέπει τότε να ψάξετε αν "
+"υπάρχει κάποιος πηγαίος κώδικας διαθέσιμος στο Διαδίκτυο και να "
+"δημιουργήσετε/μεταγλωττίσετε τον οδηγό μόνοι σας. Το πώς μπορείτε να το "
+"κάνετε αυτό ξεφεύγει από τους σκοπούς του παρόντος εχγειριδίου.<phrase arch="
+"\"x86\">Αν δεν υπάρχει διαθέσιμος οδηγός για το Linux, η τελευταία σας "
+"δυνατότητα είναι να χρησιμοποιήσετε το πακέτο <classname>ndiswrapper</"
+"classname> package, που σας επιτρέπει να χρησιμοποιήσετε έναν οδηγό για "
+"Windows.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "Γνωστά προβλήματα για την αρχιτεκτονική &arch-title;"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2232,13 +2232,13 @@ msgstr ""
 "αναφέρουμε εδώ."
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "Συγκρούσεις ανάμεσα σε οδηγούς tulip και dfme"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2257,7 +2257,7 @@ msgstr ""
 "ίσως να μην δουλέψει ή να λειτουργήσει ελαττωματικά."
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2272,7 +2272,7 @@ msgstr ""
 "οδηγό όπως περιγράφεται στην ενότητα <xref linkend=\"module-blacklist\"/>."
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2292,13 +2292,13 @@ msgstr ""
 "μετά την επανεκκίνηση του συστήματος."
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2308,13 +2308,13 @@ msgstr ""
 "B100 blade."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "Οθόνες Braille"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2334,13 +2334,13 @@ msgstr ""
 "classname>."
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "Σύνθεση Ομιλίας με Hardware"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2363,13 +2363,13 @@ msgstr ""
 "<classname>speakup</classname>."
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Περιφερειακά και άλλο Υλικό"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2382,7 +2382,7 @@ msgstr ""
 "εγκατάσταση του συστήματος."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2393,7 +2393,7 @@ msgstr ""
 "\"hardware-issues\"/>)."
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2405,7 +2405,7 @@ msgstr ""
 "σας υποστηρίζεται από το Linux."
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2417,7 +2417,7 @@ msgstr ""
 "διαθέσιμα σε DASD ή από το δίκτυο με χρήση NFS, HTTP ή FTP."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2427,13 +2427,13 @@ msgstr ""
 "έχει μια υποδοχή PCI."
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "Συσκευές που απαιτούν firmware"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2451,7 +2451,7 @@ msgstr ""
 "ακόμα και κάποιοι ελεγκτές σκληρών δίσκων απαιτούν επίσης firmware."
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2470,7 +2470,7 @@ msgstr ""
 "αρχειοθήκης."
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2488,13 +2488,13 @@ msgstr ""
 "την φόρτωση αρχείων ή πακέτων firmware στη διάρκεια της εγκατάστασης."
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "Αγοράζοντας υλικό ειδικά για το GNU/&arch-kernel;"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2510,7 +2510,7 @@ msgstr ""
 "είναι καλά υποστηριζόμενο από το GNU/Linux."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2526,7 +2526,7 @@ msgstr ""
 "ίσως σας δώσει χρήσιμες πληροφορίες που να σας βοηθήσουν σ' αυτό."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2544,13 +2544,13 @@ msgstr ""
 "προμηθευτές που είναι φιλικοί προς το &arch-kernel;."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Αποφύγετε κλειστό ή Proprietary υλικό"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2564,7 +2564,7 @@ msgstr ""
 "που δεν θα μας επέτρεπε να διανείμουμε τον πηγαίο κώδικα σε &arch-kernel;."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2580,13 +2580,13 @@ msgstr ""
 "κοινότητα του ελεύθερου λογισμικού είναι μια σημαντική αγορά."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Υλικό ειδικά για Windows"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2613,7 +2613,7 @@ msgstr ""
 "από ισοδύναμες συσκευές που διατηρούν την ενσωματωμένη ευφυΐα τους."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2655,7 +2655,7 @@ msgstr ""
 "ισχύ του υλικού τους."
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can help improve this situation by encouraging these manufacturers to "
@@ -2679,13 +2679,13 @@ msgstr ""
 "Hardware Compatibility HOWTO</ulink>."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "Μέσα Εγκατάστασης"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2696,8 +2696,8 @@ msgid ""
 "to this page once you reach that section."
 msgstr ""
 "Η ενότητα αυτή θα σας βοηθήσει να προσδιορίσετε τα διαφορετικά μέσα που "
-"μπορείτε να χρησιμοποιήσετε για να εγκαταστήσετε το &debian;. Για παράδειγμα, "
-"αν έχετε μια συσκευή δισκέττας στο μηχάνημά σας, μπορείτε να την "
+"μπορείτε να χρησιμοποιήσετε για να εγκαταστήσετε το &debian;. Για "
+"παράδειγμα, αν έχετε μια συσκευή δισκέττας στο μηχάνημά σας, μπορείτε να την "
 "χρησιμοποιήσετε για να εγκαταστήσετε το &debian;. Υπάρχει ένα ολόκληρο "
 "κεφάλαιο αφιερωμένο στα διάφορα μέσα εγκατάστασης <xref linkend=\"install-"
 "methods\"/>, που παραθέτει τα πλεονεκτήματα και μειονεκτήματα του κάθε "
@@ -2705,13 +2705,13 @@ msgstr ""
 "σε κείνη την ενότητα."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "Δισκέττες"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2723,7 +2723,7 @@ msgstr ""
 "συσκευή δισκεττών υψηλής-πυκνότητας (1440 kilobytes) των 3,5 ιντσών."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr ""
@@ -2731,13 +2731,13 @@ msgstr ""
 "μη διαθέσιμη."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM "
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2752,7 +2752,7 @@ msgstr ""
 "είναι ούτε SCSI ούτε IDE/ATAPI."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2774,7 +2774,7 @@ msgstr ""
 "installer\"/>."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2786,7 +2786,7 @@ msgstr ""
 "πληροφορία για την χρήση συσκευών CD-ROM με το Linux."
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2796,13 +2796,13 @@ msgstr ""
 "υποστηρίζονται από τους οδηγούς ohci1394 και sbp2."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "CD-ROM IDE/ATAPI υποστηρίζονται σε όλα τα μηχανήματα ARM."
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2822,13 +2822,13 @@ msgstr ""
 "<quote>Εγκατάσταση Συστήματος</quote> στο firmware."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "Σκληρός Δίσκος"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2841,7 +2841,7 @@ msgstr ""
 "δίσκο."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2851,13 +2851,13 @@ msgstr ""
 "(Solaris),μπορείτε να εγκαταστήσετε από μια κατάτμηση SunOS (UFS slices)."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB stick μνήμης"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2867,21 +2867,22 @@ msgid ""
 "This is also useful for small systems which have no room for unnecessary "
 "drives."
 msgstr ""
-"Πολλά συστήματα &debian; χρειάζονται τις συσκευές δισκέττας και/ή CD-ROM μόνο "
-"για την ρύθμιση του συστήματος και για λόγους \"διάσωσης\". Aν χειρίζεστε "
-"μερικούς server θα έχετε πιθανόν ήδη σκεφτεί να παραλείψετε όλες αυτές τις "
-"συσκευές και να χρησιμοποιήσετε ένα στικ μνήμης USB για την εγκατάσταση και "
-"(όποτε είναι απαραίτητο) την ανάκτηση του συστήματος. Αυτό είναι χρήσιμο "
-"επίσης για μικρά συστήματα που δεν έχουν πολύ χώρο για άχρηστες συσκευές."
+"Πολλά συστήματα &debian; χρειάζονται τις συσκευές δισκέττας και/ή CD-ROM "
+"μόνο για την ρύθμιση του συστήματος και για λόγους \"διάσωσης\". Aν "
+"χειρίζεστε μερικούς server θα έχετε πιθανόν ήδη σκεφτεί να παραλείψετε όλες "
+"αυτές τις συσκευές και να χρησιμοποιήσετε ένα στικ μνήμης USB για την "
+"εγκατάσταση και (όποτε είναι απαραίτητο) την ανάκτηση του συστήματος. Αυτό "
+"είναι χρήσιμο επίσης για μικρά συστήματα που δεν έχουν πολύ χώρο για "
+"άχρηστες συσκευές."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2902,7 +2903,7 @@ msgstr ""
 "το σύστημά σας ώστε να χρησιμοποιεί ISDN ή PPP."
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2914,7 +2915,7 @@ msgstr ""
 "εγκατάστασης για την αρχιτεκτονική &arch-title;.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2925,13 +2926,13 @@ msgstr ""
 "μια άλλη δυνατότητα."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Σύστημα Un*x ή GNU"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2949,13 +2950,13 @@ msgstr ""
 "\"linux-upgrade\"/>."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Υποστηριζόμενα συστήματα Αποθήκευσης"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
@@ -2976,7 +2977,7 @@ msgstr ""
 "μπορεί να εγκατασταθεί στην ευρύτερη δυνατή ποικιλία υλικού."
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
@@ -2984,14 +2985,14 @@ msgid ""
 "SATA and SCSI controllers and drives, USB, and FireWire. The supported file "
 "systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
 msgstr ""
-"Γενικά, το σύστημα εγκατάστασης του &debian; παρέχει υποστήριξη για δισκέττες, "
-"συσκευές δίσκων IDE (επίσης γνωστών και ως PATA), δισκέττες IDE, συσκευές "
-"IDE παράλληλης θύρας, ελεγκτές και συσκευές SATA και SCSI, USB και FireWire. "
-"Τα υποστηριζόμενα συστήματα αρχείων περιλαμβάνουν: FAT, FAT Win-32 με "
-"επεκτάσεις (VFAT) και NTFS."
+"Γενικά, το σύστημα εγκατάστασης του &debian; παρέχει υποστήριξη για "
+"δισκέττες, συσκευές δίσκων IDE (επίσης γνωστών και ως PATA), δισκέττες IDE, "
+"συσκευές IDE παράλληλης θύρας, ελεγκτές και συσκευές SATA και SCSI, USB και "
+"FireWire. Τα υποστηριζόμενα συστήματα αρχείων περιλαμβάνουν: FAT, FAT Win-32 "
+"με επεκτάσεις (VFAT) και NTFS."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -3008,7 +3009,7 @@ msgstr ""
 "λεπτομέρειες."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3033,7 +3034,7 @@ msgstr ""
 "τον πυρήνα του Linux."
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3046,7 +3047,7 @@ msgstr ""
 "CHRP."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3058,7 +3059,7 @@ msgstr ""
 "πυρήνας του Linux δεν υποστηρίζει συσκευές δισκέττας."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3068,7 +3069,7 @@ msgstr ""
 "υποστηρίζεται επίσης και από το σύστημα εκκίνησης."
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3081,13 +3082,13 @@ msgstr ""
 "την καινούρια κοινή διάταξη δίσκων S/390 (cdl)."
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Απαιτήσεις Μνήμης και χώρου Δίσκου"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3101,7 +3102,7 @@ msgstr ""
 "νούμερα, δείτε την ενότητα <xref linkend=\"minimum-hardware-reqts\"/>."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -3120,3 +3121,24 @@ msgstr ""
 "στον συνηθισμένο ή τον γραφικό εγκαταστάτη, θα πρέπει να επιλεχθεί ο πρώτος."
 "</para> </footnote> ή χώρο σκληρού δίσκου μπορεί να είναι εφικτή αλλά "
 "ενδείκνυται μόνο για έμπειρους χρήστες."
+
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "Ολοκληρωμένες πληροφορίες σχετικά με τα υποστηριζόμενα συστήματα S/390 "
+#~ "και zSeries μπορούν να βρεθούν στο Redbook της IBM <ulink url=\"http://"
+#~ "www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM "
+#~ "eServer zSeries and S/390: Distributions</ulink>στο κεφάλαιο 2.1 ή στο "
+#~ "<ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/index."
+#~ "html\">zSeries page at the developerWorks</ulink>. Σε συντομία, συστήματα "
+#~ "G5, Multiprise 3000, G6 και όλα τα zSeries υποστηρίζονται πλήρως; "
+#~ "μηχανήματα Multiprise 2000, G3 και G4 υποστηρίζονται με προσομοίωση "
+#~ "κινητού σημείου ΙΕΕΕ και συνεπώς με μειωμένες απόδοση."
diff --git a/po/el/install-methods.po b/po/el/install-methods.po
index 91d271b5c..f776f1ea1 100644
--- a/po/el/install-methods.po
+++ b/po/el/install-methods.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-13 18:50+0300\n"
 "Last-Translator: debian-l10n-greek <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -54,8 +54,8 @@ msgid ""
 "a lot of space on your shelf and you avoid the CD shuffling marathon."
 msgstr ""
 "Ο ευκολότερος με διαφορά τρόπος για να εγκαταστήσετε το &debian-gnu; είναι "
-"από ένα Επίσημο σετ CD-ROM του &debian;. Μπορείτε να αγοράσετε ένα τέτοιο σετ "
-"από έναν προμηθευτή (δείτε τη σελίδα <ulink url=\"&url-debian-cd-vendors;"
+"από ένα Επίσημο σετ CD-ROM του &debian;. Μπορείτε να αγοράσετε ένα τέτοιο "
+"σετ από έναν προμηθευτή (δείτε τη σελίδα <ulink url=\"&url-debian-cd-vendors;"
 "\">CD vendors page</ulink>). Μπορείτε επίσης να κατεβάσετε είδωλα των CD-ROM "
 "από έναν κατοπτριστή αρχείων του &debian; και να φτιάξετε έτσι το δικό σας "
 "σετ, αν έχετε μια γρήγορη δικτυακή σύνδεση και έναν εγγραφέα CD (δείτε τη "
@@ -94,10 +94,10 @@ msgstr ""
 "φορτώστε χειροκίνητα τον πυρήνα από το CD για να ξεκινήσετε αρχικά τον "
 "εγκαταστάτη του συστήματος. Τα αρχεία που χρειάζεστε για να ξεκινήσετε με "
 "ένα άλλο μέσο βρίσκονται επίσης στο CD; η οργάνωση της δικτυακής αρχειοθήκης "
-"του &debian; και του καταλόγου στο CD είναι ταυτόσημα. Έτσι όταν στη συνέχεια "
-"δίνονται διαδρομές για αρχεία της αρχειοθήκης για συγκεκριμένα αρχεία που "
-"χρειάζεστε για την εκκίνηση, κοιτάξτε γι' αυτά τα αρχεία στους ίδιους "
-"καταλόγους και υποκαταλόγους στο CD σας."
+"του &debian; και του καταλόγου στο CD είναι ταυτόσημα. Έτσι όταν στη "
+"συνέχεια δίνονται διαδρομές για αρχεία της αρχειοθήκης για συγκεκριμένα "
+"αρχεία που χρειάζεστε για την εκκίνηση, κοιτάξτε γι' αυτά τα αρχεία στους "
+"ίδιους καταλόγους και υποκαταλόγους στο CD σας."
 
 #. Tag: para
 #: install-methods.xml:52
@@ -153,9 +153,10 @@ msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
 msgstr ""
-"Όταν κατεβάζετε αρχεία από έναν καθρέφτη αρχείων του &debian; χρησιμοποιώντας "
-"FTP, βεβαιωθείτε ότι κατεβάζετε τα αρχεία σε <emphasis>εκτελέσιμη</emphasis> "
-"(binary) κατάσταση και όχι σε αυτόματη ή κατάσταση κειμένου."
+"Όταν κατεβάζετε αρχεία από έναν καθρέφτη αρχείων του &debian; "
+"χρησιμοποιώντας FTP, βεβαιωθείτε ότι κατεβάζετε τα αρχεία σε "
+"<emphasis>εκτελέσιμη</emphasis> (binary) κατάσταση και όχι σε αυτόματη ή "
+"κατάσταση κειμένου."
 
 #. Tag: title
 #: install-methods.xml:98
@@ -252,8 +253,9 @@ msgid ""
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Tο σύστημα Kurobox Pro απαιτεί έναν πυρήνα και έναν δίσκο μνήμης σε "
-"κατάτμηση ext2 στον δίσκο στον οποίον σκοπεύετε να εγκαταστήσετε το &debian;. "
-"Αυτές οι εικόνες μπορούν να ληφθούν από το &kuroboxpro-firmware-img;."
+"κατάτμηση ext2 στον δίσκο στον οποίον σκοπεύετε να εγκαταστήσετε το "
+"&debian;. Αυτές οι εικόνες μπορούν να ληφθούν από το &kuroboxpro-firmware-"
+"img;."
 
 #. Tag: title
 #: install-methods.xml:160
@@ -419,8 +421,8 @@ msgid ""
 "DVD.</phrase>"
 msgstr ""
 "Πριν μπορέσετε να δημιουργήσετε τις δισκέττες θα πρέπει πρώτα να κατεβάσετε "
-"τις εικόνες τους από έναν από τους καθρέφτες του &debian;, όπως εξηγείται στην "
-"ενότητα <xref linkend=\"downloading-files\"/>. <phrase arch=\"i386\">Αν "
+"τις εικόνες τους από έναν από τους καθρέφτες του &debian;, όπως εξηγείται "
+"στην ενότητα <xref linkend=\"downloading-files\"/>. <phrase arch=\"i386\">Αν "
 "έχετε ήδη ένα CD-ROM ή DVD εγκατάστασης, οι εικόνες αυτές πιθανόν να "
 "συμπεριλαμβάνονται ήδη στο CD/DVD.</phrase>"
 
@@ -1054,8 +1056,8 @@ msgstr ""
 "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</"
 "replaceable> /mnt</userinput>),</phrase> που τώρα θα έχει<phrase arch="
 "\"x86\">ένα σύστημα αρχείων FAT</phrase> <phrase arch=\"powerpc\">ένα "
-"σύστημα αρχείων HFS</phrase> και αντιγράψτε μια εικόνα ISO &debian; netinst ή "
-"businesscard σ' αυτό. Αποπροσαρτήστε το κλειδί (<userinput>umount /mnt</"
+"σύστημα αρχείων HFS</phrase> και αντιγράψτε μια εικόνα ISO &debian; netinst "
+"ή businesscard σ' αυτό. Αποπροσαρτήστε το κλειδί (<userinput>umount /mnt</"
 "userinput>) και έχετε τελειώσει."
 
 #. Tag: title
@@ -1225,8 +1227,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Για τον γραφικό εγκαταστάτη θα πρέπει να "
-"προσθέσετε τις παραμέτρους <userinput>vga=788</"
-"userinput> στη δεύτερη γραμμή."
+"προσθέσετε τις παραμέτρους <userinput>vga=788</userinput> στη δεύτερη γραμμή."
 
 #. Tag: para
 #: install-methods.xml:768
@@ -1621,7 +1622,7 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "Αντιγράψτε τα ακόλουθα αρχεία από τις αρχειοθήκες του Debian σε μια βολική "
@@ -1693,9 +1694,9 @@ msgstr ""
 "Κατεβάστε και αποσυμπιέστε τη διανομή του <application>BootX</application>, "
 "διαθέσιμη στο <ulink url=\"&url-powerpc-bootx;\"></ulink>, ή στον κατάλογο "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> των "
-"http/ftp καθρεφτών του &debian; και στα επίσημα &debian; CD. Χρησιμοποιήστε το "
-"<application>Stuffit Expander</application> για την εξαγωγή των αρχείων από "
-"το συμπιεσμένο αρχείο. Μέσα στο πακέτο υπάρχει ένας κενός φάκελος που "
+"http/ftp καθρεφτών του &debian; και στα επίσημα &debian; CD. Χρησιμοποιήστε "
+"το <application>Stuffit Expander</application> για την εξαγωγή των αρχείων "
+"από το συμπιεσμένο αρχείο. Μέσα στο πακέτο υπάρχει ένας κενός φάκελος που "
 "ονομάζεται <filename>Linux Kernels</filename>. Κατεβάστε τα <filename>linux."
 "bin</filename> και <filename>ramdisk.image.gz</filename> από τον κατάλογο "
 "<filename>disks-powerpc/current/powermac</filename>, και τοποθετήστε τα στον "
@@ -2539,8 +2540,8 @@ msgid ""
 "\">FAI home page</ulink> for detailed information."
 msgstr ""
 "Για εγκατάσταση σε πολλαπλούς υπολογιστές είναι δυνατό να πραγματοποιήσουμε "
-"πλήρως αυτοματοποιημένες εγκαταστάσεις. Πακέτα &debian; που στοχεύουν σε αυτό "
-"περιλαμβάνουν: <classname>fai</classname> (που χρησιμοποιεί έναν "
+"πλήρως αυτοματοποιημένες εγκαταστάσεις. Πακέτα &debian; που στοχεύουν σε "
+"αυτό περιλαμβάνουν: <classname>fai</classname> (που χρησιμοποιεί έναν "
 "εξυπηρετητή  εγκατάστασης), <classname>replicator</classname>, "
 "<classname>systemimager</classname>, <classname>autoinstall</classname>, και "
 "τον ίδιο τον &debian; Installer."
@@ -2560,8 +2561,8 @@ msgid ""
 "removable media, and used to fill in answers to questions asked during the "
 "installation process."
 msgstr ""
-"Ο εγκαταστάτης του &debian; υποστηρίζει αυτοματοποιημένες εγκαταστάσεις με τη "
-"βοήθεια αρχείων προρύθμισης. Ένα τέτοιο αρχείο μπορεί να φορτωθεί από το "
+"Ο εγκαταστάτης του &debian; υποστηρίζει αυτοματοποιημένες εγκαταστάσεις με "
+"τη βοήθεια αρχείων προρύθμισης. Ένα τέτοιο αρχείο μπορεί να φορτωθεί από το "
 "δίκτυο ή από αφαιρούμενα μέσα και να χρησιμοποιηθεί για την συμπλήρωση "
 "απαντήσεων σε ερωτήσεις που θα τεθούν κατά τη διάρκεια της διαδικασίας "
 "εγκατάστασης."
diff --git a/po/el/preparing.po b/po/el/preparing.po
index f5b30e089..0f49bf537 100644
--- a/po/el/preparing.po
+++ b/po/el/preparing.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2008-09-28 17:50+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -96,9 +96,9 @@ msgstr ""
 "πάντα να κάνετε επί τόπου αναβάθμιση. Τα προγράμματα είναι επίσης σχεδόν "
 "πάντα συμβατά με διαδοχικές εκδόσεις του λειτουργικού συστήματος.Αν μια "
 "καινούρια έκδοση ενός προγράμματος απαιτεί πιο πρόσφατο λογισμικό "
-"υποστήριξης, το σύστημα πακέτων του &debian; σιγουρεύει ότι όλο το απαραίτητο "
-"λογισμικό ταυτοποιείται και εγκαθίσταται αυτόματα. Και το γεγονός είναι ότι "
-"έχει αφιερωθεί πολύς κόπος ακριβώς στο να μην υπάρχει ανάγκη για "
+"υποστήριξης, το σύστημα πακέτων του &debian; σιγουρεύει ότι όλο το "
+"απαραίτητο λογισμικό ταυτοποιείται και εγκαθίσταται αυτόματα. Και το γεγονός "
+"είναι ότι έχει αφιερωθεί πολύς κόπος ακριβώς στο να μην υπάρχει ανάγκη για "
 "επανεγκαταστάσεις, οπότε θεωρήστε την πραγματικά σαν την τελευταία σας λύση. "
 "Ο εγκαταστάτης <emphasis>δεν</emphasis> έχει σχεδιαστέι για επανεγκατάσταση "
 "πάνω από ένα υπάρχον σύστημα."
@@ -443,9 +443,9 @@ msgid ""
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "Το κείμενο που διαβάζεται τώρα, που είναι μια έκδοση σε ανάπτυξη τοθ Οδηγού "
-"Εγκατάστασης για την επόμενη έκδοση του &debian;. Διαθέσιμο στον δικτυακό τόπο "
-"<ulink url=\"&url-d-i-alioth-manual;\"> σε διάφορες μορφές και μεταφράσεις.</"
-"ulink>."
+"Εγκατάστασης για την επόμενη έκδοση του &debian;. Διαθέσιμο στον δικτυακό "
+"τόπο <ulink url=\"&url-d-i-alioth-manual;\"> σε διάφορες μορφές και "
+"μεταφράσεις.</ulink>."
 
 #. Tag: title
 #: preparing.xml:273
@@ -490,21 +490,18 @@ msgstr "&arch-title; Αναφορές Υλικού"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Οδηγίες εγκατάστασης και οδηγοί συσκευών (DASD, XPRAM, κονσόλα, ταινία, z90, "
-"crypto, chandev, δίκτυο) για το Linux στην αρχιτεκτονική &arch-title; "
-"χρησιμοποιώντας πυρήνα 2.4"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Οδηγοί Συσκευών και Εντολές Εγκατάστασης"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -514,13 +511,13 @@ msgstr ""
 "z/VM σε υλικό zSeries και την αρχιτεκτονική &arch-title;."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux για την αρχιτεκτονική &arch-title;"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
@@ -532,19 +529,19 @@ msgstr ""
 "εγκατάστασης είναι κοινές μεταξύ όλων των &arch-title;  διανομών."
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux για IBM eServer zSeries και Διανομές &arch-title;"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Βρίσκοντας πηγές για πληροφορίες σχετικά με το Υλικό σας"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -556,19 +553,19 @@ msgstr ""
 "με το υλικό του υπολογιστή σας πριν την εγκατάσταση."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "Πληροφορίες για το Υλικό σας μπορούν να συγκεντρωθούν από:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "Τα εγχειρίδια που έρχονται με κάθε κομμάτι του υλικού."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -580,19 +577,19 @@ msgstr ""
 "συνδυασμό πλήκτρων. Συχνά είναι το πλήκτρο <keycap>Delete</keycap>."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "Οι συσκευασίες και τα κουτιά για κάθε κομμάτι του υλικού σας."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Το παράθυρο για το Σύστημα στον πίνακα ελέγχου των Windows."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -604,7 +601,7 @@ msgstr ""
 "για πληροφορίες σχετικά με την μνήμη RAM και την μνήμη του σκληρού δίσκου."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -615,176 +612,176 @@ msgstr ""
 "και του ηλεκτρονικού ταχυδρομείου σας."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Πληροφορίες για το υλικό σας που χρειάζονται για μια εγκατάσταση"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "Υλικό"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "Πληροφορίες που πιθανόν να χρειαστείτε"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "Σκληροί Δίσκοι"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "Πόσους έχετε."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "Η σειρά τους στο σύστημα."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "Είναι IDE (γνωστός επίσης και ως PATA), SATA ή SCSI."
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "Διαθέσιμος ελεύθερος χώρος."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "Τμήματα δίσκου."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr ""
 "Τμήματα δίσκου όπου βρίσκονται εγκατεστημένα άλλα λειτουργικά συστήματα."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "Οθόνη"
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "Μοντέλο και κατασκευαστής."
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "Υποστηριζόμενες αναλύσεις."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Ρυθμός οριζόντιας ανανέωσης."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Ρυθμός κάθετης ανανέωσης."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Βάθος χρώματος (αριθμός χρωμάτων) που υποστηρίζει."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "Μέγεθος οθόνης."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "Ποντίκι"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Τύπος: σειριακό, PS/2, ή USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "Θύρα."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "Κατασκευαστής."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "Αριθμός κουμπιών."
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "Τύπος υποδοχέα."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "Εκτυπωτής"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Υποστηριζόμενες Αναλύσεις Εκτύπωσης."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "Κάρτα Οθόνης"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "Διαθέσιμη Μνήμη κάρτας οθόνης."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -794,37 +791,37 @@ msgstr ""
 "ελεγχθούν ως προς τις δυνατότητες της οθόνης σας)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "Αριθμός συσκευών."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "Αριθμός συσκευών."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "Σχετικός αριθμός υποδοχέα για κάρτες OSA."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Συμβατότητα Υλικού"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -838,7 +835,7 @@ msgstr ""
 "διαφορετικά είδη υλικού όπως μερικά άλλα λειτουργικά συστήματα."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -848,7 +845,7 @@ msgstr ""
 "που απαιτεί την μια ενεργή έκδοση των Windows για να δουλέψει."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -863,7 +860,7 @@ msgstr ""
 "γρήγορα να είναι ξεπερασμένοι."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -874,20 +871,20 @@ msgstr ""
 "Windows."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "Μπορείτε να ελέγξετε την συμβατότητα του υλικού σας:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr ""
 "Ελέγχοντας τους δικτυακούς τόπους των κατασκευαστών για καινούριους οδηγούς."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -898,7 +895,7 @@ msgstr ""
 "χρησιμοποιούν τους οδηγούς ή τις ρυθμίσεις περισσότερο επώνυμων."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -908,19 +905,19 @@ msgstr ""
 "δικτυακούς τόπους αφιερωμένους στην αρχιτεκτονική σας."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "Ψάχνοντας στο διαδίκτυο για εμπειρίες άλλων χρηστών."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "Ρυθμίσεις Δικτύου"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -933,32 +930,32 @@ msgstr ""
 "πληροφορία."
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr ""
 "Το όνομα του συστήματός σας (πιθανόν να μπορείτε να το διαλέξετε οι ίδιοι)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "Το όνομα του τομέα του δικτύου σας."
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "Η διεύθυνση IP του υπολογιστή σας."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "Η μάσκα δικτύου που θα χρησιμοποιηθεί στο δίκτυο σας."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -969,7 +966,7 @@ msgstr ""
 "τέτοια πύλη."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -979,7 +976,7 @@ msgstr ""
 "(Domain Name Server)."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -993,31 +990,31 @@ msgstr ""
 "τη διάρκεια της διαδικασίας εγκατάστασης."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Αν χρησιμοποιείτε ασύρματο δίκτυο, θα πρέπει επίσης να βρείτε:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "το όνομα (ESSID) του ασύρματου δικτύου σας."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "Το κλειδί ασφαλείας WEP (αν χρειάζεται)."
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Ικανοποίηση των ελάχιστων απαιτήσεων Υλικού"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -1029,7 +1026,7 @@ msgstr ""
 "της εγκατάστασης που θέλετε να κάνετε."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -1041,7 +1038,7 @@ msgstr ""
 "περισσότεροι χρήστες θα διακινδυνέψουν να απογοητευτούν αν τις αγνοήσουν."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
@@ -1050,7 +1047,7 @@ msgstr ""
 "σύστημα γραφείου."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
@@ -1058,98 +1055,105 @@ msgstr ""
 "σαν σύστημα γραφείου."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Προτεινόμενες ελάχιστες απαιτήσεις του συστήματος"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "Τύπος Εγκατάστασης"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (ελάχιστη)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (συνιστώμενη)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "Σκληρός Δίσκος"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "Χωρίς Γραφείο"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 megabyte"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 megabytes"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 gigabyte "
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "Με Γραφείο"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 megabytes"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 megabytes"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 gigabytes"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "Οι απαιτήσεις της ελάχιστης μνήμης είναι στην πράξη αρκετά μικρότερες από "
 "τις τιμές που αναγράφονται στον πίνακα. Ανάλογα με την αρχιτεκτονική, είναι "
 "δυνατόν να εγκαταστήσετε το &debian; με τόσο λίγη μνήμη όσο 20ΜΒ (για ένα "
-"σύστημα s390) έως 60ΜΒ (για ένα σύστημα amd64). Το ίδιο ισχύει για "
-"τις απαιτήσεις σε χώρο δίσκου, ιδιαίτερα αν ξεχωρίσετε και επιλέξετε ποιες "
+"σύστημα s390) έως 60ΜΒ (για ένα σύστημα amd64). Το ίδιο ισχύει για τις "
+"απαιτήσεις σε χώρο δίσκου, ιδιαίτερα αν ξεχωρίσετε και επιλέξετε ποιες "
 "εφαρμογές θα εγκαταστήσετε. Δείτε το <xref linkend=\"tasksel-size-list\"/> "
 "για περισσότερες πληροφορίες σχετικά με τις απαιτήσεις σε χώρο δίσκου."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1168,7 +1172,7 @@ msgstr ""
 "τους οποίους μπορείτε να διαλέξετε."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1180,7 +1184,7 @@ msgstr ""
 "την χρήση για την οποία προορίζεται ο διακομιστής."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1193,7 +1197,7 @@ msgstr ""
 "αρχείων και δεδομένων."
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1219,13 +1223,13 @@ msgstr ""
 "περισσότερα αν εγκαταστήσετε ένα γραφικό περιβάλλον επιφάνειας εργασίας."
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Προκατάτμηση για Συστήματα με εκκίνηση πολλαπλών λειτουργικών"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1240,7 +1244,7 @@ msgstr ""
 "υπόλοιπα δωμάτια."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1253,40 +1257,41 @@ msgstr ""
 "φιλοξενούμενο σύστημα VM."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Debian on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Unix systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
+#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> and want to stick Debian on the same disk, "
+#| "you will need to repartition the disk. Debian requires its own hard disk "
+#| "partitions. It cannot be installed on Windows or MacOS partitions. It may "
+#| "be able to share some partitions with other Unix systems, but that's not "
+#| "covered here. At the very least you will need a dedicated partition for "
+#| "the Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "Αν έχετε ήδη ένα λειτουργικό σύστημα στο μηχάνημά σας <phrase arch=\"i386\"> "
-"(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
-"phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase>και "
-"θέλετε να βάλετε το &debian; στον ίδιο δίσκο θα πρέπει να επαναδιαμερίσετε τον "
-"δίσκο. Το &debian; απαιτεί τα δικές του κατατμήσεις. Δεν μπορεί να "
-"εγκατασταθεί σε κατατμήσεις των Windows ή του MacOS. Μπορεί πιθανόν να "
-"μοιραστεί κάποιες κατατμήσεις με άλλα συστήματα Unix αλλά κάτι τέτοιο δεν "
-"καλύπτεται εδώ. Το λιγότερο που θα χρειαστείτε είναιμια κατάτμηση αφιερωμένη "
-"ειδικά στο ριζικό σύστημα του &debian;."
+"(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
+"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
+"phrase>και θέλετε να βάλετε το &debian; στον ίδιο δίσκο θα πρέπει να "
+"επαναδιαμερίσετε τον δίσκο. Το &debian; απαιτεί τα δικές του κατατμήσεις. "
+"Δεν μπορεί να εγκατασταθεί σε κατατμήσεις των Windows ή του MacOS. Μπορεί "
+"πιθανόν να μοιραστεί κάποιες κατατμήσεις με άλλα συστήματα Unix αλλά κάτι "
+"τέτοιο δεν καλύπτεται εδώ. Το λιγότερο που θα χρειαστείτε είναιμια κατάτμηση "
+"αφιερωμένη ειδικά στο ριζικό σύστημα του &debian;."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can find information about your current partition setup by using a "
@@ -1313,7 +1318,7 @@ msgstr ""
 "υπάρχουν χωρίς να γίνονται οποιεσδήποτε αλλαγές."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1331,13 +1336,13 @@ msgstr ""
 "καταστρέψετε."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "ΔΙΟΡΘΩΣΕ ΜΕ: γράψε για δίσκους σε HP-UX?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
@@ -1352,7 +1357,7 @@ msgstr ""
 "εγκαταστάτης μπορεί να το κάνει αυτό πολύ καλά."
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1382,7 +1387,7 @@ msgstr ""
 "αρχικού λειτουργικού συστήματος."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
@@ -1401,7 +1406,7 @@ msgstr ""
 "σας υποχρεώσουν να κάνετε έτσι κι αλλιώς τη διαμέριση πριν την εγκατάσταση."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1414,7 +1419,7 @@ msgstr ""
 "συστήματος αρχείων."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
@@ -1438,7 +1443,7 @@ msgstr ""
 "λειτουργικό σύστημα που θέλετε να διατηρήσετε."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
 msgid ""
 "If you are going to install more than one operating system on the same "
@@ -1449,12 +1454,13 @@ msgid ""
 msgstr ""
 "Αν σκοπεύετε να εγκαταστήσετε περισσότερα από ένα λειτουργικά συστήματα στο "
 "ίδιο μηχάνημα. θα πρέπει να εγκαταστήσετε όλα τα άλλα λειτουργικά πριν "
-"προχωρήσετε με την εγκατάσταση του &debian;. Η εγκατάσταση των Windows ή άλλων "
-"λειτουργικών μπορεί να καταστρέψουν τη δυνατότητα να ξεκινήσετε το &debian; ή "
-"να σας ενθαρρύνουν να επαναδιαμορφώσετε κάποιες μη-φυσικές κατατμήσεις."
+"προχωρήσετε με την εγκατάσταση του &debian;. Η εγκατάσταση των Windows ή "
+"άλλων λειτουργικών μπορεί να καταστρέψουν τη δυνατότητα να ξεκινήσετε το "
+"&debian; ή να σας ενθαρρύνουν να επαναδιαμορφώσετε κάποιες μη-φυσικές "
+"κατατμήσεις."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1465,7 +1471,7 @@ msgstr ""
 "από πολλά προβλήματα."
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
@@ -1498,7 +1504,7 @@ msgstr ""
 "πραγματικής εγκατάστασης και να την αντικαταστήσετε με κατατμήσεις Linux."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
@@ -1510,13 +1516,13 @@ msgstr ""
 "το αρχικό λειτουργικό σύστημα και το &debian;, θα πρέπει να:"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Κάνετε αντίγραφα ασφαλείας για ο,τιδήποτε υπάρχει στον υπολογιστή σας."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1530,7 +1536,7 @@ msgstr ""
 "εξαναγκάσετε το CD να γίνει το ενεργό MacOS σύστημα.</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1541,7 +1547,7 @@ msgstr ""
 "απλά ελεύθερο χώρο για το &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr ""
@@ -1549,7 +1555,7 @@ msgstr ""
 "που του αντιστοιχεί."
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
@@ -1559,7 +1565,7 @@ msgstr ""
 "ενταξει και για να κατεβάσετε τα αρχεία εκκίνησης του &debian; installer."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
@@ -1567,13 +1573,13 @@ msgstr ""
 "&debian;."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Κατάτμηση από DOS ή Windows"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
@@ -1584,11 +1590,11 @@ msgstr ""
 "Αν τροποποιείτε υπάρχουσες κατατμήσεις FAT ή NTFS, συνιστούμε να "
 "χρησιμοποιήσετε είτε το παρακάτω σχήμα είτε εργαλεία των ίδιων των Windows ή "
 "του DOS. Σε άλλη περίπτωση δεν υπάρχει αλήθεια λόγος για να κάνετε τη "
-"διαμέριση από το DOS ή τα Windows. Τα εργαλεία διαμέρισης του &debian; μπορούν "
-"να κάνουν την ίδια δουλειά καλλίτερα."
+"διαμέριση από το DOS ή τα Windows. Τα εργαλεία διαμέρισης του &debian; "
+"μπορούν να κάνουν την ίδια δουλειά καλλίτερα."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1610,39 +1616,40 @@ msgstr ""
 "κατάτμησης FAT ή NTFS."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "Επανακατάτμηση χωρίς απώλειες όταν ξεκινάτε από DOS, Win-32 ή OS/2"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "Μια από τις πιο συνηθισμένες εγκαταστάσεις είναι αυτή σε ένα σύστημα που "
 "περιέχει ήδη DOS (περιλαμβανομένων των Windows 3.1), Win32 (όπως Windows 95, "
-"98, Me, NT, 2000, XP, 2003, Vista, 7) ή OS/2, και όπου επιθυμείτε να εγκαταστήσετε το &debian; "
-"στον ίδιο δίσκο χωρίς να καταστρέψετε το προηγούμενο σύστημα.Σημειώστε ότι ο "
-"εγκαταστάτης υποστηρίζει την μεταβολή του μεγέθους συστημάτων αρχείων FAT "
-"και NTFS όπως αυτά χρησιμοποιούνται από το DOS και τα Windows. Απλά "
-"ξεκινήστε τον εγκαταστάτη, και όταν φτάσετε στο βήμα της διαμέρισης επιλέξτε "
-"<menuchoice> <guimenuitem>Χειροκίνητη</guimenuitem> </menuchoice>διαμέριση, "
-"επιλέξτε την κατάτμηση της οποίας το μέγεθος θέλετε να μεταβάλλετε και "
-"καθορίστε το καινούριο της μέγεθος.Έτσι στις περισσότερες περιπτώσεις δεν θα "
-"χρειαστεί να χρησιμοποιήσετε την μέθοδο που περιγράφεται αμέσως παρακάτω."
+"98, Me, NT, 2000, XP, 2003, Vista, 7) ή OS/2, και όπου επιθυμείτε να "
+"εγκαταστήσετε το &debian; στον ίδιο δίσκο χωρίς να καταστρέψετε το "
+"προηγούμενο σύστημα.Σημειώστε ότι ο εγκαταστάτης υποστηρίζει την μεταβολή "
+"του μεγέθους συστημάτων αρχείων FAT και NTFS όπως αυτά χρησιμοποιούνται από "
+"το DOS και τα Windows. Απλά ξεκινήστε τον εγκαταστάτη, και όταν φτάσετε στο "
+"βήμα της διαμέρισης επιλέξτε <menuchoice> <guimenuitem>Χειροκίνητη</"
+"guimenuitem> </menuchoice>διαμέριση, επιλέξτε την κατάτμηση της οποίας το "
+"μέγεθος θέλετε να μεταβάλλετε και καθορίστε το καινούριο της μέγεθος.Έτσι "
+"στις περισσότερες περιπτώσεις δεν θα χρειαστεί να χρησιμοποιήσετε την μέθοδο "
+"που περιγράφεται αμέσως παρακάτω."
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
@@ -1661,7 +1668,7 @@ msgstr ""
 "swap ή για ένα σύστημα αρχείων."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1680,19 +1687,28 @@ msgstr ""
 "μπορείτε να αφαιρέσετε από την κατάτμηση αυτή."
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
-msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+#: preparing.xml:983
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The first thing needed is a copy of <command>fips</command> which is "
+#| "available in the <filename>tools/</filename> directory on your nearest "
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
+#| "filename> to a bootable floppy. A bootable floppy can be created using "
+#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
+#| "command> comes with very good documentation which you may want to read. "
+#| "You will definitely need to read the documentation if you use a disk "
+#| "compression driver or a disk manager. Create the disk and read the "
+#| "documentation <emphasis>before</emphasis> you defragment the disk."
+msgid ""
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "Το πρώτο πράγμα που χρειάζεστε είναι ένα αντίγραφο του <command>fips</"
 "command> που βρίσκεται στον κατάλογο <filename>tools/</filename> στον "
@@ -1707,7 +1723,7 @@ msgstr ""
 "τεκμηρίωση <emphasis>πριν</emphasis> τον κάνετε defragment."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1730,7 +1746,7 @@ msgstr ""
 "μεταγενέστερα."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1743,7 +1759,7 @@ msgstr ""
 "οδηγίες."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1753,13 +1769,13 @@ msgstr ""
 "σε περίπτωση που το <command>fips</command> δεν κάνει τη δουλειά για σας."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Κατάτμηση για DOS"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1776,7 +1792,7 @@ msgstr ""
 "σφάλματα στο DOS ή στα Windows."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1787,22 +1803,23 @@ msgstr ""
 "Κατά τα φαινόμενα, όποτε δημιουργείτε ή αλλάζετε το μέγεθος μιας κατάτμησης "
 "για χρήση με DOS, είναι καλή ιδέα να γεμίσετε τους πρώτους λίγους τομείς με "
 "μηδενικά. Αυτό θα πρέπει να το κάνετε πριν εκτελέσετε την εντολή του DOS "
-"<command>format</command> εκτελώντας την ακόλουθη εντολή μέσα από το &debian;:"
+"<command>format</command> εκτελώντας την ακόλουθη εντολή μέσα από το "
+"&debian;:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4 "
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Κατάτμηση από SunOS"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
@@ -1822,13 +1839,13 @@ msgstr ""
 "(CDROM)."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Κατάτμηση από Linux ή άλλο Λειτουργικό Σύστημα"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1854,7 +1871,7 @@ msgstr ""
 "αντιμετωπίσετε προβλήματα με τηνγεωμετρία του δίσκου."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1869,13 +1886,13 @@ msgstr ""
 "τους δείτε και το <xref linkend=\"partitioning\"/>."
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "Κατάτμηση από MacOS/OSX "
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1891,7 +1908,7 @@ msgstr ""
 "φαίνονται στο <application>Drive Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1904,7 +1921,7 @@ msgstr ""
 "από τον εγκαταστάτη του &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1934,7 +1951,7 @@ msgstr ""
 "είτε από το OS 9 είτε το OS X."
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1954,14 +1971,14 @@ msgstr ""
 "από το Linux."
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 "Ρύθμιση του Υλικού και του Λειτουργικού συστήματος πριν την εγκατάσταση"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1982,13 +1999,13 @@ msgstr ""
 "του &debian-gnu; στο σύστημά σας επίσης τονίζονται."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Κλήση του BIOS Set-Up Menu"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
@@ -2007,7 +2024,7 @@ msgstr ""
 "απρόβλεπτες διακοπές ή σε μια αδυναμία εγκατάστασης του &debian;."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -2021,13 +2038,13 @@ msgstr ""
 "quote>) εξαρτάται από το ποιός έγραψε το λογισμικό του BIOS:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS "
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr ""
@@ -2035,13 +2052,13 @@ msgstr ""
 "test) "
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS "
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2051,25 +2068,25 @@ msgstr ""
 "keycombo>, ή <keycap>Delete</keycap> στη διάρκεια του POST"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS "
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "πλήκτρο <keycap>Esc</keycap> στη διάρκεια του POST"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS "
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -2081,13 +2098,13 @@ msgstr ""
 "keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS "
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2100,7 +2117,7 @@ msgstr ""
 "keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2110,7 +2127,7 @@ msgstr ""
 "<ulink url=\"&url-invoking-bios-info;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2126,13 +2143,13 @@ msgstr ""
 "Προσπαθείστε να κοιτάξετε το <ulink url=\"&url-simtel;\"></ulink>."
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Επιλογή συσκευής εκκίνησης"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
@@ -2154,7 +2171,7 @@ msgstr ""
 "του &debian;."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2167,7 +2184,7 @@ msgstr ""
 "ελεγκτή σας."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2184,7 +2201,7 @@ msgstr ""
 "από τη συσκευή USB."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2197,13 +2214,13 @@ msgstr ""
 "γίνει από τον σκληρό δίσκο."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Αλλαγή της σειράς εκκίνησης σε υπολογιστές με IDE"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2216,7 +2233,7 @@ msgstr ""
 "υλικού σας για τον ακριβή συνδυασμό πλήκτρων."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2227,20 +2244,20 @@ msgstr ""
 "δίσκους."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr ""
 "Συνηθισμένες ακολουθίες σε μηχανήματα IDE είναι οι C, A, cdrom ή A, C, cdrom."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C είναι ο σκληρός δίσκος και A η συσκευή δισκέττας."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2252,7 +2269,7 @@ msgstr ""
 "<keycap>Page Down</keycap> δίνουν κυκλικά τις διάφορες πιθανές επιλογές."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2262,13 +2279,13 @@ msgstr ""
 "αλλαγές στον υπολογιστή σας."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Αλλαγή σειράς εκκίνησης σε υπολογιστές με SCSI"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
@@ -2277,7 +2294,7 @@ msgstr ""
 "πρόγραμμα ρύθμισης του SCSI."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2288,7 +2305,7 @@ msgstr ""
 "εκκίνηση του υπολογιστή σας."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2301,13 +2318,13 @@ msgstr ""
 "τον ακριβή συνδυασμό."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Βρείτε το βοήθημα για την αλλαγή της σειράς εκκίνησης."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2315,7 +2332,7 @@ msgstr ""
 "Ρυθμίστε ώστε η συσκευή με το SCSI ID του CD-ROM να είναι πρώτη στη λίστα."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2326,19 +2343,19 @@ msgstr ""
 "keycap>."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Διάφορες άλλες ρυθμίσεις στο BIOS"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "Ρυθμίσεις για το CD-ROM"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2353,13 +2370,13 @@ msgstr ""
 "προβλήματος."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Εκτεταμένη εναντίον Επεκταμένης Μνήμης"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2374,13 +2391,13 @@ msgstr ""
 "χρησιμοποιήσει expanded μνήμη."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Προστασία από Ιούς"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2408,13 +2425,13 @@ msgstr ""
 "para> </footnote>."
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Σκιώδης Μνήμη"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2442,13 +2459,13 @@ msgstr ""
 "υλικού σας."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Οπή Μνήμης"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2460,7 +2477,7 @@ msgstr ""
 "βρει μνήμη στη θέση αυτή αν έχετε αρκετή RAM."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2481,13 +2498,13 @@ msgstr ""
 "δούλευε με τη ρύθμιση αυτή ενώ χωρίς αυτήν όχι."
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Προχωρημένη Διαχείριση Ισχύος (APM)"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2504,13 +2521,13 @@ msgstr ""
 "κάνοντας καλλίτερη δουλειά στη διαχείριση ισχύος από το BIOS."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Επίκληση του OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2527,7 +2544,7 @@ msgstr ""
 "μηχάνημά σας."
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2546,7 +2563,7 @@ msgstr ""
 "powerpc-faq;\"></ulink> για περισσότερες υποδείξεις."
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2572,7 +2589,7 @@ msgstr ""
 "με το OpenFirmware."
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2596,13 +2613,13 @@ msgstr ""
 "μνήμη nvram."
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Κλήση του OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2619,7 +2636,7 @@ msgstr ""
 "script."
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2641,7 +2658,7 @@ msgstr ""
 "νεώτερου τύπου."
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2656,7 +2673,7 @@ msgstr ""
 "χρησιμοποιείτε κάποιο διαφορετικό πρόγραμμα."
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2677,7 +2694,7 @@ msgstr ""
 "openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2721,7 +2738,7 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2752,19 +2769,19 @@ msgstr ""
 "</screen></informalexample> και στο Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1 "
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Ρύθμιση του BIOS"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2789,7 +2806,7 @@ msgstr ""
 "based και όχι character-based."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2810,7 +2827,7 @@ msgstr ""
 "δυνατότητα είναι διαθέσιμες."
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2837,13 +2854,13 @@ msgstr ""
 "βήματα εγκατάστασης που αφορούν ειδικά το &debian;."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Φυσικές εγκαταστάσεις και εγκαταστάσεις σε LPAR "
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2860,13 +2877,13 @@ msgstr ""
 "Linux."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Εγκατάσταση σαν VM guest"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2883,13 +2900,21 @@ msgstr ""
 "για να τρέξετε Linux."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "Πρέπει να αντιγράψετε όλα τα αρχεία από τον υπο-κατάλογο <filename>generic</"
 "filename> στον CMS δίσκο σας. Σιγουρευτείτε ότι μεταφέρετε τα αρχεία "
@@ -2897,13 +2922,13 @@ msgstr ""
 "εκτελέσιμη μορφή με ένα προκαθορισμένο μήκος 80 χαρακτήρων."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Ρύθμιση ενός server εγκατάστασης"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2918,7 +2943,7 @@ msgstr ""
 "HTTP ή FTP."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2933,26 +2958,26 @@ msgstr ""
 "όλων των CD εγκατάστασης σε ένα τέτοιο δέντρο καταλόγων."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 "ΔΙΟΡΘΩΣΕ ΜΕ: χρειάζονται περισσότερες πληροφορίες &mdash; από ένα Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Ζητήματα που θα πρέπει να προσέξετε για το υλικό"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Υποστήριξη USB στο BIOS και πληκτρολόγια"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2974,13 +2999,13 @@ msgstr ""
 "keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Ορατότητα οθόνης σε μηχανήματα OldWorld Powermac"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -3003,6 +3028,17 @@ msgstr ""
 "να χρησιμοποιεί 256 αντί για <quote>χιλιάδες</quote> ή <quote>εκατομμύρια</"
 "quote> χρώματα."
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Οδηγίες εγκατάστασης και οδηγοί συσκευών (DASD, XPRAM, κονσόλα, ταινία, "
+#~ "z90, crypto, chandev, δίκτυο) για το Linux στην αρχιτεκτονική &arch-"
+#~ "title; χρησιμοποιώντας πυρήνα 2.4"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Οδηγοί Συσκευών και Εντολές Εγκατάστασης"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha FAQ "
 
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 542728fda..9478c52a4 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-16 21:20+0300\n"
 "Last-Translator: debian-l10n-greek <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -2091,13 +2091,17 @@ msgstr "Διαμέριση με χρήση RAID"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
 msgstr ""
 "Μπορείτε επίσης να χρησιμοποιήσετε την μέθοδο προρύθμισης για να "
 "διαμορφώσετε κατατμήσεις σε συστοιχίες RAID λογισμικού (software RAID). "
@@ -2108,7 +2112,28 @@ msgstr ""
 "\"/>."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgstr ""
+"Μπορείτε επίσης να χρησιμοποιήσετε την μέθοδο προρύθμισης για να "
+"διαμορφώσετε κατατμήσεις σε συστοιχίες RAID λογισμικού (software RAID). "
+"Υποστηρίζονται τα επίπεδα RAID 0, 1, 5, 6 και 10, η δημιουργία degraded "
+"συστοιχιών και ο προσδιορισμός εφεδρικών συσκευών. Αν χρησιμοποιείτε RAID 1 "
+"μπορείτε να προρυθμίσετε την εγκατάσταση του grub σε όλες τις συσκευές που "
+"χρησιμοποιούνται στη συστοιχία. Δείτε το <xref linkend=\"preseed-bootloader"
+"\"/>."
+
+#. Tag: para
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2125,7 +2150,7 @@ msgstr ""
 "αντιμετωπίσετε προβλήματα."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2231,13 +2256,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Έλεγχος του πώς έχουν προσαρτηθεί οι κατατμήσεις"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2258,7 +2283,7 @@ msgstr ""
 "τέτοια θα προσαρτηθούν με βάση το UUID."
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2268,7 +2293,7 @@ msgstr ""
 "να χρησιμοποιούν τα παραδοσιακά ονόματά τους αντί των UUID."
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2286,7 +2311,7 @@ msgstr ""
 "απρόβλεπτη."
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2304,13 +2329,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "Εγκατάσταση του βασικού συστήματος"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2322,7 +2347,7 @@ msgstr ""
 "ερωτήσεις που γίνονται αφορούν την εγκατάσταση του πυρήνα."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2356,13 +2381,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "Ρύθμιση Λογαριασμού"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2375,7 +2400,7 @@ msgstr ""
 "κρυπτογραφημένο (clear text) είτε MD5 <emphasis>hashes</emphasis>."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2392,7 +2417,7 @@ msgstr ""
 "force attacks)."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2454,7 +2479,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2475,7 +2500,7 @@ msgstr ""
 "την εντολή <command>sudo</command>)."
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
@@ -2484,19 +2509,19 @@ msgstr ""
 "(hash) MD5 για ένα συνθηματικό χρήστη:"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "Ρύθμιση setup"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2510,7 +2535,7 @@ msgstr ""
 "προαιρετικά να προσθέσετε και άλλες (τοπικές) \"αποθήκες\" πακέτων."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2574,13 +2599,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "Επιλογή πακέτων"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2591,73 +2616,73 @@ msgstr ""
 "αυτό το κείμενο:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "Κανονικό σύστημα"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "επιφάνεια εργασίας"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "επιφάνεια εργασίας gnome"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "επιφάνεια εργασίας kde"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "Server ιστοσελίδων"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "Server εκτυπώσεων"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "server oνοματοδοσίας (dns-server)"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "Server αρχείων"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "Server αλληλογραφίας"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "Βάση δεδομένων SQL"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "Φορητός υπολογιστής"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2670,7 +2695,7 @@ msgstr ""
 "<userinput>Κανονικό σύστημα</userinput>."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2687,7 +2712,7 @@ msgstr ""
 "γραμμή εντολών του πυρήνα."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2730,13 +2755,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Εγκατάσταση φορτωτή εκκίνησης"
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1087
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2816,6 +2841,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2877,7 +2904,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2890,13 +2917,13 @@ msgstr ""
 "\"preseed-account\"/>."
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "Ολοκλήρωση της εγκατάστασης"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2941,13 +2968,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Χρήση preseeding για άλλα πακέτα"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2970,19 +2997,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "Προχωρημένες επιλογές"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Εκτέλεση προσαρμοσμένων εντολών κατά την διάρκεια της εγκατάστασης."
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2993,7 +3020,7 @@ msgstr ""
 "σημεία της εγκατάστασης."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -3051,13 +3078,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "Χρήση preseeding για την αλλαγή των προκαθορισμένων τιμών"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -3085,7 +3112,7 @@ msgstr ""
 "προρύθμισης."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -3100,7 +3127,7 @@ msgstr ""
 "Δείτε την υποσημείωση στο κεφάλαιο <xref linkend=\"preseed-bootparms\"/>."
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -3124,13 +3151,13 @@ msgstr ""
 "quote> παραμέτρους."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Αλυσιδωτή φόρτωση (chainloading) αρχείων προρυθμίσεων"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -3147,7 +3174,7 @@ msgstr ""
 "συγκεκριμένες διαμορφώσεις σε άλλα αρχεία."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -3209,7 +3236,7 @@ msgstr ""
 " #d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/el/random-bits.po b/po/el/random-bits.po
index edeb70838..ea06d73ad 100644
--- a/po/el/random-bits.po
+++ b/po/el/random-bits.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-13 19:08+0300\n"
 "Last-Translator: debian-l10n-greek <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -843,8 +843,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "Διακομιστής DNS"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -859,13 +887,13 @@ msgstr ""
 "περίπου 350ΜΒ για κατέβασμα των πακέτων και εγκατάσταση."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Εγκαθιστώντας το &debian-gnu; από ένα Σύστημα Unix/Linux"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -889,7 +917,7 @@ msgstr ""
 "περιβάλλον &debian; chroot."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -898,16 +926,16 @@ msgid ""
 "also a clever way for dealing with hardware that otherwise doesn't play "
 "friendly with various boot or installation media."
 msgstr ""
-"Από τη στιγμή που έχετε ρυθμίσει το καινούριο &debian; σύστημά σας σύμφωνα με "
-"τις προτιμήσεις σας, μπορείτε να μεταφέρετε τα υπάρχοντα δεδομένα σας (αν "
+"Από τη στιγμή που έχετε ρυθμίσει το καινούριο &debian; σύστημά σας σύμφωνα "
+"με τις προτιμήσεις σας, μπορείτε να μεταφέρετε τα υπάρχοντα δεδομένα σας (αν "
 "υπάρχουν) σε αυτό, και να συνεχίσετε να δουλεύετε. Πρόκειται λοιπόν για μια "
-"εγκατάσταση &debian-gnu; με <quote>μηδενικό χρόνο μη λειτουργίας</"
-"quote>. Είναι επίσης και ένας έξυπνος τρόπος να αντιμετωπίσει κανείς "
-"δυσκολίες με υλικό που διαφορετικά δεν είναι φιλικό με διάφορα μέσα "
-"εκκίνησης ή εγκατάστασης."
+"εγκατάσταση &debian-gnu; με <quote>μηδενικό χρόνο μη λειτουργίας</quote>. "
+"Είναι επίσης και ένας έξυπνος τρόπος να αντιμετωπίσει κανείς δυσκολίες με "
+"υλικό που διαφορετικά δεν είναι φιλικό με διάφορα μέσα εκκίνησης ή "
+"εγκατάστασης."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -921,22 +949,23 @@ msgid ""
 msgstr ""
 "Καθώς πρόκειται κυρίως για μια διαδικασία με το χέρι, θα πρέπει να έχετε "
 "υπόψη ότι θα απαιτηθεί να κάνετε οι ίδιοι μεγάλο μέρος των βασικών ρυθμίσεων "
-"του συστήματος, κάτι που επίσης απαιτεί μεγαλύτερη γνώση του &debian; και του "
-"&arch-kernel; γενικά από την πραγματοποίηση μιας συνηθισμένης εγκατάστασης. "
-"Δεν θα πρέπει να περιμένετε ότι αυτή η διαδικασία θα οδηγήσει σε ένα σύστημα "
-"που θα είναι ταυτόσημο με αυτό που θα προκύψει από μια συνηθισμένη "
-"εγκατάσταση. Θα πρέπει ακόμα να κρατήσετε στο μυαλό σας ότι η παρούσα "
-"διαδικασία σας δίνει τα βασικά μόνο βήματα διαμόρφωσης ενός συστήματος. "
-"Πιθανόν να χρειάζονται επιπρόσθετα βήματα εγκατάστασης και/ή ρύθμισης."
+"του συστήματος, κάτι που επίσης απαιτεί μεγαλύτερη γνώση του &debian; και "
+"του &arch-kernel; γενικά από την πραγματοποίηση μιας συνηθισμένης "
+"εγκατάστασης. Δεν θα πρέπει να περιμένετε ότι αυτή η διαδικασία θα οδηγήσει "
+"σε ένα σύστημα που θα είναι ταυτόσημο με αυτό που θα προκύψει από μια "
+"συνηθισμένη εγκατάσταση. Θα πρέπει ακόμα να κρατήσετε στο μυαλό σας ότι η "
+"παρούσα διαδικασία σας δίνει τα βασικά μόνο βήματα διαμόρφωσης ενός "
+"συστήματος. Πιθανόν να χρειάζονται επιπρόσθετα βήματα εγκατάστασης και/ή "
+"ρύθμισης."
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "Ξεκινώντας"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -953,7 +982,7 @@ msgstr ""
 "περιβάλλον επιφάνειας εργασίας όπως το GNOME ή το KDE)."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -972,7 +1001,7 @@ msgstr ""
 "αρχείων ext2, παραλήψτε την παράμετρο <userinput>-j</userinput>."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -986,8 +1015,8 @@ msgid ""
 "it is referenced later below."
 msgstr ""
 "Διαμορφώστε και ενεργοποιήστε μια κατάτμηση swap (αντικαταστήστε τον αριθμό "
-"της κατάτμησης μ' αυτόν της κατάτμησης swap του δικού σας συστήματος &debian;):"
-"<informalexample><screen>\n"
+"της κατάτμησης μ' αυτόν της κατάτμησης swap του δικού σας συστήματος "
+"&debian;):<informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -998,7 +1027,7 @@ msgstr ""
 "αυτό παρακάτω."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -1008,7 +1037,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst "
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -1020,13 +1049,13 @@ msgstr ""
 "αυτούς τους καταλόγους χειροκίνητα πριν προχωρήσετε στο επόμενο στάδιο."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Εγκαθιστώντας με το <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -1052,7 +1081,7 @@ msgstr ""
 "και εγκαταστήστε το <command>debootstrap</command>."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -1080,7 +1109,7 @@ msgstr ""
 "root για να εγκαταστήσετε τα αρχεία αυτά."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1092,13 +1121,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv "
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Τρέξτε το <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -1116,7 +1145,7 @@ msgstr ""
 "\"></ulink>."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1128,7 +1157,7 @@ msgstr ""
 "αντί του ενός http URL: <userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1149,7 +1178,7 @@ msgstr ""
 "<userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1159,13 +1188,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian "
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Ρύθμιση του βασικού συστήματος"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1183,19 +1212,19 @@ msgstr ""
 "του &debian;, για παράδειγμα:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable> "
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "Δημιουργία αρχείων συσκευών"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1216,13 +1245,13 @@ msgstr ""
 "classname>) ή στατικά αρχεία συσκευών για το καινούριο σύστημα."
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "Μερικές απο τις διαθέσιμες επιλογές είναι:"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr ""
@@ -1230,7 +1259,7 @@ msgstr ""
 "χρησιμοποιώντας"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1240,7 +1269,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1249,7 +1278,7 @@ msgstr ""
 "<command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1262,13 +1291,13 @@ msgstr ""
 "η επιλογή αυτή θα πρέπει να χρησιμοποιείται μόνο με προσοχή"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Προσαρτήστε τα τμήματα"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You need to create <filename>/etc/fstab</filename>. "
@@ -1395,13 +1424,13 @@ msgstr ""
 "συνεχίσετε:"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1413,19 +1442,19 @@ msgstr ""
 "από το chroot κατάλογο:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Ρύθμιση της Χρονικής Ζώνης"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1439,7 +1468,7 @@ msgstr ""
 "καθορίσετε αυτή την επιλογή και να διαλέξετε την χρονική ζώνη."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1449,13 +1478,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata "
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "Ρύθμιση Δικτύου"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1581,13 +1610,13 @@ msgstr ""
 "της διεπαφής (eth0, eth1, etc.)."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Ρύθμιση του Apt"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1614,13 +1643,13 @@ msgstr ""
 "λίστα των πηγών τρέξατε <userinput>aptitude update</userinput>."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Ρύθμιση πληκτρολογίου και τοπικοποίησης"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1641,7 +1670,7 @@ msgstr ""
 "απαραίτητο):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1651,7 +1680,7 @@ msgstr ""
 "# dpkg-reconfigure console-data "
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1661,13 +1690,13 @@ msgstr ""
 "περιβάλλον chroot, αλλά θα ρυθμιστεί με την επόμενη επανεκκίνηση."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Εγκατάσταση ενός Πυρήνα"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1678,19 +1707,19 @@ msgstr ""
 "πυρήνες με την εντολή:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage; "
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1698,13 +1727,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Ρύθμιση του Φορτωτή Εκκίνησης (Boot Loader)"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1720,7 +1749,7 @@ msgstr ""
 "σύστημα &debian; για να κάνετε κάτι τέτοιο."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1754,7 +1783,7 @@ msgstr ""
 "που αντιστοιχεί στο σύστημα μέσα από το οποίο την εκτελείτε)."
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1778,7 +1807,7 @@ msgstr ""
 "λειτουργικό αρχείο <filename>/boot/grub/menu.lst</filename>."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1791,13 +1820,13 @@ msgstr ""
 "παραρτήματος."
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Εδώ είναι ένα <filename>/etc/lilo.conf</filename> σαν παράδειγμα:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1819,7 +1848,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1839,7 +1868,7 @@ msgstr ""
 "σύστημα μέσα από το οποίο το τρέχετε)."
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1870,13 +1899,13 @@ msgstr ""
 "userinput>."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Τελευταίες πινελιές"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1896,7 +1925,7 @@ msgstr ""
 "<command>aptitude</command> για να εγκαταστήσετε μεμονωμένα πακέτα."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1908,19 +1937,19 @@ msgstr ""
 "ελευθερώσετε λίγο χώρο στον δίσκο τρέχοντας την εντολή:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean "
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "Εγκαθιστώντας το &debian-gnu; πάνω από Parallel Line IP (PLIP)"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1933,11 +1962,11 @@ msgstr ""
 "υπολογιστή χωρίς κάρτα Ethernet, αλλά μόνο μ' έναν απομακρυσμένο υπολογιστή "
 "σαν πύλη συνδεδεμένο μέσω ενός καλωδίου Null-Modem (που λέγεται επίσης και "
 "καλώδιο Null-Printer). Ο υπολογιστής-πύλη θα πρέπει να είναι συνδεδεμένος σ' "
-"ένα δίκτυο που να διαθέτει ένα καθρέφτη της αρχειοθήκης του &debian; (πχ. στο "
-"Διαδίκτυο)."
+"ένα δίκτυο που να διαθέτει ένα καθρέφτη της αρχειοθήκης του &debian; (πχ. "
+"στο Διαδίκτυο)."
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1954,7 +1983,7 @@ msgstr ""
 "χώρο διευθύνσεων του δικτύου σας)."
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1966,7 +1995,7 @@ msgstr ""
 "\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1980,13 +2009,13 @@ msgstr ""
 "<literal>io=0x378</literal>, <literal>irq=7</literal>."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "Απαιτήσεις"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1996,13 +2025,13 @@ msgstr ""
 "οποίον θα εγκατασταθεί το &debian;."
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "Μέσα εγκατάστασης; δείτε <xref linkend=\"installation-media\"/>."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -2012,7 +2041,7 @@ msgstr ""
 "<emphasis>αφετηρία</emphasis>, που θα λειτουργήσει σαν πύλη."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -2024,13 +2053,13 @@ msgstr ""
 "το καλώδιο και οδηγίες για το πώς να το φτιάξετε οι ίδιοι."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "Ρύθμιση της αφετηρίας"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -2040,7 +2069,7 @@ msgstr ""
 "αφετηρίας σαν πύλη στο Διαδίκτυο χρησιμοποιώντας ppp0."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -2082,13 +2111,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "Εγκατάσταση στο σύστημα προορισμού"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2115,13 +2144,13 @@ msgstr ""
 "κατά τα διάφορα στάδια της εγκατάστασης."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Φόρτωση συνιστωσών του εγκαταστάτη από το CD"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2131,13 +2160,13 @@ msgstr ""
 "καταστήσει διαθέσιμους τους οδηγούς PLIP στο σύστημα εγκατάστασης."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Ανίχνευση υλικού δικτύου"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2153,7 +2182,7 @@ msgstr ""
 "δικτύου, ο εγκαταστάτης δεν θα εμφανίσει αυτή τη λίστα."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2165,19 +2194,19 @@ msgstr ""
 "λίστα. Επιλέξτε τον οδηγό του αρθρώματος <userinput>plip</userinput>."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "Ρύθμιση του Δικτύου "
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Αυτόματη ρύθμιση του δικτύου με DHCP: Όχι"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2185,7 +2214,7 @@ msgstr ""
 "Διεύθυνση IP: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2195,7 +2224,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2206,14 +2235,14 @@ msgstr ""
 "<filename>/etc/resolv.conf</filename>). "
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr ""
 "Εγκαθιστώντας το &debian-gnu; χρησιμοποιώντας PPP over Ethernet (PPPoE)"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2229,7 +2258,7 @@ msgstr ""
 "πετύχετε πολύ απλά. Η ενότητα αυτή εξηγεί το πώς."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2241,7 +2270,7 @@ msgstr ""
 "(δείτε το <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2256,7 +2285,7 @@ msgstr ""
 "\"> ή δισκέττες</phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2266,7 +2295,7 @@ msgstr ""
 "εγκατάσταση. Τα επόμενα βήματα εξηγούν τις διαφορές."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2283,7 +2312,7 @@ msgstr ""
 "φορτωθεί και θα εκτελεστεί αυτόματα."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2304,7 +2333,7 @@ msgstr ""
 "στο προτρεπτικό εκκίνησης. </para> </footnote>)."
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2314,7 +2343,7 @@ msgstr ""
 "αναγνωριστούν οποιεσδήποτε κάρτες Ethernet υπάρχουν στο σύστημα."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2327,7 +2356,7 @@ msgstr ""
 "συνδέσεις PPPoE)."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2344,7 +2373,7 @@ msgstr ""
 "PPPoE</guimenuitem> από το κύριο μενού του εγκαταστάτη."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2355,7 +2384,7 @@ msgstr ""
 "για την σύνδεση PPPoE)."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2377,13 +2406,13 @@ msgstr ""
 "μενού."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "Ο γραφικός εγκαταστάτης"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2398,7 +2427,7 @@ msgstr ""
 "αλλά με ένα διαφορετικό frontend."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2417,7 +2446,7 @@ msgstr ""
 "μπορούν να εμφανιστούν σε μια και μόνο οθόνη."
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2440,7 +2469,7 @@ msgstr ""
 "επιλογή <quote>Βοήθεια</quote> από το μενού εκκίνησης."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2459,7 +2488,7 @@ msgstr ""
 "για δοκιμές."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2479,7 +2508,7 @@ msgstr ""
 "συστήματα."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2489,7 +2518,7 @@ msgstr ""
 "εισάγετε παραμέτρους εκκίνησης όταν ξεκινάτε τον γραφικό εγκαταστάτη."
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2503,7 +2532,7 @@ msgstr ""
 "quote>."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2518,13 +2547,13 @@ msgstr ""
 "μνήμη."
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "Χρησιμοποιώντας τον γραφικό εγκαταστάτη"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2537,7 +2566,7 @@ msgstr ""
 "<keycap>+</keycap> and <keycap>-</keycap>"
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2559,7 +2588,7 @@ msgstr ""
 "ενεργοποίηση του πλήκτρου για τη συνέχεια &BTN-CONT;."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2572,7 +2601,7 @@ msgstr ""
 "πλήκτρο <keycap>F1</keycap>."
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/el/using-d-i.po b/po/el/using-d-i.po
index 260336e75..e74d15950 100644
--- a/po/el/using-d-i.po
+++ b/po/el/using-d-i.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-16 21:38+0300\n"
 "Last-Translator: debian-l10n-greek <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -486,11 +486,25 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr ""
+"Ρύθμιση του κωδικού πρόσβασης του χρήστη root, και προσθήκη ενός μη "
+"προνομιούχου (non-root) χρήστη."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "ρύθμιση-ρολογιού"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -498,26 +512,26 @@ msgid ""
 msgstr "Ενημερώνει το ρολόι και καθορίζει αν έχει ρυθμιστεί σε ώρα UTC ή όχι."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr ""
 "Επιλογή της χρονικής ζώνης, με βάση την τοποθεσία που επιλέξατε νωρίτερα."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "προγραμμα διαμέρισης"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
@@ -533,13 +547,13 @@ msgstr ""
 "προτιμάται από το &debian;."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "πρόγραμμα διαμέρισης"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -550,13 +564,13 @@ msgstr ""
 "πρόγραμμα δημιουργίας κατατμήσεων."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -566,13 +580,13 @@ msgstr ""
 "δημιουργεί συστήματα αρχείων σύμφωνα με τις οδηγίες του χρήστη."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -582,13 +596,13 @@ msgstr ""
 "Volume Manager - Διαχειριστή Λογικών Τόμων)."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -602,13 +616,13 @@ msgstr ""
 "κάρτες."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer "
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -619,20 +633,6 @@ msgstr ""
 "επανεκκίνησή του."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr ""
-"Ρύθμιση του κωδικού πρόσβασης του χρήστη root, και προσθήκη ενός μη "
-"προνομιούχου (non-root) χρήστη."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -789,15 +789,15 @@ msgid ""
 "selecting your preferred language, keyboard layout or desired network "
 "mirror)."
 msgstr ""
-"Ας υποθέσουμε ότι ο εγκαταστάτης του &debian; έχει ξεκινήσει και είστε μπροστά "
-"στην πρώτη οθόνη του. Σ’αυτό το στάδιο, οι δυνατότητες του &d-i; είναι ακόμα "
-"αρκετά περιορισμένες. Δεν γνωρίζει πολλά για το υλικό του υπολογιστή σας, "
-"την γλώσσα που προτιμάτε, ούτε ακόμα και την επόμενη εργασία που πρόκειται "
-"να εκτελέσει. Μην ανησυχείτε. Επειδή ο &d-i; είναι αρκετά ευφυής, μπορεί να "
-"ανιχνεύσει αυτόματα το υλικό του υπολογιστή σας, να εντοπίσει τα υπόλοιπα "
-"συστατικά του και να αναβαθμιστεί ο ίδιος από μόνος του σ' ένα "
-"αποτελεσματικό σύστημα εγκατάστασης. Παρόλα αυτά, θα πρέπει ακόμα να "
-"βοηθήσετε κι άλλο τον &d-i; με μερικές πληροφορίες που δεν μπορεί να "
+"Ας υποθέσουμε ότι ο εγκαταστάτης του &debian; έχει ξεκινήσει και είστε "
+"μπροστά στην πρώτη οθόνη του. Σ’αυτό το στάδιο, οι δυνατότητες του &d-i; "
+"είναι ακόμα αρκετά περιορισμένες. Δεν γνωρίζει πολλά για το υλικό του "
+"υπολογιστή σας, την γλώσσα που προτιμάτε, ούτε ακόμα και την επόμενη εργασία "
+"που πρόκειται να εκτελέσει. Μην ανησυχείτε. Επειδή ο &d-i; είναι αρκετά "
+"ευφυής, μπορεί να ανιχνεύσει αυτόματα το υλικό του υπολογιστή σας, να "
+"εντοπίσει τα υπόλοιπα συστατικά του και να αναβαθμιστεί ο ίδιος από μόνος "
+"του σ' ένα αποτελεσματικό σύστημα εγκατάστασης. Παρόλα αυτά, θα πρέπει ακόμα "
+"να βοηθήσετε κι άλλο τον &d-i; με μερικές πληροφορίες που δεν μπορεί να "
 "προσδιορίσει αυτόματα (όπως την επιλογή της γλώσσας που προτιμάτε, την "
 "διάταξη του πληκτρολογίου ή το επιθυμητό δίκτυο καθρέφτη της αρχειοθήκης)."
 
@@ -1155,16 +1155,16 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Συχνά τα πληκτρολόγια προσαρμόζονται στους χαρακτήρες που χρησιμοποιούνται "
 "σε μια γλώσσα. Επιλέξτε μια διάταξη που ταιριάζει στο πληκτρολόγιο που "
 "χρησιμοποιείτε ή εάν η διάταξη πληκτρολογίου που θέλετε δεν υπάρχει σ' αυτόν "
 "τον κατάλογο, επιλέξετε μια παραπλήσια. Μόλις τελειώσει η εγκατάσταση του "
 "συστήματος , θα είστε σε θέση να επιλέξετε μια άλλη από ένα μεγαλύτερο εύρος "
-"επιλογών (μετά το τέλος της εγκατάστασης τρέξτε ως root <command>dpkg-reconfigure keyboard-configuration</"
-"command>)."
+"επιλογών (μετά το τέλος της εγκατάστασης τρέξτε ως root <command>dpkg-"
+"reconfigure keyboard-configuration</command>)."
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1222,9 +1222,9 @@ msgid ""
 msgstr ""
 "Κατά την εγκατάσταση με την μέθοδο <emphasis>hd-media</emphasis> , θα έρθει "
 "μια στιγμή που θα πρέπει να βρείτε και να προσαρτήσετε το εικόνα τύπου iso "
-"του Εγκαταστάτη του &debian; προκειμένου να ανακτηθεί το υπόλοιπο των αρχείων "
-"εγκατάστασης. Το συστατικό <command>iso-scan</command> κάνει ακριβώς αυτή τη "
-"δουλειά. "
+"του Εγκαταστάτη του &debian; προκειμένου να ανακτηθεί το υπόλοιπο των "
+"αρχείων εγκατάστασης. Το συστατικό <command>iso-scan</command> κάνει ακριβώς "
+"αυτή τη δουλειά. "
 
 #. Tag: para
 #: using-d-i.xml:683
@@ -1512,11 +1512,155 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Ρύθμιση των Χρηστών και των Κωδικών Πρόσβασης"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"Μετά την εγκατάσταση του βασικού συστήματος, ο εγκαταστάτης θα σας επιτρέψει "
+"να ορίσετε τον λογαριασμό του χρήστη <quote>root</quote> και/ή έναν "
+"λογαριασμό για τον πρώτο (απλό) χρήστη. Λογαριασμοί άλλων χρηστών μπορούν να "
+"δημιουργηθούν μετά την ολοκλήρωση της εγκατάστασης."
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "Ορίστε τον κωδικό πρόσβασης για τον χρήστη Root"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"O λογαριασμός του χρήστη <emphasis>root</emphasis> λέγεται συχνά και "
+"λογαριασμός <emphasis>root</emphasis>. Είναι ο λογαριασμός με την πρόσβαση "
+"που παρακάμπτει κάθε προστασία ασφάλειας στο σύστημά σας. Ο λογαριασμός "
+"αυτός πρέπει να χρησιμοποιείται μόνο για την εκτέλεση διαφόρων "
+"διαχειριστικών εργασιών στο σύστημα και για όσο το δυνατόν συντομότερο "
+"χρονικό διάστημα."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"Κάθε κωδικός πρόσβασης που δημιουργείτε πρέπει να έχει τουλάχιστον 6 "
+"χαρακτήρες, τόσο κεφαλαίους όσο και πεζούς καθώς και χαρακτήρες στίξης."
+"Προσέξτε ιδιαίτερα όταν ρυθμίζετε τον κωδικό πρόσβασης για τον χρήστη root "
+"καθώς ο λογαριασμός του χρήστη αυτού είναι τόσο ισχυρός. Αποφύγετε την χρήση "
+"οποιωνδήποτε λέξεων από το λεξικό ή οποιαδήποτε προσωπική πληροφορία που θα "
+"μπορούσε κανείς να μαντέψει."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Αν κάποιος σας πει ότι χρειάζεται τον κωδικό σας πρόσβασης σαν root να είστε "
+"εξαιρετικά επιφυλακτικοί. Δεν θα έπρεπε συνήθως να δώσετε ποτέ τον κωδικό "
+"αυτόν πρόσβασης εκτός αν διαχειρίζεστε ένα μηχάνημα με περισσότερους από "
+"έναν διαχειριστές συστήματος."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Δημιουργία ενός απλού χρήστη"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"Στο σημείο αυτό το σύστημα θα σας ρωτήσει αν θέλετε να δημιουργήσετε έναν "
+"λογαριασμό απλού χρήστη. Αυτός ο λογαριασμός θα μπορεί να είναι ο κύριος "
+"λογαριασμός προσωπικής σας πρόσβασης στο σύστημα. <emphasis>Δεν</emphasis> "
+"θα πρέπει να χρησιμοποιείτε το λογαριασμό root για την προσωπική σας είσοδο "
+"στο σύστημα."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"Γιατί όχι; Λοιπόν, ένας καταρχήν λόγος που πρέπει να αποφύγετε τη χρήση των "
+"προνομίων του χρήστη root είναι το ότι μπορείτε πολύ εύκολα να κάνετε "
+"ανεπανόρθωτη ζημιά στο σύστημα σαν root. Ένας άλλος λόγος είναι ότι έτσι "
+"μπορεί να παρασυρθείτε ώστε να τρέξετε ένα πρόγραμμα <emphasis>Δούρειο Ίππο</"
+"emphasis>, δηλ. ένα πρόγραμμα που εκμεταλλεύεται τις δυνατότητες του "
+"λογαριασμού root σαν υπερ-χρήστη ώστε να παραβιάσει την ασφάλεια του "
+"συστήματός σας πίσω από την πλάτη σας.Οποιοδήποτε καλό βιβλίο πάνω στην "
+"διαχείριση Unix συστημάτων καλύπτει αυτό το θέμα με λεπτομέρειες. &mdash; "
+"σκεφτείτε σοβαρά να διαβάσετε ένα από αυτά τα βιβλία αν δεν είστε "
+"εξοικειωμένοι με τα θέματα αυτά."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Αρχικά θα παροτρυνθείτε για το πλήρες όνομα του χρήστη, Μετά θα σας ζητηθεί "
+"να δώσετε ένα όνομα χρήστη για τον λογαριασμό; γενικά το μικρό σας όνομα ή "
+"κάτι ανάλογο θα είναι αρκετό και πραγματικά αυτό είναι η προεπιλογή. Τέλος "
+"θα σας ζητηθεί να δώσετε ένα κωδικό πρόσβασης για τον λογαριασμό."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Αν σε οποιαδήποτε άλλη φάση μετά την εγκατάσταση θελήσετε να δημιουργήσετε "
+"έναν άλλο λογαριασμό χρησιμοποιήσετε την εντολή <command>adduser</command>."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Διαμέριση και Επιλογή Σημείων Προσάρτησης"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1535,7 +1679,7 @@ msgstr ""
 "τους όπως οι RAID, LVM ή κρυπτογραφημένες συσκευές."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1545,7 +1689,7 @@ msgstr ""
 "περισσότερες λεπτομέρειες, δείτε το <xref linkend=\"partitioning\"/>."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1568,7 +1712,7 @@ msgstr ""
 "προσβάσιμα οποιαδήποτε δεδομένα που υπάρχουν ήδη στον δίσκο."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1583,13 +1727,13 @@ msgstr ""
 "guimenuitem> από το μενού."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "Υποστηριζόμενα σχήματα διαμέρισης"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1602,7 +1746,7 @@ msgstr ""
 "συσκευών δίσκων."
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1625,7 +1769,7 @@ msgstr ""
 "κάποιες εύλογες προεπιλογές."
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1636,31 +1780,31 @@ msgstr ""
 "χρησιμοποιηθούν και σε συνδυασμό."
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "Διαχείριση Λογικών Τόμων (LVM) "
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "Λογισμικό RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "Υποστηρίζονται τα επίπεδα RAID 0, 1, 4, 5, 6 and 10."
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1668,7 +1812,7 @@ msgstr ""
 "<emphasis>Serial ATA RAID</emphasis> (με χρήση <classname>dmraid</classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1682,13 +1826,13 @@ msgstr ""
 "διατίθενται στο <ulink url=\"&url-d-i-sataraid;\">our Wiki</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>Multipath</emphasis> (σε πειραματική φάση)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1700,13 +1844,13 @@ msgstr ""
 "η επιλογή αυτή κατά την εκκίνηση του εγκαταστάτη."
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "Υποστηρίζονται τα ακόλουθα συστήματα αρχείων."
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1718,7 +1862,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1730,21 +1874,21 @@ msgstr ""
 "αρχείων ext2 αν χρησιμοποιείται η καθοδηγούμενη διαμέριση."
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr ""
 "<emphasis>jfs</emphasis> (δεν είναι διαθέσιμη για όλες τις αρχιτεκτονικές)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr ""
 "<emphasis>xfs</emphasis> (δεν είναι διαθέσιμη σε όλες τις αρχιτεκτονικές)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
@@ -1753,7 +1897,7 @@ msgstr ""
 "αρχιτεκτονικές)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1768,13 +1912,13 @@ msgstr ""
 "αρχείων."
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1785,13 +1929,13 @@ msgstr ""
 "jffs2."
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1802,19 +1946,19 @@ msgstr ""
 "κατατμήσεων με αυτό το σύστημα αρχείων."
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (read-only)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1825,13 +1969,13 @@ msgstr ""
 "νέές κατατμήσεις με NTFS."
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "Καθοδηγούμενη Διαμέριση"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1850,7 +1994,7 @@ msgstr ""
 "para> </footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1859,7 +2003,7 @@ msgstr ""
 "όλες τις αρχιτεκτονικές."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1877,7 +2021,7 @@ msgstr ""
 "προσφέροντας έτσι επιπλέον ασφάλεια για τα (προσωπικά) σας δεδομένα."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1894,7 +2038,7 @@ msgstr ""
 "χρονοβόρο ανάλογα με το μέγεθος του δίσκου σας."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1913,7 +2057,7 @@ msgstr ""
 "αυτές τις αλλαγές πριν γραφτούν στον δίσκο."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1932,7 +2076,7 @@ msgstr ""
 "ταυτοποιήσετε."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1948,7 +2092,7 @@ msgstr ""
 "Όταν χρησιμοποιείτε LVM (με κρυπτογράφηση) αυτό δεν είναι εφικτό."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1967,73 +2111,73 @@ msgstr ""
 "1GB (εξαρτάται από το επιλεγμένο σχήμα), η διαμέριση αυτή θα αποτύχει."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Σχήμα Διαμέρισης"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Ελάχιστος χώρος"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Δημιουργημένα κατατμήσεις"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Όλα τα αρχεία σε μια κατάτμηση"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MB "
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Ξεχωριστή κατάτμηση /home"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MB "
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Ξεχωριστές κατατμήσεις /home, /usr, /var και /tmp"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry> "
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -2043,7 +2187,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -2057,7 +2201,7 @@ msgstr ""
 "δημιουργηθούν μέσα στην κατάτμηση LVM."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -2071,7 +2215,7 @@ msgstr ""
 "διαμόρφωσης για την δημιουργία με το χέρι μιας κατάτμησης εκκίνησης EFI."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -2083,7 +2227,7 @@ msgstr ""
 "διαμορφωθούν και που θα προσαρτηθούν οι διάφορες κατατμήσεις."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2136,7 +2280,7 @@ msgstr ""
 "κάνοντας διαμέριση με το χέρι."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2157,13 +2301,13 @@ msgstr ""
 "αλλαγές όπως περιγράφεται παρακάτω σχετικά με την διαμέριση  με το χέρι."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "Διαμέριση με το χέρι"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
@@ -2179,7 +2323,7 @@ msgstr ""
 "κατατμήσεων από το νέο σας σύστημα &debian;."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2195,7 +2339,7 @@ msgstr ""
 "δίσκο."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2232,7 +2376,7 @@ msgstr ""
 "<command>προγράμματος κατάτμησης</command>."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2255,7 +2399,7 @@ msgstr ""
 "μενού σάς επιτρέπει επίσης να διαγράψετε μια κατάτμηση."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2272,7 +2416,7 @@ msgstr ""
 "αφήσει να συνεχίσετε μέχρι να το προσαρτήσετε."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2284,7 +2428,7 @@ msgstr ""
 "αφήσει να συνεχίσετε μέχρι να προσδιορίσετε μια τέτοια."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2301,7 +2445,7 @@ msgstr ""
 "ή <filename>partman-lvm</filename>)"
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2316,13 +2460,13 @@ msgstr ""
 "αρχείων δημιουργήθηκαν όπως ακριβώς το ζητήσατε."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Ρύθμιση Συσκευών Πολλαπλών Δίσκων (RAID σε λογισμικό)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2344,7 +2488,7 @@ msgstr ""
 "λογισμικού (Software RAID)</firstterm>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2360,7 +2504,7 @@ msgstr ""
 "προσάρτησης κλπ.)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2483,55 +2627,55 @@ msgstr ""
 "variablelist> Ανακεφαλαιώνοντας:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Τύπος"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Ελάχιστες Συσκευές"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Εφεδρική Συσκευή"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "Επιβιώνει από την αστοχία δίσκου;"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Διαθέσιμος Χώρος"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>no</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
@@ -2539,43 +2683,43 @@ msgstr ""
 "συσκευών στη συστοιχία RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "προαιρετικό"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>ναι</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Μέγεθος του μικρότερου τμήματος στη συστοιχία RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2585,19 +2729,19 @@ msgstr ""
 "συσκευών στη συστοιχία RAID μείον μια)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2607,13 +2751,13 @@ msgstr ""
 "συσκευών στη συστοιχία RAID μείον δύο)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2623,7 +2767,7 @@ msgstr ""
 "κομματιών (chunk) (εξ' ορισμού έχει την τιμή δύο)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2634,7 +2778,7 @@ msgstr ""
 "HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2651,7 +2795,7 @@ msgstr ""
 "RAID</guimenuitem> </menuchoice>.)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2673,7 +2817,7 @@ msgstr ""
 "δυνατή επιλογή."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2692,7 +2836,7 @@ msgstr ""
 "χέρι μέσα από ένα κέλυφος."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2715,7 +2859,7 @@ msgstr ""
 "MD που επιλέξατε."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2727,7 +2871,7 @@ msgstr ""
 "τμήματα που θα αποτελέσουν την μονάδα MD."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2748,7 +2892,7 @@ msgstr ""
 "δεν θα σας αφήσει να συνεχίσετε μέχρι να διορθώσετε το πρόβλημα."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2759,7 +2903,7 @@ msgstr ""
 "emphasis> ενεργές κατατμήσεις."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2770,7 +2914,7 @@ msgstr ""
 "ενεργές κατατμήσεις."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2791,7 +2935,7 @@ msgstr ""
 "συσκευές ώστε όλα τα αντίγραφα να κατανέμονται σε διαφορετικούς δίσκους."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2810,7 +2954,7 @@ msgstr ""
 "(αρκετά αξιόπιστη κατάτμηση μεγέθους 100 GB σαν <filename>/home</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2825,13 +2969,13 @@ msgstr ""
 "γι’αυτές τα συνήθη χαρακτηριστικά όπως τα σημεία προσάρτησης."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Ρύθμιση του Διαχειριστή Λογικών Τόμων (LVM) "
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2848,7 +2992,7 @@ msgstr ""
 "ψευδοσυνδέσμων, κλπ "
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2869,7 +3013,7 @@ msgstr ""
 "τομών) μπορούν να εκτείνονται μεταξύ αρκετών φυσικών συσκευών δίσκων."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2891,7 +3035,7 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2908,7 +3052,7 @@ msgstr ""
 "<guimenuitem>φυσικός τόμος για LVM</guimenuitem> </menuchoice>."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2929,7 +3073,7 @@ msgstr ""
 "ενέργειες είναι:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2939,43 +3083,43 @@ msgstr ""
 "δομή της συσκευής LVM, ονόματα και μεγέθη των λογικών τόμων και άλλα"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Δημιουργία ομάδας τόμων"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Δημιουργία λογικού τόμου"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Διαγραφή λογικού τόμου"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Διαγραφή λογικού τόμου"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Επέκταση λογικού τόμου"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Συρρίκνωση ομάδας τόμων"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2985,7 +3129,7 @@ msgstr ""
 "<command>partman</command>"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2996,7 +3140,7 @@ msgstr ""
 "σ' αυτήν."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -3009,13 +3153,13 @@ msgstr ""
 "διαχειριστείτε σαν τέτοιες)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Ρύθμιση Κρυπτογραφημένων Τόμων"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -3039,7 +3183,7 @@ msgstr ""
 "σαν τυχαίοι χαρακτήρες."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -3063,7 +3207,7 @@ msgstr ""
 "αλλληλογραφίας ή εκτυπώσεων αποθηκεύουν τα δεδομένα τους"
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -3078,7 +3222,7 @@ msgstr ""
 "αλγόριθμο κρυπτογράφησης και το μήκος του κλειδιού κρυπτογράφησης."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -3100,7 +3244,7 @@ msgstr ""
 "κατάτμηση."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -3118,7 +3262,7 @@ msgstr ""
 "χρησιμοποιήσετε την προεπιλεγμένη μέθοδο."
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -3132,13 +3276,13 @@ msgstr ""
 "προεπιλογές, επειδή έχουν επιλεγεί με προσοχή έχοντας στο μυαλό την ασφάλεια."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Αλγόριθμος κρυπτογράφησης: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3165,13 +3309,13 @@ msgstr ""
 "κρυπτογράφησης για την προστασία ευαίσθητων πληροφοριών στον 21ο αιώνα."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Μέγεθος κλειδιού: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -3186,13 +3330,13 @@ msgstr ""
 "αλγόριθμο."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "Αλγόριθμος IV: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3211,7 +3355,7 @@ msgstr ""
 "επαναλαμβανόμενους σχηματισμούς στα κρυπτογραφημένα δεδομένα."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3226,13 +3370,13 @@ msgstr ""
 "είναι ικανό να χρησιμοποιήσει νεώτερους αλγόριθμους."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Κλειδί κρυπτογράφησης: <userinput>Συνηθηματική φράση</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr ""
@@ -3240,13 +3384,13 @@ msgstr ""
 "κατάτμηση."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Συνθηματική φράση"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3261,13 +3405,13 @@ msgstr ""
 "συνέχεια της διαδικασίας."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Τυχαίο κλειδί"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3286,7 +3430,7 @@ msgstr ""
 "διάρκεια μιας ανθρώπινης ζωής)."
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3307,13 +3451,13 @@ msgstr ""
 "που έχουν εγγραφεί στην κατάτμηση swap."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Διαγραφή δεδομένων: <userinput>ναι</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3336,7 +3480,7 @@ msgstr ""
 "para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3348,13 +3492,13 @@ msgstr ""
 "αλλάξει παρέχοντας τις ακόλουθες επιλογές:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Κρυπτογράφηση: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3368,13 +3512,13 @@ msgstr ""
 "πληροφορίες."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Κλειδί κρυπτογράφησης: <userinput>Keyfile (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr ""
@@ -3382,13 +3526,13 @@ msgstr ""
 "κατάτμηση."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Αρχείο κλειδιού (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3403,19 +3547,19 @@ msgstr ""
 "αργότερα στην διάρκεια της διαδικασίας)."
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "Παρακαλώ δείτε την ενότητα για τα τυχαία κλειδιά παραπάνω."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "Παρακαλώ δείτε την ενότητα για την διαγραφή των δεδομένων παραπάνω."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3435,7 +3579,7 @@ msgstr ""
 "διαρκέσει αρκετό χρόνο."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3453,7 +3597,7 @@ msgstr ""
 "κατοικιδίων, ονόματα μελών της οικογένειάς σας ή συγγενών, κ.λπ.)."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3479,7 +3623,7 @@ msgstr ""
 "εισάγατε την συνθηματική φράση για το ριζικό σύστημα αρχείων."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3503,7 +3647,7 @@ msgstr ""
 "πρέπει να επαναληφθεί για κάθε κατάτμηση που πρόκειται να κρυπτογραφηθεί."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3538,7 +3682,7 @@ msgstr ""
 "συστημάτων αρχείων αν τα προεπιλεγμένα δεν σας ταιριάζουν."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3558,7 +3702,7 @@ msgstr ""
 "<xref linkend=\"mount-encrypted-volumes\"/>.σ"
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3568,13 +3712,13 @@ msgstr ""
 "εγκατάσταση."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "Εγκατάσταση του Βασικού Συστήματος"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3589,7 +3733,7 @@ msgstr ""
 "ώρα."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3606,7 +3750,7 @@ msgstr ""
 "<keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3618,7 +3762,7 @@ msgstr ""
 "εκεί αν η εγκατάσταση γίνεται μέσω μιας σειριακής κονσόλας."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3633,7 +3777,7 @@ msgstr ""
 "πυρήνων."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3650,7 +3794,7 @@ msgstr ""
 "από την σκοπιά των συντηρητών των πακέτων, να εγκαθίστανται μαζί με αυτό."
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3664,145 +3808,6 @@ msgstr ""
 "σημείο της διαδικασίας εγκατάστασης."
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "Ρύθμιση των Χρηστών και των Κωδικών Πρόσβασης"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"Μετά την εγκατάσταση του βασικού συστήματος, ο εγκαταστάτης θα σας επιτρέψει "
-"να ορίσετε τον λογαριασμό του χρήστη <quote>root</quote> και/ή έναν "
-"λογαριασμό για τον πρώτο (απλό) χρήστη. Λογαριασμοί άλλων χρηστών μπορούν να "
-"δημιουργηθούν μετά την ολοκλήρωση της εγκατάστασης."
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "Ορίστε τον κωδικό πρόσβασης για τον χρήστη Root"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"O λογαριασμός του χρήστη <emphasis>root</emphasis> λέγεται συχνά και "
-"λογαριασμός <emphasis>root</emphasis>. Είναι ο λογαριασμός με την πρόσβαση "
-"που παρακάμπτει κάθε προστασία ασφάλειας στο σύστημά σας. Ο λογαριασμός "
-"αυτός πρέπει να χρησιμοποιείται μόνο για την εκτέλεση διαφόρων "
-"διαχειριστικών εργασιών στο σύστημα και για όσο το δυνατόν συντομότερο "
-"χρονικό διάστημα."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"Κάθε κωδικός πρόσβασης που δημιουργείτε πρέπει να έχει τουλάχιστον 6 "
-"χαρακτήρες, τόσο κεφαλαίους όσο και πεζούς καθώς και χαρακτήρες στίξης."
-"Προσέξτε ιδιαίτερα όταν ρυθμίζετε τον κωδικό πρόσβασης για τον χρήστη root "
-"καθώς ο λογαριασμός του χρήστη αυτού είναι τόσο ισχυρός. Αποφύγετε την χρήση "
-"οποιωνδήποτε λέξεων από το λεξικό ή οποιαδήποτε προσωπική πληροφορία που θα "
-"μπορούσε κανείς να μαντέψει."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Αν κάποιος σας πει ότι χρειάζεται τον κωδικό σας πρόσβασης σαν root να είστε "
-"εξαιρετικά επιφυλακτικοί. Δεν θα έπρεπε συνήθως να δώσετε ποτέ τον κωδικό "
-"αυτόν πρόσβασης εκτός αν διαχειρίζεστε ένα μηχάνημα με περισσότερους από "
-"έναν διαχειριστές συστήματος."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "Δημιουργία ενός απλού χρήστη"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"Στο σημείο αυτό το σύστημα θα σας ρωτήσει αν θέλετε να δημιουργήσετε έναν "
-"λογαριασμό απλού χρήστη. Αυτός ο λογαριασμός θα μπορεί να είναι ο κύριος "
-"λογαριασμός προσωπικής σας πρόσβασης στο σύστημα. <emphasis>Δεν</emphasis> "
-"θα πρέπει να χρησιμοποιείτε το λογαριασμό root για την προσωπική σας είσοδο "
-"στο σύστημα."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"Γιατί όχι; Λοιπόν, ένας καταρχήν λόγος που πρέπει να αποφύγετε τη χρήση των "
-"προνομίων του χρήστη root είναι το ότι μπορείτε πολύ εύκολα να κάνετε "
-"ανεπανόρθωτη ζημιά στο σύστημα σαν root. Ένας άλλος λόγος είναι ότι έτσι "
-"μπορεί να παρασυρθείτε ώστε να τρέξετε ένα πρόγραμμα <emphasis>Δούρειο Ίππο</"
-"emphasis>, δηλ. ένα πρόγραμμα που εκμεταλλεύεται τις δυνατότητες του "
-"λογαριασμού root σαν υπερ-χρήστη ώστε να παραβιάσει την ασφάλεια του "
-"συστήματός σας πίσω από την πλάτη σας.Οποιοδήποτε καλό βιβλίο πάνω στην "
-"διαχείριση Unix συστημάτων καλύπτει αυτό το θέμα με λεπτομέρειες. &mdash; "
-"σκεφτείτε σοβαρά να διαβάσετε ένα από αυτά τα βιβλία αν δεν είστε "
-"εξοικειωμένοι με τα θέματα αυτά."
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Αρχικά θα παροτρυνθείτε για το πλήρες όνομα του χρήστη, Μετά θα σας ζητηθεί "
-"να δώσετε ένα όνομα χρήστη για τον λογαριασμό; γενικά το μικρό σας όνομα ή "
-"κάτι ανάλογο θα είναι αρκετό και πραγματικά αυτό είναι η προεπιλογή. Τέλος "
-"θα σας ζητηθεί να δώσετε ένα κωδικό πρόσβασης για τον λογαριασμό."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Αν σε οποιαδήποτε άλλη φάση μετά την εγκατάσταση θελήσετε να δημιουργήσετε "
-"έναν άλλο λογαριασμό χρησιμοποιήσετε την εντολή <command>adduser</command>."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4480,8 +4485,8 @@ msgstr ""
 "να ελέγξει εάν υπάρχουν εγκατεστημένα κι άλλα λειτουργικά συστήματα στον "
 "υπολογιστή. Εάν βρει υποστηριζόμενα λειτουργικά συστήματα, θα πληροφορηθείτε "
 "γι'αυτά στη διάρκεια του σταδίου εγκατάστασης του φορτωτή εκκίνησης, και ο "
-"υπολογιστής θα ρυθμιστεί έτσι ώστε να εκκινεί, εκτός από το &debian;, και άλλα "
-"λειτουργικά συστήματα."
+"υπολογιστής θα ρυθμιστεί έτσι ώστε να εκκινεί, εκτός από το &debian;, και "
+"άλλα λειτουργικά συστήματα."
 
 #. Tag: para
 #: using-d-i.xml:2603
@@ -4760,14 +4765,21 @@ msgstr "Επιλέξτε το σωστό τμήμα!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "Τα κριτήρια για την επιλογή μιας κατάτμησης είναι να έχει ένα FAT σύστημα "
 "αρχείων με ενεργοποιημένη τη σήμανση εκκίνησης <emphasis>boot</emphasis>. Ο "
@@ -4910,8 +4922,8 @@ msgid ""
 msgstr ""
 "Είναι ο ίδιος  ο πυρήνας συμπιεσμένος. Είναι αντίγραφο του αρχείου το οποίο "
 "αναφέρεται μέσα στο <filename>/etc/elilo.conf</filename>. Σε μια τυπική "
-"&debian; εγκατάσταση θα ήταν το αρχείο στο <filename>/boot</filename> το οποίο "
-"δείχνει μεσώ συμβολικού δεσμού το αρχείο <filename>/vmlinuz</filename>."
+"&debian; εγκατάσταση θα ήταν το αρχείο στο <filename>/boot</filename> το "
+"οποίο δείχνει μεσώ συμβολικού δεσμού το αρχείο <filename>/vmlinuz</filename>."
 
 #. Tag: title
 #: using-d-i.xml:2876
diff --git a/po/es/administrivia.po b/po/es/administrivia.po
index 7c633e996..1a80dafb8 100644
--- a/po/es/administrivia.po
+++ b/po/es/administrivia.po
@@ -32,7 +32,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-10 17:55+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -56,10 +56,15 @@ msgstr "Acerca de este documento"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This manual was created for Sarge's debian-installer, based on the Woody "
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -231,9 +236,17 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Many, many &debian; users and developers contributed to this document. "
+#| "Particular note must be made of Michael Schmitz (m68k support), Frank "
+#| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
+#| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
+#| "(SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous "
+#| "edits and text. We have to thank Pascal Le Bail for useful information "
+#| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/es/bookinfo.po b/po/es/bookinfo.po
index 75afe300e..34435ed5d 100644
--- a/po/es/bookinfo.po
+++ b/po/es/bookinfo.po
@@ -31,7 +31,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-10 16:44+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -65,22 +65,33 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Esta guía de instalación está basada en un manual escrito con anterioridad "
-"para el antiguo sistema de instalación de &debian; (los <quote>boot-floppies</"
-"quote>), y ha sido actualizado para documentar el nuevo instalador de "
-"&debian;. Sin embargo, el manual no ha sido actualizado y revisado para "
+"para el antiguo sistema de instalación de &debian; (los <quote>boot-"
+"floppies</quote>), y ha sido actualizado para documentar el nuevo instalador "
+"de &debian;. Sin embargo, el manual no ha sido actualizado y revisado para "
 "adecuarse al nuevo instalador para &architecture;. Aún hay partes del manual "
 "incompletas, que están desactualizadas o que documentan el instalador «boot-"
 "floppies». Puede encontrar una nueva versión de este manual, que "
diff --git a/po/es/hardware.po b/po/es/hardware.po
index 0074ae6ab..3ad963ac1 100644
--- a/po/es/hardware.po
+++ b/po/es/hardware.po
@@ -38,7 +38,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-10 22:56+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -89,9 +89,9 @@ msgstr ""
 "caso, cualquier arquitectura o plataforma a la que se haya adaptado el "
 "núcleo Linux o kFreeBSD, libc, <command>gcc</command>, etc., y para los que "
 "exista una adaptación de &debian;, puede ejecutar &debian;. Por favor, "
-"diríjase a las páginas de adaptaciones en "
-"<ulink url=\"&url-ports;\"></ulink> para más información sobre sistemas de "
-"arquitectura &arch-title; probados con &debian-gnu;."
+"diríjase a las páginas de adaptaciones en <ulink url=\"&url-ports;\"></"
+"ulink> para más información sobre sistemas de arquitectura &arch-title; "
+"probados con &debian-gnu;."
 
 #. Tag: para
 #: hardware.xml:32
@@ -118,9 +118,9 @@ msgid ""
 "&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
-"&debian; GNU/Linux &release; permite el uso de once arquitecturas principales "
-"y algunas variaciones de cada arquitectura conocidas como <quote>sabores</"
-"quote>."
+"&debian; GNU/Linux &release; permite el uso de once arquitecturas "
+"principales y algunas variaciones de cada arquitectura conocidas como "
+"<quote>sabores</quote>."
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
@@ -594,8 +594,8 @@ msgid ""
 "<emphasis>any</emphasis> ARM CPU."
 msgstr ""
 "Cada arquitectura de ARM diferente requiere su propio núcleo. Esto es debido "
-"a que la distribución estándar de &debian; solamente permite la instalación en "
-"las plataformas más comunes. El espacio de usuario de &debian; puede "
+"a que la distribución estándar de &debian; solamente permite la instalación "
+"en las plataformas más comunes. El espacio de usuario de &debian; puede "
 "utilizarse, sin embargo, en <emphasis>cualquier</emphasis> CPU ARM "
 "incluyendo «xscale»."
 
@@ -805,15 +805,15 @@ msgstr ""
 "intentado evitarlo durante mucho tiempo pero al final ha sido necesario "
 "hacerlo debido a una serie de problemas desafortunados con el compilador y "
 "el núcleo, empezando con un error en el ABI de C++ de GCC. Aún puede "
-"ejecutar &debian; GNU/Linux en procesadores 80386 si compila su propio núcleo "
-"y recompila todos los paquetes fuente, pero esto está fuera del ámbito de "
-"este manual. </para> </footnote>. (Ninguna versión de Linux ha permitido el "
-"uso de sistemas 286 o procesadores anteriores en la serie). Aún se permiten "
-"todos los procesadores i486 y posteriores.<footnote> <para> Muchos paquetes "
-"&debian;, de hecho, se ejecutarán más rápido en sistemas más modernos como "
-"resultado (positivo) de haber descartado la compatibilidad con estos "
-"procesadores antiguos. El procesador i486, que apareció en 1989, tiene tres "
-"códigos de operación (también llamados «opcodes», son bswap, cmpxchg, y "
+"ejecutar &debian; GNU/Linux en procesadores 80386 si compila su propio "
+"núcleo y recompila todos los paquetes fuente, pero esto está fuera del "
+"ámbito de este manual. </para> </footnote>. (Ninguna versión de Linux ha "
+"permitido el uso de sistemas 286 o procesadores anteriores en la serie). Aún "
+"se permiten todos los procesadores i486 y posteriores.<footnote> <para> "
+"Muchos paquetes &debian;, de hecho, se ejecutarán más rápido en sistemas más "
+"modernos como resultado (positivo) de haber descartado la compatibilidad con "
+"estos procesadores antiguos. El procesador i486, que apareció en 1989, tiene "
+"tres códigos de operación (también llamados «opcodes», son bswap, cmpxchg, y "
 "xadd) que el i386, introducido en 1986, no tenía. Antes estos códigos no "
 "podían utilizarse fácilmente dentro de los paquetes &debian;, y ahora es "
 "posible. </para> </footnote>."
@@ -843,15 +843,15 @@ msgstr "Bus de E/S"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "El bus del sistema es la parte de la placa base que permite comunicar la CPU "
 "con los periféricos (tales como los dispositivos de almacenamiento). Su "
-"ordenador debe usar ISA, EISA, PCI, PCIe, PCI-X, o VESA Local Bus (VLB, a veces "
-"llamado el bus VL). Todos los ordenadores personales vendidos en los últimos "
-"años utilizan uno de éstos."
+"ordenador debe usar ISA, EISA, PCI, PCIe, PCI-X, o VESA Local Bus (VLB, a "
+"veces llamado el bus VL). Todos los ordenadores personales vendidos en los "
+"últimos años utilizan uno de éstos."
 
 #. Tag: para
 #: hardware.xml:484
@@ -872,20 +872,20 @@ msgid ""
 "subarchitectures, please contact the <ulink url=\"&url-list-subscribe;\"> "
 "debian-&arch-listname; mailing list</ulink>."
 msgstr ""
-"&debian; para &arch-title; es compatible con las siguientes subarquitecturas: "
-"<itemizedlist> <listitem><para> SGI IP22: esta plataforma incluye a las "
-"máquinas SGI Indy, Indigo 2 y Challenge S. Estas máquinas son muy similares, "
-"cuando este documento hable de la máquna SGI Indy, se refiere también a la "
-"Indigo 2 y Challenge S. </para></listitem> <listitem><para> SGI IP32: a esta "
-"plataforma se la conoce generalmente como SGI O2. </para></listitem> "
-"<listitem><para> MIPS Malta: QEMU emula esta plataforma y es una buena forma "
-"de ejecutar y probar &debian; sobre MIPS si no dispone del hardware. </para></"
-"listitem> </itemizedlist> Puede encontrar información detallada respecto al "
-"uso de máquinas mips/mipsel en la <ulink url=\"&url-linux-mips;\">página "
-"principal de Linux MIPS</ulink>. En lo que sigue, sólo se cubrirán los "
-"sistemas compatibles con el instalador de &debian;. Si está buscando otras "
-"subarquitecturas, por favor, contacte con la <ulink url=\"&url-list-"
-"subscribe;\">lista de correo debian-&arch-listname;</ulink>."
+"&debian; para &arch-title; es compatible con las siguientes "
+"subarquitecturas: <itemizedlist> <listitem><para> SGI IP22: esta plataforma "
+"incluye a las máquinas SGI Indy, Indigo 2 y Challenge S. Estas máquinas son "
+"muy similares, cuando este documento hable de la máquna SGI Indy, se refiere "
+"también a la Indigo 2 y Challenge S. </para></listitem> <listitem><para> SGI "
+"IP32: a esta plataforma se la conoce generalmente como SGI O2. </para></"
+"listitem> <listitem><para> MIPS Malta: QEMU emula esta plataforma y es una "
+"buena forma de ejecutar y probar &debian; sobre MIPS si no dispone del "
+"hardware. </para></listitem> </itemizedlist> Puede encontrar información "
+"detallada respecto al uso de máquinas mips/mipsel en la <ulink url=\"&url-"
+"linux-mips;\">página principal de Linux MIPS</ulink>. En lo que sigue, sólo "
+"se cubrirán los sistemas compatibles con el instalador de &debian;. Si está "
+"buscando otras subarquitecturas, por favor, contacte con la <ulink url="
+"\"&url-list-subscribe;\">lista de correo debian-&arch-listname;</ulink>."
 
 #. Tag: para
 #: hardware.xml:519
@@ -930,18 +930,18 @@ msgid ""
 "contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; "
 "mailing list</ulink>."
 msgstr ""
-"&debian; para &arch-title; es compatible con las siguientes subarquitecturas: "
-"<itemizedlist> <listitem><para> Cobalt Microserver: Sólo se cubren aquí los "
-"sistemas basados en MIPS. Esto incluye los sistemas Cobalt RaQ, Qube2, RaQ2, "
-"y el «Gateway Microserver». </para></listitem> <listitem><para> MIPS Malta: "
-"QEMU emula esta plataforma y es una buena forma de ejecutar y probar &debian; "
-"sobre MIPS si no dispone del hardware. </para></listitem> </itemizedlist> "
-"Puede encontrar información detallada respecto al uso de máquinas mips/"
-"mipsel en la <ulink url=\"&url-linux-mips;\">página principal de Linux MIPS</"
-"ulink>. En lo que sigue, sólo se cubrirán los sistemas compatibles con el "
-"instalador de &debian;. Si está buscando otras subarquitecturas, por favor, "
-"contacte con la <ulink url=\"&url-list-subscribe;\">lista de correo debian-"
-"&arch-listname;</ulink>."
+"&debian; para &arch-title; es compatible con las siguientes "
+"subarquitecturas: <itemizedlist> <listitem><para> Cobalt Microserver: Sólo "
+"se cubren aquí los sistemas basados en MIPS. Esto incluye los sistemas "
+"Cobalt RaQ, Qube2, RaQ2, y el «Gateway Microserver». </para></listitem> "
+"<listitem><para> MIPS Malta: QEMU emula esta plataforma y es una buena forma "
+"de ejecutar y probar &debian; sobre MIPS si no dispone del hardware. </"
+"para></listitem> </itemizedlist> Puede encontrar información detallada "
+"respecto al uso de máquinas mips/mipsel en la <ulink url=\"&url-linux-mips;"
+"\">página principal de Linux MIPS</ulink>. En lo que sigue, sólo se cubrirán "
+"los sistemas compatibles con el instalador de &debian;. Si está buscando "
+"otras subarquitecturas, por favor, contacte con la <ulink url=\"&url-list-"
+"subscribe;\">lista de correo debian-&arch-listname;</ulink>."
 
 #. Tag: title
 #: hardware.xml:570
@@ -994,8 +994,8 @@ msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
-"Hay dos tipos distintos de núcleo de powerpc en &debian;, en función del tipo "
-"de CPU. Son:"
+"Hay dos tipos distintos de núcleo de powerpc en &debian;, en función del "
+"tipo de CPU. Son:"
 
 #. Tag: term
 #: hardware.xml:625
@@ -1515,13 +1515,13 @@ msgid ""
 "itemizedlist> A linux kernel for these machines and limited support is "
 "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgstr ""
-"En la actualidad, los sistemas NuBus no son compatibles con &debian;/powerpc. "
-"La arquitectura monolítica del núcleo Linux/PPC no tiene permite el uso de "
-"estas máquinas; puede usar en su lugar el micronúcleo MkLinux Mach, aún no "
-"compatible con &debian;. Entre estos sistemas se incluyen los siguientes: "
-"<itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></"
-"listitem> <listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-"<listitem><para> Powerbook 1400, 2300 y 5300 </para></listitem> "
+"En la actualidad, los sistemas NuBus no son compatibles con &debian;/"
+"powerpc. La arquitectura monolítica del núcleo Linux/PPC no tiene permite el "
+"uso de estas máquinas; puede usar en su lugar el micronúcleo MkLinux Mach, "
+"aún no compatible con &debian;. Entre estos sistemas se incluyen los "
+"siguientes: <itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 "
+"</para></listitem> <listitem><para> Performa 5200, 6200, 6300 </para></"
+"listitem> <listitem><para> Powerbook 1400, 2300 y 5300 </para></listitem> "
 "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
 "itemizedlist> Existe un núcleo Linux para estas máquinas con comaptiblidad "
 "limitada en <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
@@ -1589,33 +1589,25 @@ msgstr "Tipos de máquinas S/390 y zSeries"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
-msgstr ""
-"Puede encontrar información detallada respecto a las máquinas S/390 y "
-"zSeries permitidos en el RedBook de IBM <ulink url=\"http://www.redbooks.ibm."
-"com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux para IBM eServer zSeries y "
-"S/390: Distribuciones</ulink> en el capítulo 2.1 o en la <ulink url=\"http://"
-"www-128.ibm.com/developerworks/linux/linux390/index.html\">página de zSeries "
-"en developerWorks</ulink>. En resumen, las máquinas G5, Multiprise 3000, G6 "
-"y todas las zSeries totalmente compatibles; las máquinas Multiprise 2000, G3 "
-"y G4 permiten el uso de emulación de punto flotante IEEE y por consiguiente "
-"con desempeño degradado."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
+msgstr ""
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "Compatibilidad de CPU, placas base y vídeo"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1630,13 +1622,13 @@ msgstr ""
 "esperar de cada uno."
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1650,7 +1642,7 @@ msgstr ""
 "de SPARCstation en la Wikipedia</ulink>."
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1662,13 +1654,13 @@ msgstr ""
 "ya se había dejado de ofrecer en versiones anteriores."
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1686,13 +1678,13 @@ msgstr ""
 "núcleo sparc64 o sparc64-smp en configuraciones UP y SMP respectivamente."
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1706,7 +1698,7 @@ msgstr ""
 "compatibilidad. Utilice el núcleo sparc64-smp."
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1717,13 +1709,13 @@ msgstr ""
 "éstas en el núcleo de Linux."
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "Ordenadores portátiles"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1740,13 +1732,13 @@ msgstr ""
 "\">páginas de portátiles en Linux</ulink>"
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "Múltiples procesadores"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1761,10 +1753,11 @@ msgstr ""
 "estándar del núcleo de &debian; &release; ha sido compilada con "
 "compatibilidad con SMP. El núcleo predeterminado funciona correctamente en "
 "sistemas que no sean SMP, pero habrá un sobrecoste que causará una pequeña "
-"disminución en el desempeño. En los sistemas de hoy en día no será apreciable."
+"disminución en el desempeño. En los sistemas de hoy en día no será "
+"apreciable."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1783,7 +1776,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1801,17 +1794,17 @@ msgstr ""
 "automáticamente SMP en los sistemas con un sólo procesador."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr ""
-"Los paquetes con la versión 486 del la imagen del núcleo de &debian; en &arch-"
-"title; no están compilados con compatibilidad con SMP."
+"Los paquetes con la versión 486 del la imagen del núcleo de &debian; en "
+"&arch-title; no están compilados con compatibilidad con SMP."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1828,7 +1821,7 @@ msgstr ""
 "procesador."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -1839,14 +1832,14 @@ msgid ""
 "quote> section of the kernel config.</phrase>"
 msgstr ""
 "Tendrá que sustituir el núcleo estándar de &debian; si quiere aprovechar el "
-"uso de múltiples procesadores. <phrase arch=\"linux-any\">Puede encontrar una "
-"discusión acerca de cómo hacer esto en <xref linkend=\"kernel-baking\"/>. En "
-"este momento (versión del núcleo &kernelversion;) puede habilitar SMP "
+"uso de múltiples procesadores. <phrase arch=\"linux-any\">Puede encontrar "
+"una discusión acerca de cómo hacer esto en <xref linkend=\"kernel-baking\"/"
+">. En este momento (versión del núcleo &kernelversion;) puede habilitar SMP "
 "seleccionando <quote>&smp-config-option;</quote> en la sección <quote>&smp-"
 "config-section;</quote> de la configuración del núcleo.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1866,7 +1859,7 @@ msgstr ""
 "utilizará el primer procesador."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1878,7 +1871,7 @@ msgstr ""
 "núcleo apropiado."
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, no-c-format
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
@@ -1895,20 +1888,27 @@ msgstr ""
 "<quote>&smp-config-section;</quote> de la configuración del núcleo.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "Compatibilidad de tarjeta gráfica"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "Debería utilizar una interfaz de visualización compatible con VGA para la "
 "terminal de consola. Prácticamente cualquier tarjeta de vídeo moderna es "
@@ -1917,23 +1917,24 @@ msgstr ""
 "no se usa X11 durante el proceso de instalación descrito en este documento."
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
-"La compatibilidad de &debian; con interfaces gráficas está determinada por la "
-"compatibilidad subyacente encontrada en el sistema X11 de X.Org. Los puertos "
-"de vídeo AGP, PCI, PCIe y PCI-X funcionan bajo X.Org. Puede encontrar más detalles "
-"sobre tarjetas, monitores, dispositivos de señalamiento y buses en <ulink "
-"url=\"&url-xorg;\"></ulink>. &debian; &release; incluye X.Org versión &x11ver;."
+"La compatibilidad de &debian; con interfaces gráficas está determinada por "
+"la compatibilidad subyacente encontrada en el sistema X11 de X.Org. Los "
+"puertos de vídeo AGP, PCI, PCIe y PCI-X funcionan bajo X.Org. Puede "
+"encontrar más detalles sobre tarjetas, monitores, dispositivos de "
+"señalamiento y buses en <ulink url=\"&url-xorg;\"></ulink>. &debian; "
+"&release; incluye X.Org versión &x11ver;."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr ""
@@ -1941,7 +1942,7 @@ msgstr ""
 "en la O2."
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1963,7 +1964,7 @@ msgstr ""
 "para saber cómo activar la tarjeta."
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1991,13 +1992,13 @@ msgstr ""
 "consola serial desconectando el teclado antes de arrancar el sistema."
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Hardware de conectividad de red"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2015,7 +2016,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2025,61 +2026,61 @@ msgstr ""
 "sistemas que tienen PCI) y las siguientes NICs de Sun:"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "La lista de dispositivos de red compatibles es:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Conexión canal a canal (CTC) y ESCON (real o emulado)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet y OSA-Express Fast Ethernet (non-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express en modo QDIO, HiperSockets y Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2100,19 +2101,19 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "Se permite el uso de RDSI, pero no durante la instalación."
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Tarjetas de red inalámbrica"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2130,7 +2131,7 @@ msgstr ""
 "detallada de cómo cargar firmware durante la instalación."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2142,7 +2143,7 @@ msgstr ""
 "no estarán disponibles durante el proceso de instalación."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2154,7 +2155,7 @@ msgstr ""
 "durante la instalación."
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2172,7 +2173,7 @@ msgstr ""
 "(después del reinicio del sistema) y configurar la red manualmente."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2191,13 +2192,13 @@ msgstr ""
 "Windows.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "Problemas conocidos con &arch-title;"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2207,13 +2208,13 @@ msgstr ""
 "merece la pena tratar aquí."
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "Conflicto entre los controladores tulip y dfme"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2232,7 +2233,7 @@ msgstr ""
 "puede que no funcione la tarjeta de red o que funcione mal."
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2247,7 +2248,7 @@ msgstr ""
 "describe en <xref linkend=\"module-blacklist\"/>."
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2264,13 +2265,13 @@ msgstr ""
 "<userinput>modprobe <replaceable>modulo</replaceable></userinput>."
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2280,13 +2281,13 @@ msgstr ""
 "blade Sun B100."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "Dispositivos Braille"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2304,13 +2305,13 @@ msgstr ""
 "&release; ofrece la versión &brlttyver; de <classname>brltty</classname>."
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "Dispositivos de Síntesis de voz"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2332,13 +2333,13 @@ msgstr ""
 "<classname>speakup</classname>."
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Periféricos y otro hardware"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2351,7 +2352,7 @@ msgstr ""
 "instalación del sistema."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2362,7 +2363,7 @@ msgstr ""
 "\"hardware-issues\"/>)."
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2374,7 +2375,7 @@ msgstr ""
 "su hardware específico."
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2386,7 +2387,7 @@ msgstr ""
 "o a través de la red usando NFS, HTTP o FTP."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2396,13 +2397,13 @@ msgstr ""
 "pero el Qube tiene un slot PCI."
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "Dispositivos que requieren Firmware"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2420,7 +2421,7 @@ msgstr ""
 "ciertos controladores de discos duros también requieren firmware."
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2438,7 +2439,7 @@ msgstr ""
 "como un paquete separado en la sección non-free del archivo de &debian-gnu;."
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2456,13 +2457,13 @@ msgstr ""
 "firmware o paquetes durante la instalación."
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "Adquisición de hardware específico para GNU/&arch-kernel;"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2478,7 +2479,7 @@ msgstr ""
 "de que su hardware es totalmente compatible con GNU/Linux."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2495,7 +2496,7 @@ msgstr ""
 "(<quote>reembolso windows</quote>, n. del t.)."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2513,13 +2514,13 @@ msgstr ""
 "a los fabricantes de hardware que ofrecen compatibilidad con &arch-kernel;."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Evite hardware cerrado o privativo"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2533,7 +2534,7 @@ msgstr ""
 "para &arch-kernel;."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2549,13 +2550,13 @@ msgstr ""
 "que la comunidad de software libre es un mercado importante."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Hardware específico para Windows"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2583,7 +2584,7 @@ msgstr ""
 "que mantienen su inteligencia integrada."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2622,7 +2623,7 @@ msgstr ""
 "en la capacidad de procesamiento integrada en su hardware."
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, no-c-format
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
@@ -2640,13 +2641,13 @@ msgstr ""
 "hardware de Linux</ulink></phrase>."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "Medios de instalación"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2657,20 +2658,20 @@ msgid ""
 "to this page once you reach that section."
 msgstr ""
 "Esta sección le ayudará a determinar los diferentes tipos de medio que puede "
-"usar para instalar &debian;. Por ejemplo, si tiene una unidad de disquetes en "
-"su máquina, puede usarla para instalar &debian;. Existe un capítulo entero "
-"dedicado a este asunto, el <xref linkend=\"install-methods\"/>, que lista "
-"las ventajas y desventajas de cada tipo de medio. Puede que desee regresar a "
-"esta página una vez que consulte esa sección."
+"usar para instalar &debian;. Por ejemplo, si tiene una unidad de disquetes "
+"en su máquina, puede usarla para instalar &debian;. Existe un capítulo "
+"entero dedicado a este asunto, el <xref linkend=\"install-methods\"/>, que "
+"lista las ventajas y desventajas de cada tipo de medio. Puede que desee "
+"regresar a esta página una vez que consulte esa sección."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "Disquetes"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2682,19 +2683,19 @@ msgstr ""
 "densidad (1440 kilobytes) de 3.5 pulgadas."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "El uso de disquetes en CHRP es inservible en la actualidad."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2709,7 +2710,7 @@ msgstr ""
 "SCSI ni IDE/ATAPI."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2729,7 +2730,7 @@ msgstr ""
 "ROM, consulte el <xref linkend=\"boot-installer\"/>."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2741,7 +2742,7 @@ msgstr ""
 "el uso de CD-ROMs con Linux."
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2751,13 +2752,13 @@ msgstr ""
 "dispositivos FireWire que aceptados por los controladores ohci1394 y sbp2."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "Las máquinas ARM permiten el uso de CD-ROMs IDE/ATAPI."
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2777,13 +2778,13 @@ msgstr ""
 "quote> en el firmware para iniciar la instalación."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "Disco duro"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2795,7 +2796,7 @@ msgstr ""
 "operativo instalado para cargar el instalador desde el disco duro."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2805,13 +2806,13 @@ msgstr ""
 "instalar desde una partición SunOS (particiones UFS)."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "Dispositivo de memoria USB"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2825,17 +2826,17 @@ msgstr ""
 "para instalar el sistema o para propósitos de recuperación del sistema. Si "
 "gestiona servidores, puede que haya pensado en omitir estas unidades y usar "
 "un dispositivo de memoria USB para instalar y (cuando sea necesario) "
-"recuperar el sistema. También es útil en el caso de sistemas pequeños "
-"que no tienen espacio para unidades innecesarias."
+"recuperar el sistema. También es útil en el caso de sistemas pequeños que no "
+"tienen espacio para unidades innecesarias."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "Red"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2855,7 +2856,7 @@ msgstr ""
 "instalación podrá configurar su sistema para que utilice RDSI y PPP."
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2867,7 +2868,7 @@ msgstr ""
 "preferido para &arch-title;.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2878,13 +2879,13 @@ msgstr ""
 "sistemas de ficheros locales."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Sistema Un*x o GNU"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2901,13 +2902,13 @@ msgstr ""
 "upgrade\"/>."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Sistemas de almacenamiento aceptados"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
@@ -2928,7 +2929,7 @@ msgstr ""
 "amplio de dispositivos posibles."
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
@@ -2943,7 +2944,7 @@ msgstr ""
 "Win-32 (VFAT) y NTFS."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2959,7 +2960,7 @@ msgstr ""
 "hardware de Linux</ulink> para más información."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2984,7 +2985,7 @@ msgstr ""
 "el núcleo Linux."
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2996,7 +2997,7 @@ msgstr ""
 "no permite el uso de disquetes en sistemas CHRP."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3008,7 +3009,7 @@ msgstr ""
 "no tiene permite el uso de unidades de disquete."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3018,7 +3019,7 @@ msgstr ""
 "compatible con el núcleo Linux."
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3031,13 +3032,13 @@ msgstr ""
 "esquema común de discos para S/390 (cdl)."
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Requisitos de memoria y espacio en disco"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3056,7 +3057,7 @@ msgstr ""
 "escritorio, necesitará unos cuantos gigabytes."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -3077,5 +3078,26 @@ msgstr ""
 "o con menos disco duro, pero sólo es aconsejable realizarla si es vd. un "
 "usuario experimentado."
 
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "Puede encontrar información detallada respecto a las máquinas S/390 y "
+#~ "zSeries permitidos en el RedBook de IBM <ulink url=\"http://www.redbooks."
+#~ "ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux para IBM eServer zSeries "
+#~ "y S/390: Distribuciones</ulink> en el capítulo 2.1 o en la <ulink url="
+#~ "\"http://www-128.ibm.com/developerworks/linux/linux390/index.html"
+#~ "\">página de zSeries en developerWorks</ulink>. En resumen, las máquinas "
+#~ "G5, Multiprise 3000, G6 y todas las zSeries totalmente compatibles; las "
+#~ "máquinas Multiprise 2000, G3 y G4 permiten el uso de emulación de punto "
+#~ "flotante IEEE y por consiguiente con desempeño degradado."
+
 #~ msgid "CPU"
 #~ msgstr "CPU"
diff --git a/po/es/install-methods.po b/po/es/install-methods.po
index 3af7c5388..f0ea80ace 100644
--- a/po/es/install-methods.po
+++ b/po/es/install-methods.po
@@ -34,7 +34,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-13 23:56+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -76,15 +76,15 @@ msgstr ""
 "Por muchas razones la forma más simple es instalar &debian-gnu; desde un "
 "juego oficial de CD-ROMs. Puede comprar un juego a algún proveedor (vea la "
 "<ulink url=\"&url-debian-cd-vendors;\">página de vendedores de CD</ulink>). "
-"También podría descargar las imágenes de CD-ROM desde una réplica de &debian; "
-"y hacer su propio juego, si tiene una conexión de red rápida y una grabadora "
-"de CDs (para instrucciones detalladas vea la <ulink url=\"&url-debian-cd;"
-"\">página de CDs de &debian;</ulink>). Si tiene un juego de CDs de &debian; y "
-"su máquina es capaz de arrancar desde CDs, puede pasar al <xref linkend=\"boot-"
-"installer\"/>; se ha puesto mucho esfuerzo para asegurar que los ficheros "
-"que necesita la mayoría de personas estén en un solo CD. Aunque el juego "
-"completo de paquetes binarios requiere varios CDs, es poco probable que "
-"necesite los paquetes que se encuentran a partir del tercer CD. También "
+"También podría descargar las imágenes de CD-ROM desde una réplica de "
+"&debian; y hacer su propio juego, si tiene una conexión de red rápida y una "
+"grabadora de CDs (para instrucciones detalladas vea la <ulink url=\"&url-"
+"debian-cd;\">página de CDs de &debian;</ulink>). Si tiene un juego de CDs de "
+"&debian; y su máquina es capaz de arrancar desde CDs, puede pasar al <xref "
+"linkend=\"boot-installer\"/>; se ha puesto mucho esfuerzo para asegurar que "
+"los ficheros que necesita la mayoría de personas estén en un solo CD. Aunque "
+"el juego completo de paquetes binarios requiere varios CDs, es poco probable "
+"que necesite los paquetes que se encuentran a partir del tercer CD. También "
 "puede considerar usar la versión de DVD, que le ahorra bastante espacio y "
 "evita la maratón de intercambio de CDs."
 
@@ -1048,8 +1048,8 @@ msgstr ""
 "replaceable> /mnt</userinput>),</phrase> que ahora tendrá un sistema de "
 "ficheros <phrase arch=\"x86\">FAT</phrase> <phrase arch=\"powerpc\">HFS</"
 "phrase> en ella, y copie una imagen ISO «netinst» o «bussinesscard» de "
-"&debian; sobre la memoria USB. Desmonte el dispositivo USB (<userinput>umount /"
-"mnt</userinput>) y habrá terminado."
+"&debian; sobre la memoria USB. Desmonte el dispositivo USB "
+"(<userinput>umount /mnt</userinput>) y habrá terminado."
 
 #. Tag: title
 #: install-methods.xml:663
@@ -1213,8 +1213,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Si usa el instalador gráfico necesitará "
-"adicionar <userinput>vga=788</userinput> a la segunda "
-"línea."
+"adicionar <userinput>vga=788</userinput> a la segunda línea."
 
 #. Tag: para
 #: install-methods.xml:768
@@ -1229,8 +1228,8 @@ msgid ""
 "(<userinput>umount /mnt</userinput>)."
 msgstr ""
 "Si usó una imagen <filename>hd-media</filename>, debería copiar ahora una "
-"imagen ISO de &debian;<footnote> <para> Puede usar businesscard, netinst o una "
-"imagen completa de CD (consulte <xref linkend=\"official-cdrom\"/>). "
+"imagen ISO de &debian;<footnote> <para> Puede usar businesscard, netinst o "
+"una imagen completa de CD (consulte <xref linkend=\"official-cdrom\"/>). "
 "Aseguresé de elegir una que quepa. Tenga en cuenta que la imagen "
 "<quote><filename>mini.iso</filename> netboot</quote> no sirve para este "
 "propósito. </para> </footnote> en la memoria. Cuando haya finalizado, "
@@ -1583,9 +1582,12 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:996
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
+#| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "Copie los siguientes ficheros de una imagen de CD de &debian; a <filename>c:"
@@ -1830,7 +1832,8 @@ msgid ""
 "is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Algunas máquinas HPPA antiguas (como 715/75) usan RBOOTD en lugar de BOOTP. "
-"Existe un paquete llamado <classname>rbootd</classname> disponible en &debian;."
+"Existe un paquete llamado <classname>rbootd</classname> disponible en "
+"&debian;."
 
 #. Tag: para
 #: install-methods.xml:1157
diff --git a/po/es/preparing.po b/po/es/preparing.po
index 82141bfd0..5559b56fc 100644
--- a/po/es/preparing.po
+++ b/po/es/preparing.po
@@ -33,7 +33,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-13 23:51+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -76,8 +76,8 @@ msgid ""
 "that will require a complete re-installation of your system is very rare; "
 "perhaps mechanical failure of the hard disk would be the most common case."
 msgstr ""
-"Antes de nada, una nota sobre reinstalaciones: con &debian; es muy raro que se "
-"produzca una circunstancia que requiera la reinstalación completa de su "
+"Antes de nada, una nota sobre reinstalaciones: con &debian; es muy raro que "
+"se produzca una circunstancia que requiera la reinstalación completa de su "
 "sistema. El caso más común es un fallo mecánico en el disco duro de su "
 "sistema."
 
@@ -115,11 +115,11 @@ msgstr ""
 "requieren una reinstalación total, siempre podrá actualizar sobre el mismo "
 "sistema. Los programas casi siempre son compatibles con las versiones "
 "sucesivas del sistema operativo. Si una nueva versión del programa requiere "
-"software adicional, el sistema de paquetes de &debian; se asegura que todo el "
-"software necesario sea automáticamente identificado e instalado. El hecho es "
-"que se ha dedicado mucho esfuerzo para evitar la necesidad de reinstalar un "
-"sistema, considérelo su última opción. El instalador <emphasis>no</emphasis> "
-"está diseñado para reinstalar sobre un sistema existente."
+"software adicional, el sistema de paquetes de &debian; se asegura que todo "
+"el software necesario sea automáticamente identificado e instalado. El hecho "
+"es que se ha dedicado mucho esfuerzo para evitar la necesidad de reinstalar "
+"un sistema, considérelo su última opción. El instalador <emphasis>no</"
+"emphasis> está diseñado para reinstalar sobre un sistema existente."
 
 #. Tag: para
 #: preparing.xml:48
@@ -495,21 +495,18 @@ msgstr "Referencias de hardware para &arch-title;"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Instrucciones de instalación y controladores de dispositivos (DASD, XPRAM, "
-"Consola, cinta, z90 crypto, chandev, red) para Linux en &arch-title; usando "
-"la versión 2.4 del núcleo."
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Controladores de dispositivos y órdenes de instalación"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -519,13 +516,13 @@ msgstr ""
 "zSeries y hardware &arch-title;."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux para &arch-title;"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
@@ -538,19 +535,19 @@ msgstr ""
 "title;."
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux para IBM eServer zSeries y distribuciones &arch-title;:"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Encontrar fuentes de información de hardware"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -562,19 +559,19 @@ msgstr ""
 "hardware antes de la instalación."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "Puede obtener información de su hardware desde:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "Los manuales que vienen con cada pieza de hardware."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -587,19 +584,19 @@ msgstr ""
 "keycap>."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "Las cajas y cubiertas de cada pieza de hardware."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "La ventana del sistema en el panel de control de Windows."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -612,7 +609,7 @@ msgstr ""
 "RAM y el espacio disponible en el disco duro."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -623,175 +620,175 @@ msgstr ""
 "su correo electrónico."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Información de hardware necesaria para una instalación"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "Hardware"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "Información que podría necesitar"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "Discos duros"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "El número de discos que tiene."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "Su orden en el sistema."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "Si es IDE (también conocido como PATA), SATA ó SCSI."
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "Espacio libre disponible."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "Particiones."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "Particiones con otros sistemas operativos instalados."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "Monitor"
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "Modelo y fabricante."
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "Resoluciones aceptadas."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Rango de refresco horizontal."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Rango de refresco vertical."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Profundidad de color (número de colores) aceptado."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "Tamaño de la pantalla."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "Ratón"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Tipo: serie, PS/2 ó USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "Puerto."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "Fabricante."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "Número de botones."
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "Red"
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "Tipo de adaptador."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "Impresora"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Resoluciones de impresión aceptadas."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "Tarjeta de vídeo"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "Memoria RAM de vídeo disponible."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -801,37 +798,37 @@ msgstr ""
 "capacidades de su monitor)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "Número(s) de dispositivos."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "Número de dispositivos."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "Número de adaptador relativo para tarjetas OSA."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Compatibilidad de hardware"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -845,7 +842,7 @@ msgstr ""
 "tipos de hardware como otros sistemas operativos."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -855,7 +852,7 @@ msgstr ""
 "necesiten una versión de Windows ejecutándose para funcionar."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -869,7 +866,7 @@ msgstr ""
 "Linux en concreto. Como consecuencia, pueden volverse obsoletos rápidamente."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -880,13 +877,13 @@ msgstr ""
 "de Windows."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "Puede verificar la compatibilidad de hardware mediante:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr ""
@@ -894,7 +891,7 @@ msgstr ""
 "controladores."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -905,7 +902,7 @@ msgstr ""
 "configuraciones de las más conocidas."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -915,19 +912,19 @@ msgstr ""
 "sitios web dedicados a su arquitectura."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "Buscar en Internet experiencias de otros usuarios."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "Configuración de la red"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -939,31 +936,31 @@ msgstr ""
 "conexión Ethernet o equivalente, pero no si tiene una conexión PPP)."
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "El nombre de su sistema (podría decidirlo usted mismo)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "El nombre de su dominio."
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "La dirección IP de su ordenador."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "La máscara de red a usar."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -974,7 +971,7 @@ msgstr ""
 "enlace."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -982,7 +979,7 @@ msgid ""
 msgstr "El sistema en su red que deberá usar como servidor de nombres o DNS."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -996,31 +993,31 @@ msgstr ""
 "durante el proceso de instalación."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Si usa una red inalámbrica, también deberá averiguar:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "El ESSID de su red inalámbrica."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "La clave de seguridad WEP (si es pertinente)."
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Cumplir los requisitos mínimos de hardware"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -1032,7 +1029,7 @@ msgstr ""
 "desea efectuar."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -1044,7 +1041,7 @@ msgstr ""
 "usuarios se arriesgan a terminar frustrados si ignoran estas sugerencias."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
@@ -1053,7 +1050,7 @@ msgstr ""
 "escritorio."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
@@ -1061,98 +1058,105 @@ msgstr ""
 "escritorio."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Requisitos mínimos de sistema recomendados"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "Tipo de instalación"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (mínimo)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (recomendado)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "Disco duro"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "Sin escritorio"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 Megabytes"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 Megabytes"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 Gigabyte"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "Con escritorio"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 Megabytes"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 Megabytes"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 Gigabytes"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "Los requisitos de memoria mínimos necesarios son en realidad inferiores a "
 "los indicados en esta tabla. En función de la arquitectura, es posible "
-"instalar &debian; en sistemas con tan sólo 20 MB (en el caso de s390) a 60 MB "
-"(para amd64). Lo mismo se puede decir del espacio necesario en disco, "
+"instalar &debian; en sistemas con tan sólo 20 MB (en el caso de s390) a 60 "
+"MB (para amd64). Lo mismo se puede decir del espacio necesario en disco, "
 "especialmente si escoge las aplicaciones que va a instalar manualmente, "
 "consulte <xref linkend=\"tasksel-size-list\"/> para obtener más información "
 "de los requisitos de disco."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1170,7 +1174,7 @@ msgstr ""
 "<classname>wmaker</classname>, aunque hay más entre los que puede elegir."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1182,7 +1186,7 @@ msgstr ""
 "medida de aquello para lo que se utilice el servidor."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1195,7 +1199,7 @@ msgstr ""
 "qué espacio destinar a sus propios ficheros y datos."
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1211,8 +1215,8 @@ msgstr ""
 "Se ha tenido en cuenta el espacio de disco necesario para la operación "
 "normal del sistema &debian-gnu; en sí en estos requisitos de sistema "
 "recomendados. En particular, la partición <filename>/var</filename> de "
-"&debian; contiene mucha información de estado específica a Debian, además "
-"de su contenido habitual, como puedan ser los ficheros de registro. Los "
+"&debian; contiene mucha información de estado específica a Debian, además de "
+"su contenido habitual, como puedan ser los ficheros de registro. Los "
 "ficheros de <command>dpkg</command> (que incluyen información sobre los "
 "paquetes instalados) pueden fácilmente consumir unos 40 MB. Además, hay que "
 "tener en cuenta que <command>apt-get</command> ubica los paquetes "
@@ -1221,13 +1225,13 @@ msgstr ""
 "un entorno gráfico de escritorio."
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Preparticionado para sistemas multiarranque"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1241,7 +1245,7 @@ msgstr ""
 "no afecta a las otras."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1253,30 +1257,31 @@ msgstr ""
 "una máquina significa un invitado «LPAR» o «VM» en este caso."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, no-c-format
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "Si ya tiene un sistema operativo en su ordenador <phrase arch=\"any-x86\"> "
-"(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
-"phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> y "
-"desea colocar &debian; en el mismo disco, necesitará reparticionar el disco. "
-"&debian; requiere sus propias particiones de disco duro. no puede instalarse "
-"en particiones de Windows o MacOS. Podría tener la posibilidad de compartir "
-"algunas particiones con otros sistemas Unix, pero este tema no se cubre en "
-"este manual. Al menos necesitará una partición dedicada para el sistema de "
-"ficheros raíz de &debian;."
+"(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
+"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
+"phrase> y desea colocar &debian; en el mismo disco, necesitará reparticionar "
+"el disco. &debian; requiere sus propias particiones de disco duro. no puede "
+"instalarse en particiones de Windows o MacOS. Podría tener la posibilidad de "
+"compartir algunas particiones con otros sistemas Unix, pero este tema no se "
+"cubre en este manual. Al menos necesitará una partición dedicada para el "
+"sistema de ficheros raíz de &debian;."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, no-c-format
 msgid ""
 "You can find information about your current partition setup by using a "
@@ -1295,7 +1300,7 @@ msgstr ""
 "existentes sin realizar cambios."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1311,13 +1316,13 @@ msgstr ""
 "mover una pared, en caso contrario se arriesga a destruirlos."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "ARREGLAME: ¿escribir sobre discos HP-UX?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
@@ -1331,7 +1336,7 @@ msgstr ""
 "programa de particionado que puede hacer el trabajo adecuadamente."
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1359,7 +1364,7 @@ msgstr ""
 "máquina, como cintas o CDs del sistema de instalación original."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
@@ -1378,7 +1383,7 @@ msgstr ""
 "particionar antes de instalar."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1390,7 +1395,7 @@ msgstr ""
 "&debian; para redimensionar el sistema de ficheros."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
@@ -1412,7 +1417,7 @@ msgstr ""
 "nativas del sistema operativo que desee quedarse."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
 msgid ""
 "If you are going to install more than one operating system on the same "
@@ -1428,7 +1433,7 @@ msgstr ""
 "particiones que no sean nativas."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1438,7 +1443,7 @@ msgstr ""
 "problemas si instala primero el sistema nativo."
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, no-c-format
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
@@ -1461,7 +1466,7 @@ msgstr ""
 "instalación real y reemplazarlas con particiones &arch-parttype;."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
@@ -1473,13 +1478,13 @@ msgstr ""
 "el sistema operativo nativo y &debian;, necesitará:"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Efectuar copias de seguridad de todo lo existente en el ordenador."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1493,7 +1498,7 @@ msgstr ""
 "fuerza a que el CD sea el sistema activo de MacOS.</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1503,13 +1508,13 @@ msgstr ""
 "sistema nativas. Deje una partición o espacio libre para &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "Instalar el sistema operativo nativo en su nueva partición."
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
@@ -1519,20 +1524,20 @@ msgstr ""
 "esté bien, y descargar los ficheros de arranque del instalador de &debian;."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
 "Arrancar el instalador de &debian; para continuar la instalación de &debian;."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Particionado desde DOS o Windows"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
@@ -1547,7 +1552,7 @@ msgstr ""
 "&debian; harán mejor esta tarea."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1569,38 +1574,38 @@ msgstr ""
 "existente."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "Reparticionado sin pérdidas cuando se inicia desde DOS, Win-32 u OS/2"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "Una de las instalaciones más comunes es la que se produce en sistemas que ya "
 "tienen DOS (incluyendo Windows 3.1), Win32 (como Windows 95, 98, Me, NT, "
-"2000, XP, 2003, Vista, 7) o OS/2 y en los que desea instalar &debian; en el mismo disco sin "
-"destruir el sistema anterior. Tenga en cuenta que el instalador es capaz de "
-"redimensionar sistemas de ficheros FAT y NTFS usados por DOS y Windows. Sólo "
-"debe iniciar el instalador, y al llegar al paso de partcionado elegir la "
-"opción para el particionado <menuchoice> <guimenuitem>Manual</guimenuitem></"
-"menuchoice>, seleccionar la partición a redimensionar e indicar su nuevo "
-"tamaño. Así, en la mayoría de los casos no necesita usar el método descrito "
-"a continuación."
+"2000, XP, 2003, Vista, 7) o OS/2 y en los que desea instalar &debian; en el "
+"mismo disco sin destruir el sistema anterior. Tenga en cuenta que el "
+"instalador es capaz de redimensionar sistemas de ficheros FAT y NTFS usados "
+"por DOS y Windows. Sólo debe iniciar el instalador, y al llegar al paso de "
+"partcionado elegir la opción para el particionado <menuchoice> "
+"<guimenuitem>Manual</guimenuitem></menuchoice>, seleccionar la partición a "
+"redimensionar e indicar su nuevo tamaño. Así, en la mayoría de los casos no "
+"necesita usar el método descrito a continuación."
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
@@ -1613,12 +1618,12 @@ msgstr ""
 "Antes de proseguir, deberá decidir cómo dividir el disco. El método de esta "
 "sección solamente dividirá la partición en dos. Una contendrá el sistema "
 "operativo original y &debian; utilizará la otra. Durante la instalación de "
-"&debian;, se le dará la oportunidad de usar la parte del disco correspondiente "
-"a &debian; como mejor le parezca, esto es, como partición de intercambio o "
-"como sistema de ficheros."
+"&debian;, se le dará la oportunidad de usar la parte del disco "
+"correspondiente a &debian; como mejor le parezca, esto es, como partición de "
+"intercambio o como sistema de ficheros."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1636,19 +1641,28 @@ msgstr ""
 "cantidad de espacio de la partición que podría utilizar."
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
-msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+#: preparing.xml:983
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The first thing needed is a copy of <command>fips</command> which is "
+#| "available in the <filename>tools/</filename> directory on your nearest "
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
+#| "filename> to a bootable floppy. A bootable floppy can be created using "
+#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
+#| "command> comes with very good documentation which you may want to read. "
+#| "You will definitely need to read the documentation if you use a disk "
+#| "compression driver or a disk manager. Create the disk and read the "
+#| "documentation <emphasis>before</emphasis> you defragment the disk."
+msgid ""
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "Lo primero que se necesita es una copia de <command>fips</command>, "
 "disponible en el directorio <filename>tools/</filename> dentro de la réplica "
@@ -1662,7 +1676,7 @@ msgstr ""
 "documentación <emphasis>antes</emphasis> de defragmentar el disco."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1683,7 +1697,7 @@ msgstr ""
 "que utiliza Windows 95 y versiones posteriores."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1696,7 +1710,7 @@ msgstr ""
 "siga las instrucciones."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1706,13 +1720,13 @@ msgstr ""
 "que <command>fips</command> no pueda ayudarlo."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Particionado para DOS"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1722,13 +1736,14 @@ msgid ""
 "weird errors in DOS or Windows."
 msgstr ""
 "Si está particionando para discos DOS, o modificando el tamaño de las "
-"particiones DOS, con herramientas de &debian;, debe saber que muchas personas "
-"experimentan problemas al trabajar con las particiones FAT resultantes. De "
-"hecho, algunos han informado de bajo rendimiento, problemas de consistencia "
-"con <command>scandisk</command> u otros fallos extraños en DOS o Windows."
+"particiones DOS, con herramientas de &debian;, debe saber que muchas "
+"personas experimentan problemas al trabajar con las particiones FAT "
+"resultantes. De hecho, algunos han informado de bajo rendimiento, problemas "
+"de consistencia con <command>scandisk</command> u otros fallos extraños en "
+"DOS o Windows."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1742,19 +1757,19 @@ msgstr ""
 "siguiente orden desde &debian;:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Particionado desde SunOS"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
@@ -1773,13 +1788,13 @@ msgstr ""
 "(CDROM)."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Particionado desde Linux u otro SO"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1804,7 +1819,7 @@ msgstr ""
 "geometría del disco."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1818,13 +1833,13 @@ msgstr ""
 "<command>SILO</command>, consulte <xref linkend=\"partitioning\"/>."
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "Particionado en MacOS/OSX"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1840,7 +1855,7 @@ msgstr ""
 "del disco en <application>Drive Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1852,7 +1867,7 @@ msgstr ""
 "sea, será borrada y reemplazada después por el instalador de &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1879,7 +1894,7 @@ msgstr ""
 "desde OS 9 como desde OS X."
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1898,13 +1913,13 @@ msgstr ""
 "Tanto MacOS como Linux puede acceder a particiones HFS, HFS+ y MS-DOS FAT."
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Preinstalación de hardware y configuración del sistema operativo"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1924,13 +1939,13 @@ msgstr ""
 "afecten a la fiabilidad de &debian-gnu; en su sistema."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Utilización del menú de configuración de la BIOS"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
@@ -1948,7 +1963,7 @@ msgstr ""
 "fallos intermitentes o la imposibilidad de instalar &debian;."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1963,26 +1978,26 @@ msgstr ""
 "para la BIOS:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr ""
 "Tecla <keycap>Supr</keycap> durante el POST (auto-verificación al encendido)"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1992,25 +2007,25 @@ msgstr ""
 "keycap></keycombo> o <keycap>Supr</keycap> durante el POST"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "Tecla <keycap>Esc</keycap> durante el POST"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -2022,13 +2037,13 @@ msgstr ""
 "keycap><keycap>Supr</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2040,7 +2055,7 @@ msgstr ""
 "keycap> </keycombo> o <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2050,7 +2065,7 @@ msgstr ""
 "<ulink url=\"&url-invoking-bios-info;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2066,13 +2081,13 @@ msgstr ""
 "ulink>."
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Selección de dispositivo de arranque"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
@@ -2093,7 +2108,7 @@ msgstr ""
 "dispositivos de arranque más usados para instalar &debian;."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2105,7 +2120,7 @@ msgstr ""
 "habilitar el arranque desde CD-ROM en la BIOS SCSI de su controlador."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2122,7 +2137,7 @@ msgstr ""
 "que arranque desde el dispositivo USB."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2134,13 +2149,13 @@ msgstr ""
 "instalado, para que la máquina arranque desde el disco duro."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Cambiar el orden de arranque en ordenadores IDE"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2153,7 +2168,7 @@ msgstr ""
 "exactas."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2163,19 +2178,19 @@ msgstr ""
 "ubicación depende de su BIOS, pero debe buscar un campo que liste unidades."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "Las opciones comunes en máquinas IDE son C, A, cdrom o A, C, cdrom."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C es el disco duro y A la unidad de disquete."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2187,7 +2202,7 @@ msgstr ""
 "<keycap>Re Pág</keycap> le desplazan a través de todas las opciones posibles."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2197,13 +2212,13 @@ msgstr ""
 "los cambios en su ordenador."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Cambiar el orden de arranque en ordenadores SCSI"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
@@ -2212,7 +2227,7 @@ msgstr ""
 "utilidad de configuración SCSI."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2223,7 +2238,7 @@ msgstr ""
 "BIOS al iniciar su ordenador."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2235,13 +2250,13 @@ msgstr ""
 "consulte la documentación de su hardware para el juego de teclas exacto."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Busque la utilidad para cambiar el orden de arranque."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2250,7 +2265,7 @@ msgstr ""
 "lista."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2261,19 +2276,19 @@ msgstr ""
 "keycap>."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Configuraciones de la BIOS misceláneas"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "Configuraciones de CD-ROM"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2287,13 +2302,13 @@ msgstr ""
 "userinput>, es posible que se deba a esto."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Memoria extendida vs. memoria expandida"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2307,13 +2322,13 @@ msgstr ""
 "kernel; requiere memoria extendida y no puede usar memoria expandida."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Protección de virus"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2341,13 +2356,13 @@ msgstr ""
 "para> </footnote>."
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Shadow RAM"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2375,13 +2390,13 @@ msgstr ""
 "los dispositivos de hardware."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Memory Hole"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2393,7 +2408,7 @@ msgstr ""
 "espera encontrar memoria allí si tiene esta cantidad de RAM."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2415,13 +2430,13 @@ msgstr ""
 "ésta."
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Gestión avanzada de energía"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2438,13 +2453,13 @@ msgstr ""
 "puede hacer un mejor trabajo de gestión de energía que la BIOS."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Utilización de OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2460,7 +2475,7 @@ msgstr ""
 "que obtuvo con su máquina."
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2478,7 +2493,7 @@ msgstr ""
 "leer más consejos en <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2504,7 +2519,7 @@ msgstr ""
 "de módem"
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2527,13 +2542,13 @@ msgstr ""
 "nvram."
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Utilización de OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2549,7 +2564,7 @@ msgstr ""
 "máquina, como diagnósticos y programas básicos."
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2570,7 +2585,7 @@ msgstr ""
 "indicador si obtiene el indicador antiguo."
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2585,7 +2600,7 @@ msgstr ""
 "programa distinto."
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2606,7 +2621,7 @@ msgstr ""
 "\">Referencia de OpenBoot de Sun</ulink>."
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2649,7 +2664,7 @@ msgstr ""
 "\"&url-openboot;\">Referencia de OpenBoot de Sun</ulink>."
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2680,19 +2695,19 @@ msgstr ""
 "</screen></informalexample> y desde Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "# eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Configuración de la BIOS"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2716,7 +2731,7 @@ msgstr ""
 "basada en líneas en lugar de caracteres."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2737,7 +2752,7 @@ msgstr ""
 "de ésta opción y del HMC."
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2763,13 +2778,13 @@ msgstr ""
 "leer los pasos de instalación específicos de &debian;."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Instalaciones nativas y LPAR"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2785,13 +2800,13 @@ msgstr ""
 "Distribuciones</ulink> que describen cómo configurar LPAR para Linux."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Instalación como invitado de VM"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2808,13 +2823,21 @@ msgstr ""
 "ejecutar Linux."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "Debe copiar todos los ficheros del subdirectorio <filename>generic</"
 "filename> a su disco CMS. Asegúrese de transferir <filename>kernel.debian</"
@@ -2822,13 +2845,13 @@ msgstr ""
 "registro fijo de 80 caracteres."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Preparación de un servidor de instalación"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2842,7 +2865,7 @@ msgstr ""
 "usando NFS, HTTP ó FTP."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2857,25 +2880,25 @@ msgstr ""
 "instalación en un árbol de directorios como éste."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: es necesaria más información &mdash; ¿obtenerla de un Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Problemas de hardware a tener en cuenta"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Compatibilidad de USB en la BIOS y teclados USB"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2896,13 +2919,13 @@ msgstr ""
 "<quote>Compatibilidad de teclado USB</quote>."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Visibilidad de la pantalla en Powermacs OldWorld"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2924,3 +2947,14 @@ msgstr ""
 "(en algunos casos verá datos en el monitor pero en otros no casos no verá "
 "nada), o si la pantalla se queda en negro después de arrancar el instalador "
 "en lugar de mostrar la interfaz de usuario."
+
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Instrucciones de instalación y controladores de dispositivos (DASD, "
+#~ "XPRAM, Consola, cinta, z90 crypto, chandev, red) para Linux en &arch-"
+#~ "title; usando la versión 2.4 del núcleo."
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Controladores de dispositivos y órdenes de instalación"
diff --git a/po/es/preseed.po b/po/es/preseed.po
index c8c14df2d..4a2a2cc62 100644
--- a/po/es/preseed.po
+++ b/po/es/preseed.po
@@ -33,7 +33,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-10 16:49+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -658,11 +658,11 @@ msgid ""
 "in the preseed file being retrieved from <literal>http://autoserver.example."
 "com/d-i/&releasename;/./preseed.cfg</literal>."
 msgstr ""
-"Hay algunas funciones del Instalador de &debian; que se combinan para permitir "
-"que algunas entradas de línea de órdenes en el indicador del arranque tengan "
-"como consecuencia una instalación automática adaptada y de arbitrariedad "
-"compleja. Para mostrar esto aquí tiene algunos ejemplos que se pueden "
-"utilizar en el indicador del arranque: <informalexample><screen>\n"
+"Hay algunas funciones del Instalador de &debian; que se combinan para "
+"permitir que algunas entradas de línea de órdenes en el indicador del "
+"arranque tengan como consecuencia una instalación automática adaptada y de "
+"arbitrariedad compleja. Para mostrar esto aquí tiene algunos ejemplos que se "
+"pueden utilizar en el indicador del arranque: <informalexample><screen>\n"
 "auto url=autoserver\n"
 "</screen></informalexample> Este valor depende de la existencia de un "
 "servidor de DHCP que hará que la máquina llegue al punto donde "
@@ -2073,13 +2073,17 @@ msgstr "Particionar usando RAID"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
 msgstr ""
 "También puede utilizar la preconfiguración para configurar las particiones "
 "en arreglos RAID por software. Se puede utilizar para niveles RAID 0, 1 y 5, "
@@ -2089,7 +2093,27 @@ msgstr ""
 "\"preseed-bootloader\"/>."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgstr ""
+"También puede utilizar la preconfiguración para configurar las particiones "
+"en arreglos RAID por software. Se puede utilizar para niveles RAID 0, 1 y 5, "
+"6 y 10 creando arreglos degradados y especificando dispositivos libres. "
+"Puede configurar grub para que se instale en todos los dispositivos "
+"utilizados en el arreglo si está utilizando RAID 1, consulte <xref linkend="
+"\"preseed-bootloader\"/>."
+
+#. Tag: para
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2105,7 +2129,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2219,13 +2243,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Controlar como se montan las particiones"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2245,7 +2269,7 @@ msgstr ""
 "UUID."
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2255,7 +2279,7 @@ msgstr ""
 "continuarán usando sus nombres tradicionales en lugar de los UUID."
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2272,7 +2296,7 @@ msgstr ""
 "arranque."
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2289,13 +2313,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "Configuración del sistema base"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2306,7 +2330,7 @@ msgstr ""
 "única pregunta concerniente a la instalación se refiere al núcleo."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2337,13 +2361,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "Configuración de cuentas de usuario"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2356,7 +2380,7 @@ msgstr ""
 "<emphasis>hashes</emphasis> MD5 como valores en texto plano ."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2373,7 +2397,7 @@ msgstr ""
 "fuerza bruta sobre la contraseña."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2433,7 +2457,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2454,26 +2478,26 @@ msgstr ""
 "clave SSH o <command>sudo</command>)."
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "Puede generar un hash MD5 para una contraseña con la siguiente orden:"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "Configuración de APT"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2487,7 +2511,7 @@ msgstr ""
 "forma opcional, puede añadir otros repositorios (locales)."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2546,13 +2570,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "Selección de paquetes"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2563,73 +2587,73 @@ msgstr ""
 "incluyen:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "Sistema estándar («standard»)"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "Entorno de escritorio («desktop»)"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "Entorno de escritorio GNOME («gnome-desktop»)"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "Entorno de escritorio KDE («kde-desktop»)"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "Servidor web («web-server»)"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "Servidor de impresoras («print-server»)"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "Servidor de DNS («dns-server»)"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "Servidor de ficheros («file-server»)"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "Servidor de correo («mail-server»)"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "Base de datos SQL («sql-database»)"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "Ordenador portátil («laptop»)"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2641,7 +2665,7 @@ msgstr ""
 "introduzca la tarea <userinput>Sistema estándar</userinput>."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2657,7 +2681,7 @@ msgstr ""
 "órdenes del núcleo."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2697,14 +2721,62 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Instalación del cargador de arranque"
 
 #. Tag: screen
-#: preseed.xml:1084
-#, no-c-format
+#: preseed.xml:1087
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
+#| "# instead, uncomment this:\n"
+#| "#d-i grub-installer/skip boolean true\n"
+#| "# To also skip installing lilo, and install no bootloader, uncomment "
+#| "this\n"
+#| "# too:\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
+#| "\n"
+#| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
+#| "the\n"
+#| "# default. If you need GRUB Legacy for some particular reason, then\n"
+#| "# uncomment this:\n"
+#| "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
+#| "\n"
+#| "# This is fairly safe to set, it makes grub install automatically to the "
+#| "MBR\n"
+#| "# if no other operating system is detected on the machine.\n"
+#| "d-i grub-installer/only_debian boolean true\n"
+#| "\n"
+#| "# This one makes grub-installer install to the MBR if it also finds some "
+#| "other\n"
+#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
+#| "d-i grub-installer/with_other_os boolean true\n"
+#| "\n"
+#| "# Alternatively, if you want to install to a location other than the "
+#| "mbr,\n"
+#| "# uncomment and edit these lines:\n"
+#| "#d-i grub-installer/only_debian boolean false\n"
+#| "#d-i grub-installer/with_other_os boolean false\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
+#| "# To install grub to multiple disks:\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+#| "\n"
+#| "# Optional password for grub, either in clear text\n"
+#| "#d-i grub-installer/password password r00tme\n"
+#| "#d-i grub-installer/password-again password r00tme\n"
+#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
+#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
+#| "\n"
+#| "# Use the following option to add additional boot parameters for the\n"
+#| "# installed system (if supported by the bootloader installer).\n"
+#| "# Note: options passed to the installer will be added automatically.\n"
+#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
 "you want lilo installed\n"
@@ -2739,6 +2811,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2802,7 +2876,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2814,13 +2888,13 @@ msgstr ""
 "clave para <classname>grub</classname>."
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "Finalizar la instalación"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2860,13 +2934,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Preconfiguración de otros paquetes"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2887,19 +2961,19 @@ msgstr ""
 "#   debconf-get-selections >> fichero"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Ejecutar órdenes personalizadas durante la instalación"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2910,7 +2984,7 @@ msgstr ""
 "distintos puntos de la instalación."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2962,13 +3036,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "Utilizar la preconfiguración para cambiar valores por omisión"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2996,7 +3070,7 @@ msgstr ""
 "preconfiguración."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -3011,7 +3085,7 @@ msgstr ""
 "\"/>."
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -3035,13 +3109,13 @@ msgstr ""
 "parámetros <quote>internos</quote>."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Carga de ficheros de configuración en cadena"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -3058,7 +3132,7 @@ msgstr ""
 "en otros ficheros."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -3114,7 +3188,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/es/random-bits.po b/po/es/random-bits.po
index 3fcd4f4c9..53c1fec69 100644
--- a/po/es/random-bits.po
+++ b/po/es/random-bits.po
@@ -34,7 +34,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-13 23:35+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -860,8 +860,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "Servidor de DNS"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -877,13 +905,13 @@ msgstr ""
 "para la descarga e instalación de esta tarea."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Instalar &debian-gnu; desde un sistema Unix/Linux"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -906,7 +934,7 @@ msgstr ""
 "orden introducida en la jaula (<quote>chroot</quote>, N. del t.) de &debian;."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -923,7 +951,7 @@ msgstr ""
 "mecanismos de instalación o arranque disponibles."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -946,13 +974,13 @@ msgstr ""
 "adicionales en la instalación y/o configuración."
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "Primeros pasos"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -968,7 +996,7 @@ msgstr ""
 "entorno X (más si quiere instalar entornos de escritorio como GNOME o KDE)."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -987,7 +1015,7 @@ msgstr ""
 "ext2, omita <userinput>-j</userinput>."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -1013,7 +1041,7 @@ msgstr ""
 "adelante."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -1023,7 +1051,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -1036,13 +1064,13 @@ msgstr ""
 "distintas."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Instalar <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -1066,7 +1094,7 @@ msgstr ""
 "actual, y luego descargue e instale <command>debootstrap</command>."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -1094,7 +1122,7 @@ msgstr ""
 "privilegios de superusuario para instalar los ficheros."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1106,13 +1134,13 @@ msgstr ""
 "# zcat /ruta-completa-hasta-trabajo/trabajo/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Ejecutar <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -1130,7 +1158,7 @@ msgstr ""
 "réplica en: <ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1143,7 +1171,7 @@ msgstr ""
 "userinput>."
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1164,7 +1192,7 @@ msgstr ""
 "<userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1174,13 +1202,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Configurar el sistema base"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1189,27 +1217,28 @@ msgid ""
 "</screen></informalexample> After chrooting you may need to set the terminal "
 "definition to be compatible with the &debian; base system, for example:"
 msgstr ""
-"Ahora tiene instalado un sistema &debian;, aunque algo limitado, en su disco. "
-"Ejecute la orden <command>chroot</command> en él: <informalexample><screen>\n"
+"Ahora tiene instalado un sistema &debian;, aunque algo limitado, en su "
+"disco. Ejecute la orden <command>chroot</command> en él: "
+"<informalexample><screen>\n"
 "# LANG=C chroot /mnt/debinst /bin/bash\n"
 "</screen></informalexample> Después de haber hecho esto puede que necesite "
 "establecer una definición de terminal compatible con el sistema base de "
 "&debian;. Por ejemplo:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "Crear ficheros de dispositivos"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1230,20 +1259,20 @@ msgstr ""
 "nuevo."
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "Algunas de las opciones disponibles son las siguientes:"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr ""
 "cree un conjunto predeterminado de ficheros de dispositivo estáticos con"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1253,7 +1282,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1262,7 +1291,7 @@ msgstr ""
 "<command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1276,13 +1305,13 @@ msgstr ""
 "dispositivo. Utilice esta opción con precaución."
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Montar particiones"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1364,13 +1393,13 @@ msgstr ""
 "antes de continuar si no usa <userinput>mount -a</userinput>:"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1382,19 +1411,19 @@ msgstr ""
 "quote> fuera del entorno chroot:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Configurar la zona horaria"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1407,7 +1436,7 @@ msgstr ""
 "siguiente orden le permite configurar esto y elegir su zona horaria."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1417,13 +1446,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr ">Configurar la red"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1551,13 +1580,13 @@ msgstr ""
 "haya indicado."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Configurar Apt"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1583,13 +1612,13 @@ msgstr ""
 "update</userinput> después de hacer cambios a la lista de fuentes."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Configurar la localización y el teclado"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1609,7 +1638,7 @@ msgstr ""
 "</screen></informalexample> Para configurar su teclado (si lo necesita):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1619,7 +1648,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1629,13 +1658,13 @@ msgstr ""
 "chroot, pero se configurará en el siguiente reinicio."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Instalar un núcleo"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1646,13 +1675,13 @@ msgstr ""
 "empaquetados disponibles con:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
@@ -1660,7 +1689,7 @@ msgstr ""
 "paquete."
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1670,13 +1699,13 @@ msgstr ""
 "replaceable>"
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Configurar el gestor de arranque"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1691,7 +1720,7 @@ msgstr ""
 "(«chroot») &debian; para hacer esto."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1716,7 +1745,7 @@ msgstr ""
 "</phrase>."
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1739,7 +1768,7 @@ msgstr ""
 "La última orden creará un <filename>/boot/grub/menu.lst</filename> funcional."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1751,13 +1780,13 @@ msgstr ""
 "<command>grub</command>, pero están fuera del alcance de este apéndice."
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Aquí tiene un ejemplo básico de /etc/lilo.conf:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1779,7 +1808,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1799,7 +1828,7 @@ msgstr ""
 "ejecute)."
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1829,13 +1858,13 @@ msgstr ""
 "userinput> en algunas máquinas en lugar de <userinput>hd:</userinput>."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Toques finales"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1855,7 +1884,7 @@ msgstr ""
 "<command>aptitude</command> para instalar individualmente todos los paquetes."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1867,19 +1896,19 @@ msgstr ""
 "ejecutando:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "Instalar &debian-gnu; a través de una línea IP paralela (PLIP)"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1896,7 +1925,7 @@ msgstr ""
 "pueda acceder a una réplica de &debian; (por ejemplo, en Internet)."
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1913,7 +1942,7 @@ msgstr ""
 "libres en su espacio de direcciones de red)."
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1925,7 +1954,7 @@ msgstr ""
 "(véase <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1939,13 +1968,13 @@ msgstr ""
 "<literal>io=0x378</literal> e <literal>irq=7</literal>."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "Requisitos"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1955,7 +1984,7 @@ msgstr ""
 "instalar &debian;."
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
@@ -1963,7 +1992,7 @@ msgstr ""
 "\"installation-media\"/>."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1974,7 +2003,7 @@ msgstr ""
 "emphasis>."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1986,13 +2015,13 @@ msgstr ""
 "url=\"&url-plip-install-howto;\">PLIP-Install-HOWTO</ulink>."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "Configurar el sistema origen"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -2002,7 +2031,7 @@ msgstr ""
 "ordenador fuente como una pasarela a Internet utilizando ppp0."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -2045,13 +2074,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "Instalar el objetivo"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2078,13 +2107,13 @@ msgstr ""
 "durante las distintas fases de la instalación."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Cargar componentes del instalador desde CD"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2094,13 +2123,13 @@ msgstr ""
 "hará que el sistema de instalación pueda utilizar los controladores PLIP."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Detección del hardware de red"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2115,7 +2144,7 @@ msgstr ""
 "objetivo no tiene una tarjeta de red el instalador no mostrará esta lista."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2127,19 +2156,19 @@ msgstr ""
 "tarjeta de red. Seleccione el módulo <userinput>plip</userinput>."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "Configurar la red"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "¿Desea configurar automáticamente la red con DHCP? No"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2147,7 +2176,7 @@ msgstr ""
 "Dirección IP: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2157,7 +2186,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2168,13 +2197,13 @@ msgstr ""
 "filename>)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "Instalación de &debian-gnu; a través de PPP sobre Ethernet (PPPoE)"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2190,7 +2219,7 @@ msgstr ""
 "muy sencilla. Esta sección explica cómo."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2202,7 +2231,7 @@ msgstr ""
 "<xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2216,7 +2245,7 @@ msgstr ""
 "condition=\"supports-floppy-boot\"> o diskettes</phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2227,7 +2256,7 @@ msgstr ""
 "continuación."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2244,7 +2273,7 @@ msgstr ""
 "(<classname>ppp-udeb</classname>)."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2265,7 +2294,7 @@ msgstr ""
 "sistema del arranque. </para> </footnote>)."
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2275,7 +2304,7 @@ msgstr ""
 "identificar cualquier tarjeta Ethernet presente en su sistema."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2287,7 +2316,7 @@ msgstr ""
 "concentrador PPPoE (un tipo de servidor que maneja las conexiones PPPoE)."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2304,7 +2333,7 @@ msgstr ""
 "guimenuitem>."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2314,7 +2343,7 @@ msgstr ""
 "teclear su información de autenticación (el usuario y la clave de PPPoE)."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2335,13 +2364,13 @@ msgstr ""
 "<guimenuitem>Configurar e iniciar una conexión PPPoE</guimenuitem> del menú."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "El instalador gráfico"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2355,7 +2384,7 @@ msgstr ""
 "que utiliza los mismos programas pero con una interfaz diferente."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2373,7 +2402,7 @@ msgstr ""
 "ratón y en algunos casos las preguntas se mostrarán en una sola pantalla."
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2395,7 +2424,7 @@ msgstr ""
 "elegir la opción <quote>Ayuda</quote> del menú de arranque."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2413,7 +2442,7 @@ msgstr ""
 "principalmente para pruebas."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2432,7 +2461,7 @@ msgstr ""
 "funcione en otros sistemas."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2442,7 +2471,7 @@ msgstr ""
 "arranque cuando comienza el instalador gráfico."
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2456,7 +2485,7 @@ msgstr ""
 "quote>."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2470,13 +2499,13 @@ msgstr ""
 "sistemas con poca memoria disponible."
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "Utilizar el instalador gráfico"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2488,7 +2517,7 @@ msgstr ""
 "proceso de instalación."
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2509,7 +2538,7 @@ msgstr ""
 "marcará (o desmarcará) una selección pero no activará el &BTN-CONT;."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2521,7 +2550,7 @@ msgstr ""
 "activando el botón o pulsando la tecla <keycap>F1</keycap>."
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/es/using-d-i.po b/po/es/using-d-i.po
index d78437729..408f1c9da 100644
--- a/po/es/using-d-i.po
+++ b/po/es/using-d-i.po
@@ -35,7 +35,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-10 17:41+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -507,11 +507,25 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr ""
+"Configura la contraseña del usuario «root» (administrador) y añade un "
+"usuario no-administrador."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -521,26 +535,26 @@ msgstr ""
 "o no."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr ""
 "Selecciona la zona horaria, basada en el lugar seleccionado previamente."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
@@ -555,13 +569,13 @@ msgstr ""
 "(LVM). Es la herramienta de particionado recomendada para &debian;."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -571,13 +585,13 @@ msgstr ""
 "programa de particionado apropiado para la arquitectura de su ordenador."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -587,13 +601,13 @@ msgstr ""
 "particiones seleccionadas de acuerdo a las instrucciones del usuario."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -603,13 +617,13 @@ msgstr ""
 "( Logical Volume Manager ó <firstterm>LVM</firstterm>, N. del t.)."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -622,13 +636,13 @@ msgstr ""
 "IDE (pseudo hardware) que puede encontrar en placas base nuevas."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -638,20 +652,6 @@ msgstr ""
 "opere con &debian-gnu; cuando se reinicie."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr ""
-"Configura la contraseña del usuario «root» (administrador) y añade un "
-"usuario no-administrador."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -1013,10 +1013,10 @@ msgid ""
 msgstr ""
 "La ubicación geográfica seleccionada (habitualmente, un país) se utilizará "
 "más adelante en el proceso de instalación para seleccionar la zona horaria "
-"correcta y el servidor de réplica de &debian; más apropiada en función de ese "
-"país. El idioma y el país se utilizarán conjuntamente para ayudar a definir "
-"la locale predeterminada del sistema y seleccionar la distribución del "
-"teclado adecuada."
+"correcta y el servidor de réplica de &debian; más apropiada en función de "
+"ese país. El idioma y el país se utilizarán conjuntamente para ayudar a "
+"definir la locale predeterminada del sistema y seleccionar la distribución "
+"del teclado adecuada."
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -1157,15 +1157,16 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Normalmente los teclados están sujetos a los caracteres usados en un "
 "determinado idioma. Seleccione un teclado de acuerdo al modelo que use, o "
 "seleccione algo parecido a éste si no encuentra su modelo de teclado. Una "
 "vez que la instalación haya finalizado, podrá seleccionar un modelo de "
-"teclado de entre un rango más amplio de opciones (ejecute «dpkg-reconfigure keyboard-configuration» como "
-"superusuario cuando haya completado la instalación)."
+"teclado de entre un rango más amplio de opciones (ejecute «dpkg-reconfigure "
+"keyboard-configuration» como superusuario cuando haya completado la "
+"instalación)."
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1505,11 +1506,150 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Configurar usuarios y contraseñas"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"El instalador le permitirá configurar la cuenta del usuario <quote>root</"
+"quote> (superusuario, o usuario administrador, N. del T.) y/o una cuenta "
+"para el primer usuario una vez haya instalado el sistema base. Puede crear "
+"otras cuentas de usuario una vez haya terminado el proceso de instalación."
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "Configurar la contraseña de root"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"La cuenta de <emphasis>root</emphasis> también se la conoce como la cuenta "
+"de <emphasis>super-usuario</emphasis>. Se trata de una cuenta que puede "
+"saltarse todas las protecciones de seguridad del sistema. Es una cuenta que "
+"sólo debería utilizarse para realizar la administración del sistema y sólo "
+"durante un tiempo tan corto como sea posible."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"Cualquier contraseña para esta cuenta debería tener al menos seis caracteres "
+"y debería tener tanto caracteres en mayúsculas como en minúsculas así como "
+"caracteres de puntuacion. Tenga mucho cuidado cuando configure la contraseña "
+"de root ya que es una cuenta con muchos privilegios. Evite el uso de "
+"palabras de diccionario o utilizar información personal que podría advinarse "
+"fácilmente."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Si alguien le pregunta alguna vez que necesita su contraseña de root sea "
+"extremadamente cuidadoso. Nunca debería entregar su contraseña de root, a no "
+"ser que haya más de una persona haciendo tareas de administración del equipo."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Crear un usuario normal"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"El sistema le preguntará si desea o no crear una cuenta de usuario normal. "
+"Esta cuenta debería utilizarse como su cuenta personal para acceder al "
+"sistema. <emphasis>No</emphasis> debe utilizar la cuenta de root como su "
+"cuenta personal o de uso diario."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"¿Por qué no debe hacer esto? Una razón es que el uso de los privilegios de "
+"root hace muy fácil que pueda causar daños irreparables al sistema. Otra "
+"razón es que alguien le podría intentar engañar y hacer que entre en "
+"funcionamiento un <emphasis>caballo de Troya</emphasis> (un programa que "
+"parece inocuo pero que toma control de la seguridad de su sistema sin que "
+"vd. lo sepa gracias a los privilegios de root). Cualquier buen libro de "
+"administración de sistemas Unix cubre este tema en más detalle, le "
+"recomendamos que lea alguno si este tema es nuevo para vd."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Primero se le preguntará el nombre completo del usuario. Después se le "
+"pedirá un nombre para la cuenta de usuario. Habitualmente se utiliza su "
+"nombre o algo parecido y, de hecho, éste será el valor por omisión. A "
+"continuación se le pedirá una contraseña para esta cuenta."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Si quiere crear otra cuenta de usuario después de la instalación, puede "
+"utilizar la orden <command>adduser</command>."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Particionado y elección de punto de montaje"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1528,7 +1668,7 @@ msgstr ""
 "relacionadas como LVM o dispositivos RAID."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1538,7 +1678,7 @@ msgstr ""
 "detalles, lea el <xref linkend=\"partitioning\"/>."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1561,7 +1701,7 @@ msgstr ""
 "datos que existan en el disco no vuelvan a ser accesibles."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1575,13 +1715,13 @@ msgstr ""
 "<guimenuitem>Manual</guimenuitem> en el menú."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "Opciones de particionado aceptados"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1593,7 +1733,7 @@ msgstr ""
 "fichero y dispositivos de bloque avanzado."
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1614,7 +1754,7 @@ msgstr ""
 "se usarán valores predefinidos adecuados con prioridades más altas."
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1625,31 +1765,31 @@ msgstr ""
 "usar en combinación."
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "Gestor de Volúmenes Lógicos (LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "Software RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "Se aceptan los niveles de RAID 0, 1, 4, 5, 6 y 10."
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "Cifrado"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1657,7 +1797,7 @@ msgstr ""
 "<emphasis>Serial ATA RAID</emphasis> (usando <classname>dmraid</classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1671,13 +1811,13 @@ msgstr ""
 "\">nuestra wiki</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>Multipath</emphasis> (experimental)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1689,13 +1829,13 @@ msgstr ""
 "al arrancar el instalador."
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "Se permiten los siguientes sistemas de fichero."
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1707,7 +1847,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1719,19 +1859,19 @@ msgstr ""
 "filename> si se usa el particionado guiado."
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>jfs</emphasis> (no disponible para todas las arquitecturas)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>xfs</emphasis> (no disponible para todas las arquitecturas)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
@@ -1740,7 +1880,7 @@ msgstr ""
 "arquitecturas)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1754,13 +1894,13 @@ msgstr ""
 "Sólo se permite la versión 3 del sistema de ficheros."
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1770,13 +1910,13 @@ msgstr ""
 "particiones jffs2 nuevas."
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1786,19 +1926,19 @@ msgstr ""
 "puntos de montaje. No es posible crear particiones qnx4 nuevas."
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (sólo lectura)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1808,13 +1948,13 @@ msgstr ""
 "puntos de montaje. No es posible crear particiones NTFS nuevas."
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "Particionado guiado"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1832,7 +1972,7 @@ msgstr ""
 "con <quote>dm-crypt</quote> en el núcleo. </para> </footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1841,7 +1981,7 @@ msgstr ""
 "arquitecturas."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1859,7 +1999,7 @@ msgstr ""
 "(personales)."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1875,7 +2015,7 @@ msgstr ""
 "esto puede llevar un tiempo dependiendo del tamaño de su disco."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1893,7 +2033,7 @@ msgstr ""
 "estos cambios antes de escribirlos en disco."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1912,7 +2052,7 @@ msgstr ""
 "identificarlos."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1927,7 +2067,7 @@ msgstr ""
 "hasta el final. Esto no es posible cuando utiliza LVM (cifrado)."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1946,73 +2086,73 @@ msgstr ""
 "guiado fallará."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Esquema de particionado"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Espacio mínimo"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Particiones creadas"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Todos los ficheros en una partición"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600 MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, intercambio"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Partición /home separada"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500 MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, intercambio"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Particiones /home, /usr, /var y /tmp separadas"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -2022,7 +2162,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, intercambio"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -2036,7 +2176,7 @@ msgstr ""
 "partición LVM."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -2051,7 +2191,7 @@ msgstr ""
 "como una partición de arranque EFI."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -2063,7 +2203,7 @@ msgstr ""
 "cómo, y dónde se montarán."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2115,7 +2255,7 @@ msgstr ""
 "utilizando el particionado manual."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2136,13 +2276,13 @@ msgstr ""
 "como se describe a continuación."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "Particionado manual"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
@@ -2157,7 +2297,7 @@ msgstr ""
 "manualmente sus particiones y el uso de éstas en su sistema &debian; nuevo."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2172,7 +2312,7 @@ msgstr ""
 "disco seleccionado."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2214,7 +2354,7 @@ msgstr ""
 "command>."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2237,7 +2377,7 @@ msgstr ""
 "partición."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2253,7 +2393,7 @@ msgstr ""
 "continuar hasta que corrija esto."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2265,7 +2405,7 @@ msgstr ""
 "habilite una."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2282,7 +2422,7 @@ msgstr ""
 "filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2297,13 +2437,13 @@ msgstr ""
 "sistemas de ficheros solicitados."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Configuración de dispositivos multidisco (RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2323,7 +2463,7 @@ msgstr ""
 "conocida <firstterm>RAID</firstterm>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2338,7 +2478,7 @@ msgstr ""
 "etc.)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2454,55 +2594,55 @@ msgstr ""
 "variablelist> Resumiendo:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Dispositivos mínimos"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Dispositivo de reserva"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "¿Sobrevive al fallo de un disco?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Espacio disponible"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID 0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>no</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
@@ -2510,43 +2650,43 @@ msgstr ""
 "el sistema RAID."
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID 1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "opcional"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>sí</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Tamaño de la menor partición en el sistema RAID."
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID 5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2556,19 +2696,19 @@ msgstr ""
 "dispositivos en RAID menos uno."
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID 6"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2578,13 +2718,13 @@ msgstr ""
 "dispositivos RAID menos dos)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID 10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2594,7 +2734,7 @@ msgstr ""
 "(predeterminado a 2)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2604,7 +2744,7 @@ msgstr ""
 "raid-howto;\">CÓMO de RAID</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2620,7 +2760,7 @@ msgstr ""
 "<guimenuitem>volumen físico para RAID</guimenuitem> </menuchoice>)."
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2640,7 +2780,7 @@ msgstr ""
 "<filename>/</filename> y RAID 1 para <filename>/boot</filename>."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2659,7 +2799,7 @@ msgstr ""
 "órdenes."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2681,7 +2821,7 @@ msgstr ""
 "dependen del tipo de MD seleccionado."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2693,7 +2833,7 @@ msgstr ""
 "el MD."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2713,7 +2853,7 @@ msgstr ""
 "particiones, &d-i; no le dejará continuar hasta que solucione el problema."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2724,7 +2864,7 @@ msgstr ""
 "particiones activas."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2735,7 +2875,7 @@ msgstr ""
 "activas."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2756,7 +2896,7 @@ msgstr ""
 "activos como copias estarían distribuidas en diferentes discos."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2774,7 +2914,7 @@ msgstr ""
 "bastante segura de 100 GB para <filename>/home</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2788,13 +2928,13 @@ msgstr ""
 "atributos habituales, como los puntos de montaje."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Configuración del gestor de volúmenes lógicos (LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2811,7 +2951,7 @@ msgstr ""
 "otro, realizando enlaces simbólicos, etc."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2832,7 +2972,7 @@ msgstr ""
 "pueden extenderse a lo largo de varios discos."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2853,7 +2993,7 @@ msgstr ""
 "lvm-howto;\">CÓMO LVM</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2870,7 +3010,7 @@ msgstr ""
 "<guimenuitem>volumen físico para LVM</guimenuitem> </menuchoice>."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2891,7 +3031,7 @@ msgstr ""
 "cada momento. Las acciones posibles son:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2902,43 +3042,43 @@ msgstr ""
 "lógicos junto con otra información."
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Crear grupo de volúmenes"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Crear volúmenes lógicos"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Borrar el grupo de volúmenes"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Borrar volúmenes lógicos"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Extender los grupos de volúmenes"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Reducir los grupos de volúmenes"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2948,7 +3088,7 @@ msgstr ""
 "<command>partman</command>."
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2958,7 +3098,7 @@ msgstr ""
 "primera vez y después cree dentro de éste sus volúmenes lógicos."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2970,13 +3110,13 @@ msgstr ""
 "tratarlas como tales)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Configurar volúmenes cifrados"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2999,7 +3139,7 @@ msgstr ""
 "correcta."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -3028,7 +3168,7 @@ msgstr ""
 "núcleo de una partición cifrada."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -3043,7 +3183,7 @@ msgstr ""
 "escogidos."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -3064,7 +3204,7 @@ msgstr ""
 "partición."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -3081,7 +3221,7 @@ msgstr ""
 "que tenga razones importantes para no utilizarla."
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -3095,13 +3235,13 @@ msgstr ""
 "con mucho cuidado pensando en la seguridad de su sistema."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Cifrado: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3128,13 +3268,13 @@ msgstr ""
 "proteger información sensible en el siglo XXI."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Longitud de clave: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -3149,13 +3289,13 @@ msgstr ""
 "distintos tamaños de longitud de clave."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "Algoritmo de VI: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3174,7 +3314,7 @@ msgstr ""
 "datos cifrados."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3189,25 +3329,25 @@ msgstr ""
 "nuevos algoritmos."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Clave de cifrado: <userinput>Frase de contraseña</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Aquí puede introducir el tipo de clave de cifrado para esta partición."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Frase de contraseña"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3221,13 +3361,13 @@ msgstr ""
 "contraseña que podrá introducir en el proceso más adelante."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Clave aleatoria"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3246,7 +3386,7 @@ msgstr ""
 "razonable."
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3267,13 +3407,13 @@ msgstr ""
 "del sistema guardados en la partición de intercambio."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Borrar los datos: <userinput>sí</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3296,7 +3436,7 @@ msgstr ""
 "escrituras en medios magneto-ópticos. </para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3308,13 +3448,13 @@ msgstr ""
 "presentarán las siguientes opciones:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Cifrado: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3327,26 +3467,26 @@ msgstr ""
 "de clave para más información."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Clave de cifrado: <userinput>Fichero de clave (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr ""
 "Aquí puede seleccionar el tipo de clave de cifrado para esta partición."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Fichero de clave (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3360,7 +3500,7 @@ msgstr ""
 "contraseña (que se le solicitará durante el proceso)."
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr ""
@@ -3368,14 +3508,14 @@ msgstr ""
 "aleatorias."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr ""
 "Consulte la sección precedente si desea más información del borrado de datos."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3394,7 +3534,7 @@ msgstr ""
 "tardarán un tiempo si está trabajando con particiones grandes."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3412,7 +3552,7 @@ msgstr ""
 "mascotas, nombres de miembros de la familia, etc.)."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3438,7 +3578,7 @@ msgstr ""
 "de ficheros raíz."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3461,7 +3601,7 @@ msgstr ""
 "cada partición a cifrar."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3495,7 +3635,7 @@ msgstr ""
 "ficheros si los valores por omisión no se ajustan a sus necesidades."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3514,7 +3654,7 @@ msgstr ""
 "en <xref linkend=\"mount-encrypted-volumes\"/>."
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3524,13 +3664,13 @@ msgstr ""
 "particionado."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "Instalar el sistema base"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3544,7 +3684,7 @@ msgstr ""
 "podría tomar algún tiempo."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3561,7 +3701,7 @@ msgstr ""
 "keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3573,7 +3713,7 @@ msgstr ""
 "de que la instalación se realice a través de una consola serie."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3587,7 +3727,7 @@ msgstr ""
 "entre una lista de núcleos disponibles."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3605,7 +3745,7 @@ msgstr ""
 "ser instalados junto con esos programas."
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3619,140 +3759,6 @@ msgstr ""
 "punto del proceso de instalación."
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "Configurar usuarios y contraseñas"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"El instalador le permitirá configurar la cuenta del usuario <quote>root</"
-"quote> (superusuario, o usuario administrador, N. del T.) y/o una cuenta "
-"para el primer usuario una vez haya instalado el sistema base. Puede crear "
-"otras cuentas de usuario una vez haya terminado el proceso de instalación."
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "Configurar la contraseña de root"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"La cuenta de <emphasis>root</emphasis> también se la conoce como la cuenta "
-"de <emphasis>super-usuario</emphasis>. Se trata de una cuenta que puede "
-"saltarse todas las protecciones de seguridad del sistema. Es una cuenta que "
-"sólo debería utilizarse para realizar la administración del sistema y sólo "
-"durante un tiempo tan corto como sea posible."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"Cualquier contraseña para esta cuenta debería tener al menos seis caracteres "
-"y debería tener tanto caracteres en mayúsculas como en minúsculas así como "
-"caracteres de puntuacion. Tenga mucho cuidado cuando configure la contraseña "
-"de root ya que es una cuenta con muchos privilegios. Evite el uso de "
-"palabras de diccionario o utilizar información personal que podría advinarse "
-"fácilmente."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Si alguien le pregunta alguna vez que necesita su contraseña de root sea "
-"extremadamente cuidadoso. Nunca debería entregar su contraseña de root, a no "
-"ser que haya más de una persona haciendo tareas de administración del equipo."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "Crear un usuario normal"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"El sistema le preguntará si desea o no crear una cuenta de usuario normal. "
-"Esta cuenta debería utilizarse como su cuenta personal para acceder al "
-"sistema. <emphasis>No</emphasis> debe utilizar la cuenta de root como su "
-"cuenta personal o de uso diario."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"¿Por qué no debe hacer esto? Una razón es que el uso de los privilegios de "
-"root hace muy fácil que pueda causar daños irreparables al sistema. Otra "
-"razón es que alguien le podría intentar engañar y hacer que entre en "
-"funcionamiento un <emphasis>caballo de Troya</emphasis> (un programa que "
-"parece inocuo pero que toma control de la seguridad de su sistema sin que "
-"vd. lo sepa gracias a los privilegios de root). Cualquier buen libro de "
-"administración de sistemas Unix cubre este tema en más detalle, le "
-"recomendamos que lea alguno si este tema es nuevo para vd."
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Primero se le preguntará el nombre completo del usuario. Después se le "
-"pedirá un nombre para la cuenta de usuario. Habitualmente se utiliza su "
-"nombre o algo parecido y, de hecho, éste será el valor por omisión. A "
-"continuación se le pedirá una contraseña para esta cuenta."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Si quiere crear otra cuenta de usuario después de la instalación, puede "
-"utilizar la orden <command>adduser</command>."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4584,8 +4590,8 @@ msgid ""
 "will serve as a secondary boot loader."
 msgstr ""
 "Escoja esta opción si quiere usar otro gestor de arranque. Se instalará "
-"<command>LILO</command> al principio de la nueva partición de &debian; y hará "
-"las veces de gestor de arranque secundario."
+"<command>LILO</command> al principio de la nueva partición de &debian; y "
+"hará las veces de gestor de arranque secundario."
 
 #. Tag: term
 #: using-d-i.xml:2713
@@ -4685,14 +4691,21 @@ msgstr "¡Escoja la partición correcta!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "El criterio para seleccionar una partición es que tenga un sistema de "
 "ficheros FAT y la marca <emphasis>boot</emphasis> (arrancable, N. del t.) "
@@ -4772,10 +4785,10 @@ msgid ""
 "GNU/Linux</guimenuitem> menu item of the <quote>EFI Boot Manager</quote> "
 "command menu."
 msgstr ""
-"Este es el gestor de arranque ejecutado por el <quote>gestor de "
-"arranque EFI</quote> para arrancar el sistema. Es el programa detrás de la "
-"opción <guimenuitem>&debian; GNU/Linux</guimenuitem> en el menú del "
-"<quote>gestor de arranque EFI</quote>."
+"Este es el gestor de arranque ejecutado por el <quote>gestor de arranque "
+"EFI</quote> para arrancar el sistema. Es el programa detrás de la opción "
+"<guimenuitem>&debian; GNU/Linux</guimenuitem> en el menú del <quote>gestor "
+"de arranque EFI</quote>."
 
 #. Tag: filename
 #: using-d-i.xml:2831
diff --git a/po/fi/administrivia.po b/po/fi/administrivia.po
index a8f940f3d..c380f5b7c 100644
--- a/po/fi/administrivia.po
+++ b/po/fi/administrivia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide administrivia\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2009-08-29 18:01+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -30,10 +30,15 @@ msgstr "Tietoa tästä ohjeesta"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This manual was created for Sarge's debian-installer, based on the Woody "
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -203,7 +208,7 @@ msgstr ""
 #| "Kuře has documented a lot of the new functionality in Sarge's debian-"
 #| "installer."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/fi/bookinfo.po b/po/fi/bookinfo.po
index bb31685e1..75c9e552b 100644
--- a/po/fi/bookinfo.po
+++ b/po/fi/bookinfo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation-guide bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2008-03-06 11:14+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -40,17 +40,28 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Tämä asennusohje pohjautuu aikaisempaan vanhaa Debianin asennusjärjestelmää "
 "varten kirjoitettuun käsikirjaan (<quote>boot-floppies</quote>), ja on "
diff --git a/po/fi/hardware.po b/po/fi/hardware.po
index 68a60340f..2ffb3fde6 100644
--- a/po/fi/hardware.po
+++ b/po/fi/hardware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide hardware\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-03 06:07+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -59,10 +59,11 @@ msgid ""
 msgstr ""
 "&debian;in laitevaatimukset eivät ole ankarampia kuin Linuxin ytimen ja GNU-"
 "työkalusarjan vaatimukset. Niinpä kaikki laitealustat joille on siirretty "
-"Linux-ydin, libc, <command>gcc</command>, jne, ja joille on olemassa "
-"&debian;in siirros, kelpaavat &debian;ille. &debian;in Siirrokset-sivulta "
+"Linux-ydin, libc, <command>gcc</command>, jne, ja joille on olemassa &debian;"
+"in siirros, kelpaavat &debian;ille. &debian;in Siirrokset-sivulta "
 "osoitteessa <ulink url=\"&url-ports;\"></ulink> löytyy yksityiskohtaisempaa "
-"tietoa laitealustan &arch-title; järjestelmistä joissa &debian;ia on kokeiltu."
+"tietoa laitealustan &arch-title; järjestelmistä joissa &debian;ia on "
+"kokeiltu."
 
 #. Tag: para
 #: hardware.xml:32
@@ -821,15 +822,15 @@ msgstr "I/O Väylä"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "Väylä on emolevyn osa jonka kautta suoritin kommunikoi oheislaitteiden kuten "
-"massamuistien kanssa. Tietokoneessa on oltava ISA, EISA, PCI, PCIe, PCI-X tai VESA "
-"Local Bus (VLB, joskus käytetään nimeä VL-väylä). Käytännöllisesti katsoen "
-"kaikissa viime vuosina myydyissä henkilökohtaisissa tietokoneissa on joku "
-"näistä."
+"massamuistien kanssa. Tietokoneessa on oltava ISA, EISA, PCI, PCIe, PCI-X "
+"tai VESA Local Bus (VLB, joskus käytetään nimeä VL-väylä). Käytännöllisesti "
+"katsoen kaikissa viime vuosina myydyissä henkilökohtaisissa tietokoneissa on "
+"joku näistä."
 
 #. Tag: para
 #: hardware.xml:484
@@ -850,7 +851,8 @@ msgid ""
 "subarchitectures, please contact the <ulink url=\"&url-list-subscribe;\"> "
 "debian-&arch-listname; mailing list</ulink>."
 msgstr ""
-"&debian;in &arch-title;-siirros tukee seuraavia laitealustoja: <itemizedlist>\n"
+"&debian;in &arch-title;-siirros tukee seuraavia laitealustoja: "
+"<itemizedlist>\n"
 "<listitem>\n"
 "<para> SGI IP22: tähän laitealustaan kuuluvat SGI:n mallit Indy, Indigo 2\n"
 "ja Challenge S. Koska nämä mallit ovat hyvin samanlaisia, koskee kaikki mitä "
@@ -860,7 +862,8 @@ msgstr ""
 "<para> SGI IP32: tämä laitealusta tunnetaan yleensä nimellä SGI O2.\n"
 "</para></listitem>\n"
 "<listitem><para> MIPS Malta: QEMU emuloi tätä laitealustaa, sillä voi siis "
-"kivasti testata ja ajaa &debian;ia MIPS:llä jos käytettävissä ei ole rautaa.\n"
+"kivasti testata ja ajaa &debian;ia MIPS:llä jos käytettävissä ei ole "
+"rautaa.\n"
 "</para></listitem>\n"
 "</itemizedlist> \n"
 "Kaikki tiedot tuetuista mips/mipsel-koneista löytyvät osoitteesta <ulink url="
@@ -879,8 +882,8 @@ msgid ""
 "supported."
 msgstr ""
 "Mallit SGI IP22, SGI Indy, Indigo 2 ja Challenge S joissa on suorittimena "
-"R4000, R4400, R4600 and R5000 ovat &debian;in asennusjärjestelmän tukemia big "
-"endian MIPS-koneilla. Mallista SGI IP32 on tällä hetkellä tuettuna vain "
+"R4000, R4400, R4600 and R5000 ovat &debian;in asennusjärjestelmän tukemia "
+"big endian MIPS-koneilla. Mallista SGI IP32 on tällä hetkellä tuettuna vain "
 "järjestelmät joissa suorittimena on R5000."
 
 #. Tag: para
@@ -912,7 +915,8 @@ msgid ""
 "contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; "
 "mailing list</ulink>."
 msgstr ""
-"&debian;in &arch-title;-siirros tukee seuraavia laitealustoja: <itemizedlist>\n"
+"&debian;in &arch-title;-siirros tukee seuraavia laitealustoja: "
+"<itemizedlist>\n"
 "<listitem>\n"
 "<para> Cobalt Microserver: vain MIPS-suorittimella toimivia Cobalt-koneita "
 "käsitellään tässä. Tähän kuuluvat Cobalt RaQ, Qube2 ja RaQ2,\n"
@@ -1061,8 +1065,8 @@ msgid ""
 msgstr ""
 "Apple (ja hetken aikaa muutama muukin valmistaja &mdash; esimerkiksi Power "
 "Computing) teki PowerPC-suorittimeen pohjautuvan mallisarjan Macintosh-"
-"tietokoneita. Suoritintuen mukaan ne jaetaan sukupolviin NuBus (jota &debian; "
-"ei tue), OldWorld ja NewWorld."
+"tietokoneita. Suoritintuen mukaan ne jaetaan sukupolviin NuBus (jota "
+"&debian; ei tue), OldWorld ja NewWorld."
 
 #. Tag: para
 #: hardware.xml:695
@@ -1499,12 +1503,12 @@ msgid ""
 "itemizedlist> A linux kernel for these machines and limited support is "
 "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgstr ""
-"&debian;/powerpc ei tällä hetkellä tue NuBus-koneita. Monoliittinen Linux/PPC-"
-"ytimen arkkitehtuurissa ei vielä ole tukea näille koneille; on käytettäävä "
-"MkLinux Mach -mikroydintä, jota &debian; ei vielä tue.  Näitä ovat seuraavat: "
-"<itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></"
-"listitem> <listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-"<listitem><para> Powerbook 1400, 2300, ja 5300 </para></listitem> "
+"&debian;/powerpc ei tällä hetkellä tue NuBus-koneita. Monoliittinen Linux/"
+"PPC-ytimen arkkitehtuurissa ei vielä ole tukea näille koneille; on "
+"käytettäävä MkLinux Mach -mikroydintä, jota &debian; ei vielä tue.  Näitä "
+"ovat seuraavat: <itemizedlist> <listitem><para> Power Macintosh 6100, 7100, "
+"8100 </para></listitem> <listitem><para> Performa 5200, 6200, 6300 </para></"
+"listitem> <listitem><para> Powerbook 1400, 2300, ja 5300 </para></listitem> "
 "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
 "itemizedlist> Näille koneille on saatavilla linux-ydin ja rajoitettu tuki "
 "osoitteesta <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
@@ -1570,32 +1574,25 @@ msgstr "S/390 ja zSeries laiteperheet"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
-msgstr ""
-"Kaikki tiedot tuetuista S/390 ja zSeries-laiteperheistä löytyy IBM:n "
-"Redbookista <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/"
-"sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: Distributions</"
-"ulink> luvusta 2.1 tai <ulink url=\"http://www-128.ibm.com/developerworks/"
-"linux/linux390/index.html\">zSeries-sivulta developerWorksista</ulink>. "
-"Tiivistettynä: G5, Multiprise 3000, G6 ja kaikki zSeries-mallit ovat täysin "
-"tuettuja; Multiprise 2000, G3 ja G4 -koneet on tuettu, mutta käyttävät IEEE "
-"liukulukuemulaatiota ja suorituskyky kärsii."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
+msgstr ""
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "Tuetut suorittimet ja emolevyt"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1608,13 +1605,13 @@ msgstr ""
 "mallit kuuluvat mihinkin muunnokseen ja kuinka paljon kukin niistä on tuettu."
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1628,25 +1625,25 @@ msgstr ""
 "SPARCstation page</ulink>."
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
 "already been discontinued after earlier releases."
 msgstr ""
-"Viimeinen sparc32:ta tukenut &debian;in julkaisu oli Etch ja sekin vain sun4m-"
-"järjestelmissä. Muiden 32-bittisten aliarkkitehtuurien tuki lopetettiin jo "
-"aiempiin versioihin."
+"Viimeinen sparc32:ta tukenut &debian;in julkaisu oli Etch ja sekin vain "
+"sun4m-järjestelmissä. Muiden 32-bittisten aliarkkitehtuurien tuki "
+"lopetettiin jo aiempiin versioihin."
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1664,13 +1661,13 @@ msgstr ""
 "koneissa ja sparc64-smp-ydintä monen suorittimen koneissa."
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1684,7 +1681,7 @@ msgstr ""
 "tuettuja. Käytä sparc64-smp-ydintä."
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1694,13 +1691,13 @@ msgstr ""
 "suorittimet eivät ole tuettuja koska niille ei ole tukea Linux-ytimessä."
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "Sylimikrot"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1716,13 +1713,13 @@ msgstr ""
 "sivuilta</ulink>."
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "Moniprosessorijärjestelmät"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1741,7 +1738,7 @@ msgstr ""
 "huomaa."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1751,15 +1748,15 @@ msgid ""
 "deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
 "section;</quote> section of the kernel config.</phrase>"
 msgstr ""
-"Ydin voidaan optimoida yhden suorittimen järjestelmille korvaamalla &debian;in "
-"vakioydin. <phrase arch=\"linux-any\">Jutustelua siitä miten tämä tehdään "
+"Ydin voidaan optimoida yhden suorittimen järjestelmille korvaamalla &debian;"
+"in vakioydin. <phrase arch=\"linux-any\">Jutustelua siitä miten tämä tehdään "
 "löytyy kohdasta <xref linkend=\"kernel-baking\"/>. Tällä hetkellä (ytimen "
 "versio &kernelversion;) SMP otetaan pois käytöstä poistamalla valinta "
 "<quote>&smp-config-option;</quote> ytimen asetusten osassa <quote>&smp-"
 "config-section;</quote>.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1777,7 +1774,7 @@ msgstr ""
 "pois käytöstä yhden suorittimen järjestelmissä."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1787,7 +1784,7 @@ msgstr ""
 "käännetty mukaan SMP-tukea."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1804,7 +1801,7 @@ msgstr ""
 "ensimmäistä suoritinta."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -1822,7 +1819,7 @@ msgstr ""
 "</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1834,13 +1831,14 @@ msgid ""
 msgstr ""
 "Monen suorittimen tuki &mdash; kutsutaan myös nimellä <quote>symmetric "
 "multiprocessing</quote> eli SMP &mdash; on saatavilla tälle "
-"arkkitehtuurille. Tuki on valmiiksi käännetyssä &debian;in ytimessä. Käytetty "
-"asennustaltio määrää asennetaanko oletusarvona SMP-ydin. Tämän ei pitäisi "
-"estää asennusta, sillä vakiona oleva ei-SMP-ytimen pitäisi käynnistya monen "
-"suorittimen koneissa; tällöin ydin käyttää vain ensimmäistä suoritinta."
+"arkkitehtuurille. Tuki on valmiiksi käännetyssä &debian;in ytimessä. "
+"Käytetty asennustaltio määrää asennetaanko oletusarvona SMP-ydin. Tämän ei "
+"pitäisi estää asennusta, sillä vakiona oleva ei-SMP-ytimen pitäisi "
+"käynnistya monen suorittimen koneissa; tällöin ydin käyttää vain ensimmäistä "
+"suoritinta."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1852,7 +1850,7 @@ msgstr ""
 "ytimen asennuspaketti."
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can also build your own customized kernel to support SMP. <phrase "
@@ -1875,20 +1873,27 @@ msgstr ""
 "asetusten osassa <quote>&smp-config-section;</quote>.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "Tuetut näytönohjaimet"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "Konsolille olisi käytettävä VGA-yhteensopivaa näyttöliitäntää. Lähes kaikki "
 "uudet näytönohjaimet ovat VGA-yhteensopivia. Ikivanhojen standardien kuten "
@@ -1896,30 +1901,30 @@ msgstr ""
 "ettei X11:ta käytetä tässä ohjeessa kuvatussa asennusprosessissa."
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
-"&debian;in tuki graafisille käyttöliittymille määräytyy pohjana olevan X.Org:n "
-"X11-järjestelmän tuesta. Useimmat AGP-, PCI-, PCIe- ja PCI-X-näytönohjaimet toimivat "
-"X.Org:lla. Yksityiskohtainen tieto tuetuista grafiikkaväylistä, "
-"näytönohjaimista, näytöistä ja osoitinlaitteista löytyy osoitteesta <ulink "
-"url=\"&url-xorg;\"></ulink>. &debian;in versiossa &release; on X.Org versio "
-"&x11ver;."
+"&debian;in tuki graafisille käyttöliittymille määräytyy pohjana olevan X.Org:"
+"n X11-järjestelmän tuesta. Useimmat AGP-, PCI-, PCIe- ja PCI-X-"
+"näytönohjaimet toimivat X.Org:lla. Yksityiskohtainen tieto tuetuista "
+"grafiikkaväylistä, näytönohjaimista, näytöistä ja osoitinlaitteista löytyy "
+"osoitteesta <ulink url=\"&url-xorg;\"></ulink>. &debian;in versiossa "
+"&release; on X.Org versio &x11ver;."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org X Window -järjestelmä on tuettu vain malleissa SGI Indy ja O2."
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1940,7 +1945,7 @@ msgstr ""
 "miten kortti otetaan käyttöön."
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1968,13 +1973,13 @@ msgstr ""
 "käynnistämistä."
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Verkkolaitteet"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1990,7 +1995,7 @@ msgstr ""
 "vanhat ISA-kortit ovat tuettuja.</phrase> </phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2000,61 +2005,61 @@ msgstr ""
 "seuraavat Sunin tekemät NIC:it:"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "Tuettujen verkkolaitteiden luettelo on:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Kanavalta kanavalle (CTC) ja ESCON-yhteydet (oikea tai emuloitu)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet ja OSA-Express Fast Ethernet (ei-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express QDIO-toimintatilassa, HiperSockets ja Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2074,19 +2079,19 @@ msgstr ""
 "url=\"&url-slug-firmware;\">Slug-Firmware site</ulink>."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN on tuettu, mutta ei asennuksen aikana."
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Langattomat verkkokortit"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2104,7 +2109,7 @@ msgstr ""
 "asennuksen aikana."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2116,7 +2121,7 @@ msgstr ""
 "asennuksen aikana."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2128,7 +2133,7 @@ msgstr ""
 "asennuksen aikana."
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2147,7 +2152,7 @@ msgstr ""
 "asetukset voidaan tehdä itse."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2157,21 +2162,21 @@ msgid ""
 "your last resort is to use the <classname>ndiswrapper</classname> package, "
 "which allows you to use a Windows driver.</phrase>"
 msgstr ""
-"Joissakin tapauksissa tarvittavaa ajuria ei ole saatavilla &debian;-pakettina. "
-"Tällöin on etsittävä lähdekoodia Internetistä ja käännettävä ajuri itse. Se "
-"miten tämä tehdään ei kuulu tämän ohjeen piiriin. <phrase arch=\"x86\">Jos "
-"ei mitään Linux-ajuria ole saatavilla, viimeisin konsti on käyttää pakettia "
-"<classname>ndiswrapper</classname>, jonka avulla voidaan käyttä Windows-"
-"ajuria.</phrase>"
+"Joissakin tapauksissa tarvittavaa ajuria ei ole saatavilla &debian;-"
+"pakettina. Tällöin on etsittävä lähdekoodia Internetistä ja käännettävä "
+"ajuri itse. Se miten tämä tehdään ei kuulu tämän ohjeen piiriin. <phrase "
+"arch=\"x86\">Jos ei mitään Linux-ajuria ole saatavilla, viimeisin konsti on "
+"käyttää pakettia <classname>ndiswrapper</classname>, jonka avulla voidaan "
+"käyttä Windows-ajuria.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "Laitealustan &arch-title; tunnettuja vikoja"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2179,13 +2184,13 @@ msgid ""
 msgstr "Muutamia tiettyjen verkkokorttien vikoja on syytä mainita tässä."
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip- ja dfme-ajurien välinen ristiriita"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2203,7 +2208,7 @@ msgstr ""
 "väärä, verkkokortti ei ehkä toimi tai toimii huonosti."
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2218,7 +2223,7 @@ msgstr ""
 "annettujen ohjeiden mukaisesti."
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2237,13 +2242,13 @@ msgstr ""
 "uudelleen."
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2253,13 +2258,13 @@ msgstr ""
 "järjestelmissä."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "Pistekirjoitusnäytöt"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2278,13 +2283,13 @@ msgstr ""
 "&brlttyver;."
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "Puhesyntetisaattorilaitteet"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2306,13 +2311,13 @@ msgstr ""
 "classname> versio &speakupver;."
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Oheislaitteet ja muu laitteisto"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2324,7 +2329,7 @@ msgstr ""
 "tarvita järjestelmää asennettaessa."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2335,7 +2340,7 @@ msgstr ""
 "issues\"/>)."
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2347,7 +2352,7 @@ msgstr ""
 "Linuxissa."
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2359,7 +2364,7 @@ msgstr ""
 "llä tai verkon kautta protokollia NFS, HTTP tai FTP käyttäen."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2369,13 +2374,13 @@ msgstr ""
 "korttipaikka."
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "Laiteohjelmistoa tarvitsevat laitteet"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2393,7 +2398,7 @@ msgstr ""
 "kiintolevyohjaimet vaativat myös laiteohjelmiston."
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2411,7 +2416,7 @@ msgstr ""
 "osasta."
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2429,14 +2434,14 @@ msgstr ""
 "varusohjelmatiedostojen tai asennuspakettien lataamisesta asennuksen aikana."
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, fuzzy, no-c-format
 #| msgid "Purchasing Hardware Specifically for GNU/Linux"
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "Miten hankitaan laitteita erityisesti GNU/Linuxia varten"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2445,14 +2450,14 @@ msgid ""
 "peace of mind, since you can be sure that the hardware is well-supported by "
 "GNU/Linux."
 msgstr ""
-"Useat myyjät toimittavat laitteita joissa on &debian; tai muu GNU/Linux-jakelu "
-"<ulink url=\"&url-pre-installed;\">esiasennettuna</ulink>. Mahdollisesti "
-"palvelusta on maksettava lisähintaa, mutta sillä saa jonkinlaisen "
-"mielenrauhan, kun voi varmistua laitteiston olevan hyvin tuettu GNU/"
-"Linuxissa."
+"Useat myyjät toimittavat laitteita joissa on &debian; tai muu GNU/Linux-"
+"jakelu <ulink url=\"&url-pre-installed;\">esiasennettuna</ulink>. "
+"Mahdollisesti palvelusta on maksettava lisähintaa, mutta sillä saa "
+"jonkinlaisen mielenrauhan, kun voi varmistua laitteiston olevan hyvin tuettu "
+"GNU/Linuxissa."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2468,7 +2473,7 @@ msgstr ""
 "käyttökelpoisia neuvoja asiasta."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2485,13 +2490,13 @@ msgstr ""
 "kernel;-järjestelmää. Tue &arch-kernel;-ystävällisiä laitevalmistajia."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Vältä suojattuja tai suljettuja laitteita"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2505,7 +2510,7 @@ msgstr ""
 "lähdekoodin julkaisemisen."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2521,13 +2526,13 @@ msgstr ""
 "markkinasegmentti."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Vain Windowsissa toimivat laitteet"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2553,7 +2558,7 @@ msgstr ""
 "tallella."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2591,7 +2596,7 @@ msgstr ""
 "pihtaavat laitteidensä sulautetun prosessorin tehosta."
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can help improve this situation by encouraging these manufacturers to "
@@ -2614,13 +2619,13 @@ msgstr ""
 "ilmoittaa niiden toimivan."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "Asennustaltiot"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2637,13 +2642,13 @@ msgstr ""
 "edut ja haitat. Lukija voi palata tähän kohtaan kun on lukenut tuon luvun."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "Levykkeet"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2654,19 +2659,19 @@ msgstr ""
 "kaikki mitä tarvitaan on 3,5 tuuman HD-levykeasema (1440 kt)."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "Suoritinarkkitehtuurilla CHRP ei levyketuki tällä hetkellä toimi."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2680,7 +2685,7 @@ msgstr ""
 "epästandardeja CD-ROM-asemia, joissa ei ole SCSI- eikä IDE/ATAPI-liitäntää."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2699,7 +2704,7 @@ msgstr ""
 "tavoin; katso <xref linkend=\"boot-installer\"/>."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2711,7 +2716,7 @@ msgstr ""
 "Linuxissa."
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2721,13 +2726,13 @@ msgstr ""
 "ohci1394- ja sbp2-ajurit tukevat."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "IDE/ATAPI-CD-levyjä tuetaan kaikissa ARM-koneissa."
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2746,13 +2751,13 @@ msgstr ""
 "<quote>System installation</quote> laiteohjelmistossa."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "Kiintolevy"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2764,7 +2769,7 @@ msgstr ""
 "ladattava asennin kiintolevylle."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2774,13 +2779,13 @@ msgstr ""
 "voidaan asentaa SunOS-osiolta (UFS-viipaleelta)."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB-muistitikku"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2798,13 +2803,13 @@ msgstr ""
 "tarpeettomille levyasemille."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "Verkko"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2824,7 +2829,7 @@ msgstr ""
 "tä. "
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2836,7 +2841,7 @@ msgstr ""
 "title;.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2846,13 +2851,13 @@ msgstr ""
 "kaikki paikalliset tiedostojärjestelmät, on toinen mahdollisuus."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x- tai GNU-järjestelmä"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2869,13 +2874,13 @@ msgstr ""
 "lisätietoa <xref linkend=\"linux-upgrade\"/>."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Tuetut massamuistit"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
@@ -2895,7 +2900,7 @@ msgstr ""
 "laitteisiin."
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
@@ -2909,7 +2914,7 @@ msgstr ""
 "tiedostojärjestelmiin kuuluvat FAT, Win-32 FAT -laajennokset (VFAT) ja NTFS."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2925,7 +2930,7 @@ msgstr ""
 "Hardware Compatibility HOWTO</ulink>."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2949,7 +2954,7 @@ msgstr ""
 "laitteista."
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2961,7 +2966,7 @@ msgstr ""
 "levykkeitä CHRP-järjestelmissä."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2973,7 +2978,7 @@ msgstr ""
 "levykeasemaa."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2983,7 +2988,7 @@ msgstr ""
 "käynnistysjärjestelmässä."
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2996,13 +3001,13 @@ msgstr ""
 "levyasettelun kassa. "
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Muistivaatimukset ja levytilan tarve"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3015,7 +3020,7 @@ msgstr ""
 "Järkeviä vaatimuksia on <xref linkend=\"minimum-hardware-reqts\"/>."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -3033,3 +3038,23 @@ msgstr ""
 "Jos on mahdollista valita käynnistetäänkö tavallinen vai graafinen asennin, "
 "olisi valittava tavallinen.</para> </footnote> saattaa olla mahdollista "
 "mutta sitä suositellaan vain kokeneille käyttäjille."
+
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "Kaikki tiedot tuetuista S/390 ja zSeries-laiteperheistä löytyy IBM:n "
+#~ "Redbookista <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/"
+#~ "sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: Distributions</"
+#~ "ulink> luvusta 2.1 tai <ulink url=\"http://www-128.ibm.com/developerworks/"
+#~ "linux/linux390/index.html\">zSeries-sivulta developerWorksista</ulink>. "
+#~ "Tiivistettynä: G5, Multiprise 3000, G6 ja kaikki zSeries-mallit ovat "
+#~ "täysin tuettuja; Multiprise 2000, G3 ja G4 -koneet on tuettu, mutta "
+#~ "käyttävät IEEE liukulukuemulaatiota ja suorituskyky kärsii."
diff --git a/po/fi/install-methods.po b/po/fi/install-methods.po
index 4392e7f2a..027cd13f1 100644
--- a/po/fi/install-methods.po
+++ b/po/fi/install-methods.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-04 11:14+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -126,7 +126,8 @@ msgid ""
 "url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "Lähimmän (ja siten luultavasti nopeimman) asennuspalvelimen löytää <ulink "
-"url=\"&url-debian-mirrors;\">&debian;in asennuspalvelimien luettelosta</ulink>."
+"url=\"&url-debian-mirrors;\">&debian;in asennuspalvelimien luettelosta</"
+"ulink>."
 
 #. Tag: para
 #: install-methods.xml:90
@@ -176,9 +177,9 @@ msgid ""
 "the Linksys web frontend or with upslug2. This firmware image can be "
 "obtained from &nslu2-firmware-img;."
 msgstr ""
-"Linksys NSLU2:lle on laiteohjelmisto joka käynnistää automaattisesti "
-"&debian;in asentimen <classname>debian-installer</classname>. Tämä "
-"laiteohjelmiston otos on saatavilla tiedostossa &nslu2-firmware-img;."
+"Linksys NSLU2:lle on laiteohjelmisto joka käynnistää automaattisesti &debian;"
+"in asentimen <classname>debian-installer</classname>. Tämä laiteohjelmiston "
+"otos on saatavilla tiedostossa &nslu2-firmware-img;."
 
 #. Tag: title
 #: install-methods.xml:126
@@ -195,8 +196,8 @@ msgid ""
 "using the Thecus firmware upgrade process. This firmware image can be "
 "obtained from &n2100-firmware-img;."
 msgstr ""
-"Thecus N2100:lle on laiteohjelmisto joka käynnistää automaattisesti &debian;in "
-"asentimen <classname>debian-installer</classname>. Tämä laiteohjelmiston "
+"Thecus N2100:lle on laiteohjelmisto joka käynnistää automaattisesti &debian;"
+"in asentimen <classname>debian-installer</classname>. Tämä laiteohjelmiston "
 "otos saadaan tiedostosta &n2100-firmware-img;."
 
 #. Tag: title
@@ -393,8 +394,8 @@ msgid ""
 "installation CD-ROM or DVD, the floppy images may also be included on the CD/"
 "DVD.</phrase>"
 msgstr ""
-"Ennen kuin levykkeitä voi kirjoittaa, on ne ensin noudettava jostain "
-"&debian;in asennuspalvelimesta, kuten selitetään kohdassa <xref linkend="
+"Ennen kuin levykkeitä voi kirjoittaa, on ne ensin noudettava jostain &debian;"
+"in asennuspalvelimesta, kuten selitetään kohdassa <xref linkend="
 "\"downloading-files\"/>. <phrase arch=\"i386\">Jos sinulla on asennusromppu, "
 "saattavat levykeotokset olla rompulla.</phrase>"
 
@@ -550,8 +551,8 @@ msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
 "<filename>/tools</filename> directory."
 msgstr ""
-"Nämä työkalut löytyvät virallisilta &debian;-rompuilta hakemistosta <filename>/"
-"tools</filename>."
+"Nämä työkalut löytyvät virallisilta &debian;-rompuilta hakemistosta "
+"<filename>/tools</filename>."
 
 #. Tag: title
 #: install-methods.xml:402
@@ -1183,8 +1184,8 @@ msgid ""
 "onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
 msgstr ""
-"Jos käytit <filename>hd-media</filename>-otosta, on nyt kopioitava &debian;in "
-"ISO-otos<footnote> <para> voidaan käyttää joko businesscard, netinst tai "
+"Jos käytit <filename>hd-media</filename>-otosta, on nyt kopioitava &debian;"
+"in ISO-otos<footnote> <para> voidaan käyttää joko businesscard, netinst tai "
 "täyttä CD-otosta (katso <xref linkend=\"official-cdrom\"/>. Varmista "
 "valitsevasi se mikä mahtuu muistille. Huomaa ettei <quote>netboot "
 "<filename>mini.iso</filename></quote> -otos sovi tähän tarkoitukseen. </"
@@ -1352,9 +1353,9 @@ msgid ""
 "select one that fits) onto the stick. When you are done, unmount the USB "
 "memory stick (<userinput>umount /mnt</userinput>)."
 msgstr ""
-"Jos käytit <filename>hd-media</filename>-otosta, on nyt kopioitava &debian;in "
-"ISO-otos (businesscard, netinst tai täysi CD-otos; varmista valitsevasi se "
-"mikä mahtuu) muistille. Kun tämä on valmista, irroita USB-muisti "
+"Jos käytit <filename>hd-media</filename>-otosta, on nyt kopioitava &debian;"
+"in ISO-otos (businesscard, netinst tai täysi CD-otos; varmista valitsevasi "
+"se mikä mahtuu) muistille. Kun tämä on valmista, irroita USB-muisti "
 "(<userinput>umount /mnt</userinput>)."
 
 #. Tag: title
@@ -1553,7 +1554,7 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "Kopioi seuraavat tiedostot &debian;in asennuspalvelimelta sopivaan kohtaan "
@@ -1601,10 +1602,10 @@ msgstr ""
 "MacOS:stä käynnistettävä <application>BootX</application> tukee "
 "käynnistämistä kiintolevylle tallennetuista tiedostoista. "
 "<application>BootX</application>ää voi käyttää myös MacOS:n ja Linuxin "
-"kaksoiskäynnistämiseen jahka &debian;in asennus on valmis. Näyttää siltä, että "
-"mallissa Performa 6360 <command>quik</command> ei osaa tehdä kiintolevyä "
-"käynnistyväksi. Niinpä <application>BootX</application> on pakollinen tuolla "
-"mallilla."
+"kaksoiskäynnistämiseen jahka &debian;in asennus on valmis. Näyttää siltä, "
+"että mallissa Performa 6360 <command>quik</command> ei osaa tehdä "
+"kiintolevyä käynnistyväksi. Niinpä <application>BootX</application> on "
+"pakollinen tuolla mallilla."
 
 #. Tag: para
 #: install-methods.xml:1033
diff --git a/po/fi/preparing.po b/po/fi/preparing.po
index 362a4bbb9..38e1bfee6 100644
--- a/po/fi/preparing.po
+++ b/po/fi/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-05 06:23+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -83,10 +83,10 @@ msgstr ""
 "Käytettäessä &debian-gnu;ia, on paljon todennäköisempää, että "
 "vikatilanteessa käyttöjärjestelmä voidaan korjata eikä sitä tarvitse asentaa "
 "uudelleen. Päivitykset eivät koskaan vaadi kaiken asentamista uudelleen; "
-"&debian; osaa aina päivittää itse itsensä. Lisäksi ohjelmat ovat melkein aina "
-"yhteensopivia peräkkäisissä &debian;in julkaisuissa. Jos ohjelman uusi versio "
-"vaatii uudempia tukiohjelmia, &debian;in paketointijärjestelmä varmistaa "
-"kaikkien tarpeellisten ohjelmien löytyvän ja tulevan asennetuiksi "
+"&debian; osaa aina päivittää itse itsensä. Lisäksi ohjelmat ovat melkein "
+"aina yhteensopivia peräkkäisissä &debian;in julkaisuissa. Jos ohjelman uusi "
+"versio vaatii uudempia tukiohjelmia, &debian;in paketointijärjestelmä "
+"varmistaa kaikkien tarpeellisten ohjelmien löytyvän ja tulevan asennetuiksi "
 "automaattisesti. Korostetaan vielä, että paljon työtä on tehty, jotta "
 "uuudelleen asennus ei olisi välttämätöntä, joten uudelleenasennusta olisi "
 "pidettävä viimeisenä vaihtoehtona. Asenninta <emphasis>ei</emphasis> ole "
@@ -462,20 +462,18 @@ msgstr "&arch-title; laitteiston ohjekirjat"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Asennusohjeet ja laiteajurit (DASD, XPRAM, konsoli, nauha, z90 crypto, "
-"chandev, verkko) Linuxille suoritinperheellä &arch-title; käyttäen ydintä 2.4"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Laiteajurit ja asennuskomennot"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -485,13 +483,13 @@ msgstr ""
 "koneilla ja suoritinperheellä &arch-title;."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux suoritinperheelle &arch-title;"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
@@ -499,11 +497,11 @@ msgid ""
 "same across all &arch-title; distributions."
 msgstr ""
 "IBM Redbook joka kuvaa suurkoneelle saatavilla olevat Linux-jakelut. "
-"Kirjassa ei ole lukua &debian;ista, mutta asennuksen peruskäsitteet ovat samat "
-"kaikille &arch-title;-jakeluille."
+"Kirjassa ei ole lukua &debian;ista, mutta asennuksen peruskäsitteet ovat "
+"samat kaikille &arch-title;-jakeluille."
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr ""
@@ -511,13 +509,13 @@ msgstr ""
 "Jakelut"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Laitetietojen löytäminen"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -529,19 +527,19 @@ msgstr ""
 "asennusta."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "Laitetietoja voidaan kerätä seuraavista paikoista:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "Jokaisen tietokoneen osan mukana tulleet käsikirjat."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -553,19 +551,19 @@ msgstr ""
 "näppäinyhdistelmä käsikirjasta. Se on usein <keycap>Delete</keycap>-näppäin."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "Kunkin osan pakkauslaatikot."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Windowsin Ohjauskeskuksen ikkuna Järjestelmä."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -577,7 +575,7 @@ msgstr ""
 "keskusmuistista ja kiintolevytilasta."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -587,175 +585,175 @@ msgstr ""
 "tietää verkkoasetukset ja sähköpostin asetukset."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Asennuksessa tarvittavat tiedot laitteista"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "Laite"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "Mahdollisesti tarvittava tieto"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "Kiintolevyt"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "Lukumäärä."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "Niiden keskinäinen järjestys."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "Voivat olla IDE (toinen nimi PATA), SATA vai SCSI."
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "Käytettävissä oleva vapaa tila."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "Osiot."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "Osiot joihin muut käyttöjärjestelmät on asennettu."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "Näyttö"
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "Malli ja valmistaja."
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "Tuetut näyttötarkkuudet."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Vaakapoikkeutustaajuus."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Pystypoikkeutustaajuus."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Tuettu värisyvyys (värien määrä)."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "Näytön koko."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "Hiiri"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Tyyppi: sarjahiiri, PS/2 tai USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "Portti."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "Valmistaja."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "Nappuloiden määrä."
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "Verkko"
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "Verkkoliitännän tyyppi."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "Tulostin"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Tuetut tulostustarkkuudet."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "Näytönohjain"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "Käytettävissä oleva näyttömuisti."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -764,37 +762,37 @@ msgstr ""
 "Tuetut tarkkuudet ja värisyyvyydet (näitä tulisi verrata näytön tukemiin)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "Laitenumero(t)."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "Laitenumerot."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "OSA-korteille suhteellinen sovittimen numero."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Laitteiden yhteensopivuus"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -807,7 +805,7 @@ msgstr ""
 "yhtä paljoa erilaisia laitteita kuin jotkin käyttöjärjestelmät."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -817,7 +815,7 @@ msgstr ""
 "vaatii toimiakseen käynnissä olevan Windowsin."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -832,7 +830,7 @@ msgstr ""
 "vanhentua nopeasti."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -843,19 +841,19 @@ msgstr ""
 "Windowsia varten tehtyjä."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "Laitteiston yhteensopivuus voidaan tarkistaa:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "Etsimällä valmistajan webbisivulta uusia ajureita."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -866,7 +864,7 @@ msgstr ""
 "tai asetuksilla."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -876,19 +874,19 @@ msgstr ""
 "kernel;-yhteensopivista laitteista."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "Etsimällä Internetistä muiden käyttäjien kokemuksia."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "Verkkoasetukset"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -900,31 +898,31 @@ msgstr ""
 "verkon vastuuhenkilöltä."
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "Konenimi (tämän voi ehkä keksiä itse)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "Verkkoaluenimi."
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "Tietokoneen IP-osoite."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "Verkossa käytettävä verkon peitto."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -934,7 +932,7 @@ msgstr ""
 "yhdyskäytävä."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -942,7 +940,7 @@ msgid ""
 msgstr "Nimipalvelimena (DNS) käytettävä verkon kone."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -955,31 +953,31 @@ msgstr ""
 "tarjoaa tiedot asennuksen aikana suoraan tietokoneelle."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Jos käytössä on langaton verkko, olisi vielä selvitettävä:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "Langattoman verkon ESSID."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEB-salausavain (jos käytössä)."
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Vähimmäisvaatimukset laitteistolle"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -990,7 +988,7 @@ msgstr ""
 "halutun asennustavan."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -1002,111 +1000,118 @@ msgstr ""
 "jos jättävät huomiotta nämä suositukset."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "Pöytätietokoneen olisi oltava vähintään 1 GHz Pentium 4."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
 "Kaikki OldWorld ja NewWorld PowerPC-koneet toimivat hyvin pöytätietokoneena."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Suositellut vähimmäisvaatimukset laitteistolle"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "Asennustapa"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "Muisti (vähintään)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "Muisti (suositus)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "Kiintolevy"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "Ei työpöytää"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 Mt"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 Mt"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 Gt"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "Työpöytäympäristö"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 Mt"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 Mt"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 gigatavua"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "Todelliset muistin vähimmäisvaatimukset ovat paljon pienemmät kuin tässä "
 "taulukossa mainitut luvut. Laitealusta vaikuttaa vähimmäisvaatimukseen, "
-"&debian;in asennus on mahdollista niinkin pienellä muistilla kuin 20 Mt (s390:"
-"lle) tai 60 Mt (amd64). Sama tilanne on levytilan tarpeessa, "
+"&debian;in asennus on mahdollista niinkin pienellä muistilla kuin 20 Mt "
+"(s390:lle) tai 60 Mt (amd64). Sama tilanne on levytilan tarpeessa, "
 "erityisesti jos asennettavat sovellukset valitaan tarkkaan; katso <xref "
 "linkend=\"tasksel-size-list\"/> jossa on lisätietoa levytilan tarpeesta."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1124,7 +1129,7 @@ msgstr ""
 "mutta muitakin on tarjolla."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1136,7 +1141,7 @@ msgstr ""
 "käytetään."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1148,7 +1153,7 @@ msgstr ""
 "omille tiedostoilleen ja tiedoilleen runsaasti tilaa."
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1172,13 +1177,13 @@ msgstr ""
 "asennetaan graafinen työpöytäympäristö."
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Monikäynnistettävän koneen osiointi etukäteen"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1191,7 +1196,7 @@ msgstr ""
 "huonekalujen lisääminen yhteen huoneeseen ei vaikuta muihin."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1203,39 +1208,40 @@ msgstr ""
 "title;. Lisäksi kone tarkoittaa tässä tapauksessa LPAR:ia tai VM vierasta."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Debian on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Unix systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
+#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> and want to stick Debian on the same disk, "
+#| "you will need to repartition the disk. Debian requires its own hard disk "
+#| "partitions. It cannot be installed on Windows or MacOS partitions. It may "
+#| "be able to share some partitions with other Unix systems, but that's not "
+#| "covered here. At the very least you will need a dedicated partition for "
+#| "the Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "Jos koneessa on jo käyttöjärjestelmä <phrase arch=\"x86\"> (Windows 9x, "
-"Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
-"<phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> ja &debian; "
-"halutaan asentaa samalle levylle, on levy osioitava uudelleen. &debian; vaatii "
-"omat levyosionsa. Sitä ei voi asentaa Windowsin tai MacOS:n osioihin. &debian; "
-"saattaa pysytä jakamaan joitakin osioita muiden Unix-järjestelmien kanssa, "
-"mutta sitä ei käsitellä tässä. Vähimmäisvaatimuksena on oma osio &debian;in "
-"juuritiedostojärjestelmälle."
+"Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
+"phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> ja "
+"&debian; halutaan asentaa samalle levylle, on levy osioitava uudelleen. "
+"&debian; vaatii omat levyosionsa. Sitä ei voi asentaa Windowsin tai MacOS:n "
+"osioihin. &debian; saattaa pysytä jakamaan joitakin osioita muiden Unix-"
+"järjestelmien kanssa, mutta sitä ei käsitellä tässä. Vähimmäisvaatimuksena "
+"on oma osio &debian;in juuritiedostojärjestelmälle."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can find information about your current partition setup by using a "
@@ -1260,7 +1266,7 @@ msgstr ""
 "osioiden tiedot tekemättä muutoksia."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1276,13 +1282,13 @@ msgstr ""
 "pirstaleiksi."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
@@ -1296,7 +1302,7 @@ msgstr ""
 "osiointisovellus hoitaa homman kätevästi."
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1324,7 +1330,7 @@ msgstr ""
 "alkuperäisen käyttöjärjestelmän asennusnauhoilta tai -rompuilta."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
@@ -1343,7 +1349,7 @@ msgstr ""
 "osioida ennen asennusta."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1355,7 +1361,7 @@ msgstr ""
 "osiointisovellusta tiedostojärjestelmien koon muuttamiseen."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
@@ -1377,7 +1383,7 @@ msgstr ""
 "halutaan säilyttää."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are going to install more than one operating system on the same "
@@ -1399,7 +1405,7 @@ msgstr ""
 "tiedostojärjestelmät muiden käyttöjärjestelmien osioihin."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1409,7 +1415,7 @@ msgstr ""
 "käyttöjärjestelmien asentaminen ensiksi on helpointa."
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
@@ -1440,7 +1446,7 @@ msgstr ""
 "asennuksen aikana, ja korvata se Linuxin osioilla."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
@@ -1452,13 +1458,13 @@ msgstr ""
 "ja &debian;, on tehtävä seuraavasti:"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Tehdään varmuuskopio kaikista koneen tiedostoista."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1472,7 +1478,7 @@ msgstr ""
 "pakottaa koneen käyttämään rompulla olevaa MacOS-järjestelmää.</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1482,13 +1488,13 @@ msgstr ""
 "Debianille joko paikkaa varaava osio tai käyttämätöntä levytilaa."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "Asenna koneen oma käyttöjärjestelmä sen omaan osioon"
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
@@ -1498,19 +1504,19 @@ msgstr ""
 "kunnossa, ja noutaaksesi &debian;in asentimen käynnistystiedostot."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "Käynnistä &debian;in asennin jatkaaksesi &debian;in asennusta."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Osiointi DOS:sta tai Windowsista"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
@@ -1521,10 +1527,11 @@ msgstr ""
 "Muokattaessa olemassa olevia FAT- tai NTFS-osioita, suositellaan "
 "käytettäväksi alla olevaa osiointimallia tai Windowsin tai DOS:in omia "
 "työkaluja. Muussa tapauksessa ei ole välttämättä tarpeen tehdä osioita DOS:"
-"sta tai Windowsista; &debian; osiointityökalut osaavat homman yleensä paremmin."
+"sta tai Windowsista; &debian; osiointityökalut osaavat homman yleensä "
+"paremmin."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1544,38 +1551,38 @@ msgstr ""
 "edellyttää levyllä olevan FAT- tai NTFS-osion siirtämistä."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr ""
 "Uudelleenosiointi tietoja hävittämättä DOS:sta, Win-32:sta tai OS/2:sta"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "Yksi yleisimpiä asennuksia on asennus tietokoneeseen jossa on jo DOS (mukaan "
-"lukien Windows 3.1), Win32 (kuten Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7) tai "
-"OS/2, ja &debian; halutaan asentaa samalle levylle tuhoamatta aikaisempaa "
-"käyttöjärjestelmää. Huomaa asentimen tukevan DOS:n ja Windowsin käyttämien "
-"FAT- ja NTFS-tiedostojärjestelmien koon muuttamista. Asennin vain "
+"lukien Windows 3.1), Win32 (kuten Windows 95, 98, Me, NT, 2000, XP, 2003, "
+"Vista, 7) tai OS/2, ja &debian; halutaan asentaa samalle levylle tuhoamatta "
+"aikaisempaa käyttöjärjestelmää. Huomaa asentimen tukevan DOS:n ja Windowsin "
+"käyttämien FAT- ja NTFS-tiedostojärjestelmien koon muuttamista. Asennin vain "
 "käynnistetään, valitaan <menuchoice> <guimenuitem>Osioi itse</guimenuitem> </"
 "menuchoice>, valitaan osio jonka kokoa muutetaan ja määritetään sen uusi "
 "koko. Niinpä useimmissa tapauksissa ei ole tarpeen käyttää alla kuvauttua "
 "menettelyä."
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
@@ -1592,7 +1599,7 @@ msgstr ""
 "esimerkiksi sivustilana tai tiedostojärjestelmälle."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1609,19 +1616,28 @@ msgstr ""
 "loppuosaan. Tällöin osiosta vapautuva tila pienenee."
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
-msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+#: preparing.xml:983
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The first thing needed is a copy of <command>fips</command> which is "
+#| "available in the <filename>tools/</filename> directory on your nearest "
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
+#| "filename> to a bootable floppy. A bootable floppy can be created using "
+#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
+#| "command> comes with very good documentation which you may want to read. "
+#| "You will definitely need to read the documentation if you use a disk "
+#| "compression driver or a disk manager. Create the disk and read the "
+#| "documentation <emphasis>before</emphasis> you defragment the disk."
+msgid ""
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "Ensin tarvitaan ohjelma <command>fips</command>, joka on saatavilla "
 "hakemistosta <filename>tools/</filename> lähimmästä &debian;in "
@@ -1635,7 +1651,7 @@ msgstr ""
 "<emphasis>ennen kuin</emphasis> eheytät kiintolevyn."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1655,7 +1671,7 @@ msgstr ""
 "VFAT tukee pitkiä tiedostonimiä joita Windows 95 ja uudemmat käyttävät."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1667,7 +1683,7 @@ msgstr ""
 "Kirjoita vain <command>a:\\\\fips</command> ja toimi ohjeiden mukaan."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1677,13 +1693,13 @@ msgstr ""
 "jos <command>fips</command> ei sattuisi toimimaan."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Osioiden teko DOS:lle"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1699,7 +1715,7 @@ msgstr ""
 "virheistä DOS:ssa tai Windowsissa."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1713,19 +1729,19 @@ msgstr ""
 "suorittamalla seuraava komento &debian;:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Osiointi SunOS:stä"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
@@ -1743,13 +1759,13 @@ msgstr ""
 "tiedostojärjestelmiltä."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Osiointi Linuxista tai muusta käyttöjärjestelmästä"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1773,7 +1789,7 @@ msgstr ""
 "kanssa."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1787,13 +1803,13 @@ msgstr ""
 "linkend=\"partitioning\"/>."
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "Osioiden teko MacOS/OSX:lle"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1808,7 +1824,7 @@ msgstr ""
 "<application>Drive Setup</application> ei näytä levyajurin osioita."
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1820,7 +1836,7 @@ msgstr ""
 "korvataan myöhemmin Debianin asentimen toimesta."
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1848,7 +1864,7 @@ msgstr ""
 "OS X."
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1867,13 +1883,13 @@ msgstr ""
 "että Linuxissa."
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Laiteasetukset ja käyttöjärjestelmän asetukset ennen asennusta"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1885,21 +1901,21 @@ msgid ""
 "also highlighted."
 msgstr ""
 "Tässä luvussa käydään askel askeleeltä läpi laiteasetukset, jos niitä on, "
-"jotka on tehtävä ennen &debian;in asennusta. Yleensä on tarkistettava ja ehkä "
-"muutettava tietokoneen laiteohjelmiston asetuksia. <quote>Laiteohjelmisto</"
-"quote> on laitteiston käyttämä perusohjelmisto; sen tärkein tehtävä on "
-"alkulatauksen yhteydessä (kun laitteistoon on kytketty virta). Myös tiedossa "
-"olevat laiteiston ominaisuudet jotka vaikuttavat &debian-gnu;in "
-"luotettavuuteen on korostettu."
+"jotka on tehtävä ennen &debian;in asennusta. Yleensä on tarkistettava ja "
+"ehkä muutettava tietokoneen laiteohjelmiston asetuksia. "
+"<quote>Laiteohjelmisto</quote> on laitteiston käyttämä perusohjelmisto; sen "
+"tärkein tehtävä on alkulatauksen yhteydessä (kun laitteistoon on kytketty "
+"virta). Myös tiedossa olevat laiteiston ominaisuudet jotka vaikuttavat "
+"&debian-gnu;in luotettavuuteen on korostettu."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOSin asetusvalikon käynnistäminen"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
@@ -1917,7 +1933,7 @@ msgstr ""
 "&debian;in asennus ei onnistu."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1931,25 +1947,25 @@ msgstr ""
 "BIOS-ohjelmiston valmistajasta:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "<keycap>Delete</keycap>  POSTin (power on self test) aikana"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1959,25 +1975,25 @@ msgstr ""
 "keycombo>, tai <keycap>Delete</keycap> POSTin aikana"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "<keycap>Esc</keycap> POSTin aikana"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -1989,13 +2005,13 @@ msgstr ""
 "keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2007,7 +2023,7 @@ msgstr ""
 "keycap> </keycombo> tai <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2017,7 +2033,7 @@ msgstr ""
 "url=\"&url-invoking-bios-info;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2033,13 +2049,13 @@ msgstr ""
 "\"&url-simtel;\"></ulink>."
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Käynnistyslaitteen valinta"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
@@ -2059,7 +2075,7 @@ msgstr ""
 "tai rompulta, jotka ovat &debian;in kaksi yleisintä asennustaltiota."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2071,7 +2087,7 @@ msgstr ""
 "ssa otetaan käyttöön rompulta käynnistäminen."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2087,7 +2103,7 @@ msgstr ""
 "laitteelta voi käynnistää."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2099,13 +2115,13 @@ msgstr ""
 "tietokone käynnistyy taas kiintolevyltä."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Käynnistysjärjestyksen vaihtaminen IDE-levyjä käyttävässä koneessa"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2117,7 +2133,7 @@ msgstr ""
 "näppäin tai näppäimet kuitenkin laitteen ohjeista."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2127,19 +2143,19 @@ msgstr ""
 "mutta yritä etsiä kenttää jossa on luettelo levyasemista."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "Tyypillisiä luetteloita IDE-levyille on C, A, cdrom tai A, C, cdrom."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C on kiintolevy ja A on levykeasema."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2151,7 +2167,7 @@ msgstr ""
 "keycap> näkee mahdolliset valinnat."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2161,13 +2177,13 @@ msgstr ""
 "tallennetaan tällä tietokoneella."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Käynnistysjärjestyksen vaihtaminen SCSI-levyjä käyttävässä koneessa"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
@@ -2176,7 +2192,7 @@ msgstr ""
 "käynnistyessä."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2187,7 +2203,7 @@ msgstr ""
 "pääsee."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2199,13 +2215,13 @@ msgstr ""
 "näppäin tai näppäimet kuitenkin laitteen ohjeista."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Etsi käynnistysjärjestystä muuttava toiminto."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2214,7 +2230,7 @@ msgstr ""
 "ensimmäisenä."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2225,19 +2241,19 @@ msgstr ""
 "keycap>."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Sekalaisia BIOSin asetuksia"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "Romppuasetukset"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2251,13 +2267,13 @@ msgstr ""
 "tämä asetus saataa olla syynä."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Jatkettu muisti ja laajennettu muisti"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2272,13 +2288,13 @@ msgstr ""
 "voi käyttää laajennettua muistia."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Virustorjunta"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2305,13 +2321,13 @@ msgstr ""
 "para> </footnote>"
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Varjomuisti"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2338,13 +2354,13 @@ msgstr ""
 "käyttöä &arch-kernel;."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Muistiaukko"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2356,7 +2372,7 @@ msgstr ""
 "kohtaa muistia jos tietokoneessa on muistia noin paljon."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2376,13 +2392,13 @@ msgstr ""
 "ilman sitä ei toiminut."
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Edistynyt virranhallinta (APM)"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2398,13 +2414,13 @@ msgstr ""
 "virranhallinnan paremmin kuin BIOS."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "OpenFirmwaren käynnistäminen"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2419,7 +2435,7 @@ msgstr ""
 "valmistajittain. On luettava koneen mukana tullutta laitteiston ohjekirjaa."
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2437,7 +2453,7 @@ msgstr ""
 "<ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> lisää vinkkejä."
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2460,7 +2476,7 @@ msgstr ""
 "on käytettävä modeemiporttiin yhdistetystä toisesta koneesta pääteohjelmalla."
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2482,13 +2498,13 @@ msgstr ""
 "jolloin laiteohjelmiston korjaukset asennetaan nvram:iin."
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "OpenBootin käynnistäminen"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2504,7 +2520,7 @@ msgstr ""
 "kuten vianmääritystä ja yksinkertaisia komentosarjoja."
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2525,7 +2541,7 @@ msgstr ""
 "<keycap>n</keycap> painamalla uudenmallinen."
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2539,7 +2555,7 @@ msgstr ""
 "Jos käytät jotain muuta pääteohjelmaa, lue sen ohjeet."
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2559,7 +2575,7 @@ msgstr ""
 "Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2602,7 +2618,7 @@ msgstr ""
 "Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2633,19 +2649,19 @@ msgstr ""
 "</screen></informalexample> ja Solariksessa:"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOSin asetukset"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2668,7 +2684,7 @@ msgstr ""
 "konsoli on rivipohjainen eikä merkkipohjainen."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2688,7 +2704,7 @@ msgstr ""
 "jos HMC ja tämä toiminto on käytettävissä."
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2713,13 +2729,13 @@ msgstr ""
 "parissa."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Asennus suoraan rautaan ja LPAR:iin"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2735,13 +2751,13 @@ msgstr ""
 "Distributions</ulink> Redbook ohjeet kuinka LPAR tehdään Linuxille."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Asennus VM vieraaksi"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2757,13 +2773,21 @@ msgstr ""
 "Distributions</ulink> Redbook ohjeet kuinka VM vieras tehdään Linuxille."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "Kaikki tiedostot alihakemistosta <filename>generic</filename> on kopioitava "
 "CMS-levylle. Muista kopioida <filename>kernel.debian</filename> ja "
@@ -2771,13 +2795,13 @@ msgstr ""
 "tietueen pituudella."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Asennuspalvelimen tekeminen"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2791,7 +2815,7 @@ msgstr ""
 "paketit ja niiden on oltava käytettävissä NFS:llä, HTTP:llä tai FTP:llä."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2805,25 +2829,25 @@ msgstr ""
 "voidaan myös kopioida tuollaiseen hakemistopuuhun."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Varottavia laitetason ilmiöitä"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Tuki USB BIOS:lle ja näppäimistöille"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2843,13 +2867,13 @@ msgstr ""
 "keyboard emulation</quote> tai <quote>USB keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Näytön pimeneminen OldWorld Powermaceissa"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2869,3 +2893,14 @@ msgstr ""
 "käynnistyksen jälkeen eikä käyttöliittymää näy, yritä muuttaa näytön "
 "värisyvyydeksi 256 väriä eikä <quote>tuhansia</quote> tai <quote>miljoonia</"
 "quote>."
+
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Asennusohjeet ja laiteajurit (DASD, XPRAM, konsoli, nauha, z90 crypto, "
+#~ "chandev, verkko) Linuxille suoritinperheellä &arch-title; käyttäen ydintä "
+#~ "2.4"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Laiteajurit ja asennuskomennot"
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index 9a310c378..fcd1180fe 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-10 22:11+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1022,7 +1022,8 @@ msgstr ""
 "URL noutaa verkosta haettavia valmiita vastauksia tukeva asennustaltio "
 "tiedoston URL:n avulla ja käyttää sitä valmiiden vastausten tiedostona. "
 "Seuraava esimerkki näyttää miten tämä tehdään ISC DHCP -palvelimen version 3 "
-"<filename>dhcpd.conf</filename>-tiedostossa (&debian;in paketti dhcp3-server). "
+"<filename>dhcpd.conf</filename>-tiedostossa (&debian;in paketti dhcp3-"
+"server). "
 
 #. Tag: screen
 #: preseed.xml:548
@@ -1062,10 +1063,11 @@ msgid ""
 "automate &debian; installs should only be done with care."
 msgstr ""
 "DHCP:tä on hyvä käyttää kertomaan valmiit vastaukset vain verkkokohtaisiin "
-"kysymyksiin, kuten käytettävä &debian;-asennuspalvelin. Näin verkkoa käyttävät "
-"asennukset saavat automaattisesti valittua hyvän asennuspalvelimen, mutta "
-"muut asennukset voidaan tehdä vuorovaikutteisesti. DHCP:n käyttö "
-"automatisoimaan &debian;in asennus kokonaan olisi tehtävä vain harkitusti."
+"kysymyksiin, kuten käytettävä &debian;-asennuspalvelin. Näin verkkoa "
+"käyttävät asennukset saavat automaattisesti valittua hyvän "
+"asennuspalvelimen, mutta muut asennukset voidaan tehdä vuorovaikutteisesti. "
+"DHCP:n käyttö automatisoimaan &debian;in asennus kokonaan olisi tehtävä vain "
+"harkitusti."
 
 #. Tag: title
 #: preseed.xml:571
@@ -1978,13 +1980,36 @@ msgstr "Osiointi käyttäen RAIDia"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
+msgstr ""
+"Valmiilla vastauksilla voidaan tehdä osiot myös ohjelmallisesti "
+"toteutettuihin RAID-pakkoihin. Tuettuja ovat RAID-tasot 0, 1 ja 5, 6 ja 10, "
+"vajaiden pakkojen luominen ja varalevyjen määrittely. Käytettäessä RAID "
+"tasoa 1, voidaan valmiilla vastauksilla saada grub asentumaan kaikille "
+"pakassa käytetyille laitteille; katso <xref linkend=\"preseed-bootloader\"/>."
+
+#. Tag: para
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
 msgstr ""
 "Valmiilla vastauksilla voidaan tehdä osiot myös ohjelmallisesti "
 "toteutettuihin RAID-pakkoihin. Tuettuja ovat RAID-tasot 0, 1 ja 5, 6 ja 10, "
@@ -1993,7 +2018,7 @@ msgstr ""
 "pakassa käytetyille laitteille; katso <xref linkend=\"preseed-bootloader\"/>."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2009,7 +2034,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename> jos pulmia ilmenee."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2109,13 +2134,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Määritellään miten osiot liitetään"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2134,7 +2159,7 @@ msgstr ""
 "liitetään kaikki nimiöttömät osiot UUID:n perusteella."
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2144,7 +2169,7 @@ msgstr ""
 "perinteisten nimien käyttämistä eivätkä käytä UUID:tä."
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2160,7 +2185,7 @@ msgstr ""
 "toiminta käynnistyksessä satunnaista. "
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2178,13 +2203,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "Perusjärjestelmän asennus"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2195,7 +2220,7 @@ msgstr ""
 "käyttää valmiita vastauksia. Ainoat kysymykset koskevat ytimen asentamista."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2224,13 +2249,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "Käyttäjätunnusten luonti"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2242,7 +2267,7 @@ msgstr ""
 "käyttää joko ilmitekstiä tai MD5 <emphasis>tiivistettä</emphasis> (hash)."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2259,7 +2284,7 @@ msgstr ""
 "mahdollisuudet."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2317,7 +2342,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2337,26 +2362,26 @@ msgstr ""
 "<command>sudo</command>)."
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "Seuraavalla komennolla saadaan tehtyä salasanan MD5-tiiviste:"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "Apt:n asetukset"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2369,7 +2394,7 @@ msgstr ""
 "perusteella. Muiden (paikallisten) varastoalueiden lisääminen on valinnaista."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2427,13 +2452,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "Pakettien valinta"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2443,73 +2468,73 @@ msgstr ""
 "Tätä kirjoitettaessa saatavilla olevia tehtäviä ovat ainakin:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2521,7 +2546,7 @@ msgstr ""
 "<userinput>standard</userinput>."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2537,7 +2562,7 @@ msgstr ""
 "käynnistysparametrinakin."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2575,13 +2600,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Käynnistyslataimen asennus"
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1087
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2661,6 +2686,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2714,7 +2741,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2726,13 +2753,13 @@ msgstr ""
 "esimerkistä <xref linkend=\"preseed-account\"/>."
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "Asennuksen lopetus"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2773,13 +2800,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Valmiit vastaukset muille paketeille"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2799,19 +2826,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "Lisäasetukset"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Mielivaltaisten komentojen käynnistämien asennuksen aikana"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2821,7 +2848,7 @@ msgstr ""
 "komentotiedostojen suorittaminen tietyissä paikoissa asennuksen aikana."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2872,13 +2899,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "Oletusarvojen muuttaminen valmiilla vastauksilla"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2904,7 +2931,7 @@ msgstr ""
 "jäljitettäessä vikaa valmiiden vastausten tiedostosta."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2918,7 +2945,7 @@ msgstr ""
 "<xref linkend=\"preseed-bootparms\"/>."
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2939,13 +2966,13 @@ msgstr ""
 "sisäisiin (<quote>internal</quote>) parametreihin."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Valmiiden vastausten tiedostojen lataaminen ketjussa"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2961,7 +2988,7 @@ msgstr ""
 "asetukset tiettyihin kokoonpanoihin toisiin tiedostoihin."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -3013,7 +3040,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po
index 911c480a8..022379e64 100644
--- a/po/fi/random-bits.po
+++ b/po/fi/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-11 08:40+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -822,8 +822,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS server"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -837,13 +865,13 @@ msgstr ""
 "olisi varauduttava 350 Mt kokonaistilaan noudossa ja asennuksessa."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "&debian-gnu;in asentaminen Unix/Linux-järjestelmästä."
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -866,7 +894,7 @@ msgstr ""
 "eristetyssä &debian;issa kirjoitettavaa komentoa."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -875,14 +903,14 @@ msgid ""
 "also a clever way for dealing with hardware that otherwise doesn't play "
 "friendly with various boot or installation media."
 msgstr ""
-"Kun uuden &debian;-järjestelmän asetukset on saatu mieleisiksi, voidaan vanhan "
-"järjestelmän käyttäjien tiedot (jos niitä on) siirtää ja jatkaa koneen "
-"käyttöä. Kyseessä on siis &debian-gnu; asennus <quote>ilman "
+"Kun uuden &debian;-järjestelmän asetukset on saatu mieleisiksi, voidaan "
+"vanhan järjestelmän käyttäjien tiedot (jos niitä on) siirtää ja jatkaa "
+"koneen käyttöä. Kyseessä on siis &debian-gnu; asennus <quote>ilman "
 "alhaallaoloaikaa</quote>. Tämä on myös näppärä keino jos laitteiston kanssa "
 "on vaikeuksia käynnistys- ja asennustaltioiden kanssa."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, fuzzy, no-c-format
 #| msgid ""
 #| "As this is a mostly manual procedure, you should bear in mind that you "
@@ -912,13 +940,13 @@ msgstr ""
 "Lisäasennukset ja/tai -asetukset saattavat olla tarpeen."
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "Alkuunpääsy"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -934,7 +962,7 @@ msgstr ""
 "työpöytäympäristö kuten GNOME tai KDE)."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -952,7 +980,7 @@ msgstr ""
 "jätetään <userinput>-j</userinput> pois."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -976,7 +1004,7 @@ msgstr ""
 "mikä tahansa hakemisto, mutta nimeä käytetään myöhemmin."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -986,7 +1014,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -998,13 +1026,13 @@ msgstr ""
 "kohtaan."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Asennetaan <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -1029,7 +1057,7 @@ msgstr ""
 "command>."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -1048,15 +1076,15 @@ msgstr ""
 "# mkdir work\n"
 "# cd work\n"
 "</screen></informalexample> Komennon <command>debootstrap</command> "
-"suoritettava ohjelmatiedosto on &debian;in asennuspalvelimella (muista valita "
-"oikea tiedosto koneen suoritinperheelle). Nouda <command>debootstrap</"
+"suoritettava ohjelmatiedosto on &debian;in asennuspalvelimella (muista "
+"valita oikea tiedosto koneen suoritinperheelle). Nouda <command>debootstrap</"
 "command> .deb <ulink url=\"http://ftp.debian.org/debian/pool/main/d/"
 "debootstrap/\"> varastoalueelta</ulink>, kopioi paketti työhakemistoon ja "
 "pura siitä suorituskelpoiset ohjelmatiedostot, joiden asentamiseen tarvitaan "
 "pääkäyttäjän oikeuksia."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1068,13 +1096,13 @@ msgstr ""
 "# zcat /kokonainen-polkunimi/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Suoritetaan <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -1091,7 +1119,7 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1103,7 +1131,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1123,7 +1151,7 @@ msgstr ""
 "<userinput>s390</userinput>, tai <userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1133,13 +1161,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.fi.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Perusjärjestelmän asetukset"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1156,19 +1184,19 @@ msgstr ""
 "esimerkiksi:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "Luo laitetiedostot"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1188,19 +1216,19 @@ msgstr ""
 "laitetiedostoja."
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "Joitakin käytettävissä olevista valitsimista:"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr "luo oletusjoukko staattisia laitetiedostoja komennoilla:"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1210,7 +1238,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1218,7 +1246,7 @@ msgstr ""
 "luo itse vain tietyt laitetiedostot komennolla <command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1231,13 +1259,13 @@ msgstr ""
 "luomista, joten tätä valitsinta olisi käytettävä varoen"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Liitetään osiot"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1324,13 +1352,13 @@ msgstr ""
 "liitetty ennen jatkamista:"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1342,19 +1370,19 @@ msgstr ""
 "ulkopuolelta:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Aikavyöhyke"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1367,7 +1395,7 @@ msgstr ""
 "ajassa. Seuraavalla komennolla voi tämän määrätä ja valita aikavyöhykkeen."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1377,13 +1405,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "Verkon asetukset"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1508,13 +1536,13 @@ msgstr ""
 "tunnetulla nimellä (eth0, eth1, etc.)."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Aptin asetukset"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1540,13 +1568,13 @@ msgstr ""
 "userinput> kun sources.list-tiedostoa on muutettu."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Näppäimistön asetukset ja maa-asetusto"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1566,7 +1594,7 @@ msgstr ""
 "</screen></informalexample> Näppäimistön asetukset tehdään (tarvittaessa):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1576,7 +1604,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1586,13 +1614,13 @@ msgstr ""
 "eristettynä, mutta ne tulevat käyttöön seuraavassa käynnistyksessä."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Asennetaan ydin"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you intend to boot this system, you probably want a Linux kernel and a "
@@ -1606,19 +1634,19 @@ msgstr ""
 "komennolla:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1626,13 +1654,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Käynnistyslataimen asetukset"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1647,7 +1675,7 @@ msgstr ""
 "<command>aptitude</command> &debian;in chroot-eristyksen sisällä."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1680,7 +1708,7 @@ msgstr ""
 "järjestelmästä jossa se käynnistettiin."
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1704,7 +1732,7 @@ msgstr ""
 "filename>-tiedoston."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1716,14 +1744,14 @@ msgstr ""
 "käsittely ei kuulu tähän liitteeseen."
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr ""
 "Tässä on tiedoston <filename>/etc/lilo.conf</filename> perusversio malliksi:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1745,7 +1773,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1765,7 +1793,7 @@ msgstr ""
 "käynnistettiin.\""
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1795,13 +1823,13 @@ msgstr ""
 "<userinput>ide0:</userinput> eikä <userinput>hd:</userinput>."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Viimeistely"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1821,7 +1849,7 @@ msgstr ""
 "command>:lla paketteja yksitellen."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1833,19 +1861,19 @@ msgstr ""
 "vapauttaa komennolla:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "&debian-gnu;:in asennus käyttäen Parallel Line IP:tä (PLIP)"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1857,11 +1885,11 @@ msgstr ""
 "Tässä luvussa kerrotaan miten &debian-gnu; asennetaan tietokoneelle jossa ei "
 "ole Ethernetliitäntää, vain yhdyskäytävänä toimiva etätietokone johon on "
 "yhteys nollamodeemikaapelilla (eli nollatulostinkaapelilla). "
-"Yhdyskäytäväkoneen olisi oltava verkossa jossa on &debian;in asennuspalvelimen "
-"kopio (esim. Internetissä). "
+"Yhdyskäytäväkoneen olisi oltava verkossa jossa on &debian;in "
+"asennuspalvelimen kopio (esim. Internetissä). "
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1877,7 +1905,7 @@ msgstr ""
 "paikallisverkon osoiteavaruuteen)."
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1888,7 +1916,7 @@ msgstr ""
 "käynnistetty asennettuun järjestelmään (katso <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1901,13 +1929,13 @@ msgstr ""
 "Yleisimmät arvot ovat <literal>io=0x378</literal>, <literal>irq=7</literal>."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "Vaatimukset"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1917,13 +1945,13 @@ msgstr ""
 "asennetaan"
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "Asennustaltio; katso <xref linkend=\"installation-media\"/>."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1933,7 +1961,7 @@ msgstr ""
 "kytketty Internettiin ja toimii yhdyskäytävänä."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1945,13 +1973,13 @@ msgstr ""
 "kaapelin itse."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "Lähdekoneen asetukset"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1962,7 +1990,7 @@ msgstr ""
 "portin kautta."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -2004,13 +2032,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "Asennetaan kohdekone"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2036,13 +2064,13 @@ msgstr ""
 "kuten seuraavassa kerrotaan."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Ladattavat asentimen osat"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2052,13 +2080,13 @@ msgstr ""
 "jälkeen PLIP-ajurit ovat käytettävissä asennusjärjestelmässä."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Tunnista verkkolaitteisto"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2073,7 +2101,7 @@ msgstr ""
 "kohdekoneessa ei ole verkkoliitäntää."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2085,19 +2113,19 @@ msgstr ""
 "userinput>."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "Tee verkkoasetukset"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Haetaanko verkkoasetukset automaattisesti DHCP:llä?"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2105,7 +2133,7 @@ msgstr ""
 "IP-osoite: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2115,7 +2143,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2125,13 +2153,13 @@ msgstr ""
 "(katso tiedostosta <filename>/etc/resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "&debian-gnu;:in asennus käyttäen PPPP over Ethernet:tiä (PPPoE)"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2147,7 +2175,7 @@ msgstr ""
 "miten."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2158,7 +2186,7 @@ msgstr ""
 "käynnistetty asennettuun järjestelmään (katso <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2171,7 +2199,7 @@ msgstr ""
 "netboot<phrase condition=\"supports-floppy-boot\">tai levyke</phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2181,7 +2209,7 @@ msgstr ""
 "asennukset. Seuraavat kohdat selittävät eroavuudet."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2197,7 +2225,7 @@ msgstr ""
 "classname>) latautuminen ja automaattinen käynnistyminen."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2216,7 +2244,7 @@ msgstr ""
 "<quote>modules</quote>-käynnistysparametria. </para> </footnote>)."
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2226,7 +2254,7 @@ msgstr ""
 "Ethernet-kortit löytyvät."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2238,7 +2266,7 @@ msgstr ""
 "konsentraattori (palvelin joka huolehtii PPPoE-yhteyksistä)."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2254,7 +2282,7 @@ msgstr ""
 "käynnistä yhteys</guimenuitem> asentimen päävalikosta."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2264,7 +2292,7 @@ msgstr ""
 "sisäänkirjautumiskehote (PPPoE:n käyttäjätunnus ja salasana)."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2284,13 +2312,13 @@ msgstr ""
 "käynnistä yhteys</guimenuitem>."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "Graafinen asennin"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2304,7 +2332,7 @@ msgstr ""
 "samoja ohjelmia mutta erilaisella edustaohjelmalla."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2321,7 +2349,7 @@ msgstr ""
 "tapauksissa voidaan useita kysymyksiä esittää samalla ruudulla."
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2343,7 +2371,7 @@ msgstr ""
 "käynnistyskehotteessa."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2355,13 +2383,13 @@ msgid ""
 msgstr ""
 "Graafinen asennin on saatavilla myös verkosta käynnistettävänä otoksena. "
 "Lisäksi on myös erikoinen <quote>mini</quote> ISO-otos<footnote id=\"gtk-"
-"miniiso\"> <para> Mini ISO-otos voidaan noutaa &debian;in asennuspalvelimelta "
-"kuten <xref linkend=\"downloading-files\"/> neuvoo. Etsi otosta "
-"<quote>netboot/gtk/mini.iso</quote>. </para> </footnote>, joka on "
+"miniiso\"> <para> Mini ISO-otos voidaan noutaa &debian;in "
+"asennuspalvelimelta kuten <xref linkend=\"downloading-files\"/> neuvoo. Etsi "
+"otosta <quote>netboot/gtk/mini.iso</quote>. </para> </footnote>, joka on "
 "tarkoitettu lähinnä testaamiseen."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2380,7 +2408,7 @@ msgstr ""
 "ei toimi."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2390,7 +2418,7 @@ msgstr ""
 "asentimellekin mahdollista antaa käynnistysvalitsimia."
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2403,7 +2431,7 @@ msgstr ""
 "automaattisesti käyttämään tavallista <quote>newt</quote>-käyttöliittymää."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2417,13 +2445,13 @@ msgstr ""
 "suositellaan koneissa joissa on niukasti käytettävissä olevaa muistia."
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "Graafisen asentimen käyttö"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2435,7 +2463,7 @@ msgstr ""
 "asennusohjeena."
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2456,7 +2484,7 @@ msgstr ""
 "painamista."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2468,7 +2496,7 @@ msgstr ""
 "<keycap>F1</keycap>. "
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/fi/using-d-i.po b/po/fi/using-d-i.po
index b1975115e..714c364da 100644
--- a/po/fi/using-d-i.po
+++ b/po/fi/using-d-i.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-14 08:20+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -451,11 +451,23 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "Tehdään pääkäyttäjälle salasana ja tehdään tavallinen käyttäjä."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -465,25 +477,25 @@ msgstr ""
 "koordinoituun yleisaikaan."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "Valitaan aiemmin valitun maan perusteella aikavyöhyke."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
@@ -497,13 +509,13 @@ msgstr ""
 "LVM:lle. Tämä on &debian;in suositeltu osiointiohjelma."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -513,13 +525,13 @@ msgstr ""
 "valitaan laitearkkitehtuurin perusteella."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -529,13 +541,13 @@ msgstr ""
 "käyttäjän komentojen mukaisesti."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -545,13 +557,13 @@ msgstr ""
 "levyniteiden hallintaohjelma) asetusten teossa."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -563,13 +575,13 @@ msgstr ""
 "halpa IDE (mukamas rautatason) RAID-ohjain uudehkoilla emolevyillä."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -579,18 +591,6 @@ msgstr ""
 "tietokonetta käynnistettäessä."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "Tehdään pääkäyttäjälle salasana ja tehdään tavallinen käyttäjä."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -1087,8 +1087,8 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Näppäimistöt tavataan sovittaa kielessä käyttyjen merkkien mukaan. Valitse "
 "näppäimistöasettelu joka vastaa käytettävää näppäimistöä, tai valitse sitä "
@@ -1177,9 +1177,9 @@ msgstr ""
 "filename>, <filename>/data/<replaceable>jotain</replaceable>.iso</filename> "
 "löytyvät, mutta ei <filename>/data/tmp/<replaceable>jotain</replaceable>."
 "iso</filename>). Kun iso-otos on löytynyt <command>iso-scan</command> tutkii "
-"sisällön perusteella onko tiedosto kelvollinen &debian;in iso-otos vai ei. Jos "
-"on, homma on valmis. Jos ei ole, <command>iso-scan</command> etsii toisen "
-"otoksen."
+"sisällön perusteella onko tiedosto kelvollinen &debian;in iso-otos vai ei. "
+"Jos on, homma on valmis. Jos ei ole, <command>iso-scan</command> etsii "
+"toisen otoksen."
 
 #. Tag: para
 #: using-d-i.xml:700
@@ -1420,11 +1420,144 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Käyttäjät ja salasanat"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"Kun perusjärjestelmä on asennettu, päästään tekemään käyttäjätunnus "
+"<quote>root</quote> ja/tai tunnus ensimmäiselle käyttäjälle. Muita "
+"käyttäjätunnuksia voidaan luoda kun asennus on valmis."
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "Asetetaan pääkäyttäjän salasana"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"Pääkäyttäjän tunnus <emphasis>root</emphasis> on superkäyttäjä; root ohittaa "
+"kaikki järjestelmän suojaukset. Pääkäyttäjän tunnusta olisi käytettävä vain "
+"järjestelmän ylläpitoon, ja vain kun se on välttämätöntä."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"Luotavissa salasanoissa olisi oltava ainakin 6 merkkiä ja sekä isoja että "
+"pieniä kirjaimia, samoin kuin välimerkkejä. Ole erityisen huolellinen "
+"luotaessa salasanaa pääkäyttäjälle, tuolla tunnuksella on rajoittamattomat "
+"oikeudet. Älä käytä sanakirjasta löytyviä sanoja eikä arvattavissa olevia "
+"henkilötietoja."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Vaikka kuka tahansa kysyisi mikä on pääkäyttäjän salasana, on syytä olla "
+"erittäin varovainen. Pääkäyttäjän salasanaa ei tavallisesti pitäisi kertoa "
+"muille kuin järjestelmän ylläpitäjille."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Luo tavallisen käyttäjän tunnus"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"Asennin kysyy halutaanko tässä kohtaa luoda käyttäjätunnus tavalliselle "
+"käyttäjälle. Tunnus on tarkoitettu henkilökohtaiseeen käyttöön. Pääkäyttäjän "
+"tunnusta <emphasis>ei</emphasis> pidä käyttää tavalliseen käyttöön eikä "
+"henkilökohtaisena kirjautumistunnuksena."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"Ja miksi ei? No yksi syy on pääkäyttäjän rajoittamattomat oikeudet, joilla "
+"voi helposti saada aikaan korjaamatonta vahinkoa. Toinen syy on, että "
+"käyttäjä voidaan höynäyttää käynnistämään <emphasis>troijalainen</emphasis> "
+"&mdash; haittaohjelma joka pääkäyttäjän oikeuksia käyttämällä avaa reikiä "
+"järjestelmän suojauksiin käyttäjän huomaamatta. Kaikki hyvät kirjat Unix-"
+"järjestelmien ylläpidosta kertovat tästä lisää &mdash; kannattaisi perehtyä "
+"jos ei ole tehnyt ylläpitoa aiemmin."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Ensimmäiseen kehotteeseen kirjoitetaan käyttäjän koko nimi. Sitten kysytään "
+"käyttäjätunnus; useimmiten etunimi tai jotain vastaavaa on ihan hyvä ja "
+"etunimi onkin oletusarvo. Lopuksi kirjoitetaan käyttäjälle salasana."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Haluttaessa luoda lisää käyttäjätunnuksia asennuksen jälkeen käytetään "
+"komentoa <command>adduser</command>."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Osioiden teko ja liitoskohtien valinta"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1442,7 +1575,7 @@ msgstr ""
 "levyniteiden hallinta LVM tai salatut laitteet."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1452,7 +1585,7 @@ msgstr ""
 "linkend=\"partitioning\"/>."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1474,7 +1607,7 @@ msgstr ""
 "tietoon ei enää pääse käsiksi."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1488,13 +1621,13 @@ msgstr ""
 "<guimenuitem>Tee levyosiot itse</guimenuitem> valikosta."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "Tuotut osioinnin vaihtoehdot"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1506,7 +1639,7 @@ msgstr ""
 "osiotauluja, tiedostojärjestelmiä ja kehittyneitä lohkolaitteita."
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1526,7 +1659,7 @@ msgstr ""
 "tai matala; korkeammilla prioriteeteilla käytetään järkeviä vakioasetuksia."
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1536,31 +1669,31 @@ msgstr ""
 "useissa tapauksissa yhdessä. "
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "Loogisten levyniteiden hallintaohjelma (LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "Käyttöjärjestelmän tekemä RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "Tuettu on RAID tasot 0, 1, 4, 5, 6 ja 10."
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "Salaus"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1568,7 +1701,7 @@ msgstr ""
 "<emphasis>Serial ATA RAID</emphasis> (käytössä <classname>dmraid</classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1582,13 +1715,13 @@ msgstr ""
 "<ulink url=\"&url-d-i-sataraid;\">Wikissämme</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>Multipath</emphasis> (koekäytössä)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1600,13 +1733,13 @@ msgstr ""
 "asenninta käynnistettäessä."
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "Tuettuja ovat seuraavat tiedostojärjestelmät."
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1618,7 +1751,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1629,21 +1762,21 @@ msgstr ""
 "osiointia käytettäessä <filename>/boot</filename>-osioille valitaan ext2."
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr ""
 "<emphasis>jfs</emphasis> (ei ole käytettävissä kaikille suoritinperheille."
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr ""
 "<emphasis>xfs</emphasis> (ei ole käytettävissä kaikille suoritinperheille)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
@@ -1652,7 +1785,7 @@ msgstr ""
 "laitealustoille)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1666,13 +1799,13 @@ msgstr ""
 "classname>. Vain tiedostojärjestelmän versio 3 on tuettu."
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1682,13 +1815,13 @@ msgstr ""
 "mahdollista luoda uusia jffs2-osioita."
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1698,19 +1831,19 @@ msgstr ""
 "ole mahdollista luoda uusia qnx4-osioita."
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (vain luku)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1720,13 +1853,13 @@ msgstr ""
 "liitoskohta. Ei ole mahdollista luoda uusia NTFS-osioita. "
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "Ohjattu osiointi"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1743,14 +1876,14 @@ msgstr ""
 "crypt</quote>-tukea </para> </footnote>. "
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr "(salattu) LVM ei ehkä ole käytettävissä kaikille suoritinperheille."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1766,7 +1899,7 @@ msgstr ""
 "(henkilökohtaisille) tiedoille."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1782,7 +1915,7 @@ msgstr ""
 "mutta saattaa viedä jonkin aikaa, levyn koosta riippuen."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1800,7 +1933,7 @@ msgstr ""
 "levylle."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1817,7 +1950,7 @@ msgstr ""
 "poiketa totutusta. Levyjen kokoja voi käyttää apuna levyjen tunnistamisessa."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1832,7 +1965,7 @@ msgstr ""
 "asti; (salattua) LVM:ää käytettäessä peruminen ei ole mahdollista."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1850,73 +1983,73 @@ msgstr ""
 "noin 1 Gt tilaa (riippuu mallineesta), ohjattu osiointi ei toimi."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Osioinnin mallineet"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Vähimmäistila"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Tehdyt osiot"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Kaikki tiedostot yhdessä levyosiossa"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600 Mt"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, sivutus"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Erillinen /home-osio"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500 Mt"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, sivutus"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Erilliset /home-, /usr-, /var- ja /tmp-osiot"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1 Gt</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1926,7 +2059,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, sivutus"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1939,7 +2072,7 @@ msgstr ""
 "LVM-osion sisälle."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1953,7 +2086,7 @@ msgstr ""
 "tekemiseksi EFI-käynnistysosioksi."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1965,7 +2098,7 @@ msgstr ""
 "niiden liitoskohdat."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2016,7 +2149,7 @@ msgstr ""
 "mahdollisista vaihtoehdoista."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2036,13 +2169,13 @@ msgstr ""
 "tehtäessä osiot itse."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "Tee osiot itse"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
@@ -2057,7 +2190,7 @@ msgstr ""
 "asennettavassa &debian;-järjestelmässä."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2071,7 +2204,7 @@ msgstr ""
 "uusi rivi <quote>VAPAA TILA</quote>."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2110,7 +2243,7 @@ msgstr ""
 "aloitusruutuun."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2130,7 +2263,7 @@ msgstr ""
 "Osion voi myös poistaa tästä valikosta."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2146,7 +2279,7 @@ msgstr ""
 "suostu jatkamaan ennen kuin tämä on tehty."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2158,7 +2291,7 @@ msgstr ""
 "kuin nämä on tehty."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2174,7 +2307,7 @@ msgstr ""
 "tai <filename>partman-lvm</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2188,13 +2321,13 @@ msgstr ""
 "tiedostojärjestelmät luodaan valitulla tavalla."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Monilevylaitteen asetukset (ohjelmallisesti toteutettu RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2214,7 +2347,7 @@ msgstr ""
 "<firstterm>ohjelmallisesti toteutettu RAID</firstterm>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2228,7 +2361,7 @@ msgstr ""
 "voi tehdä tiedostojärjestelmän, määrätä liitoskohdan, jne.)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2357,97 +2490,97 @@ msgstr ""
 "Yhteenvetona:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Tyyppi"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Levyjä vähintään"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Varalevy"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "Toipuuko levyrikosta?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Käytettävissä oleva tila"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>ei</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "Pienimmän osion koko kertaa pakan levyjen määrä"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "haluttaessa"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>kyllä</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Pakan pienimmän osion koko"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2456,19 +2589,19 @@ msgstr ""
 "Pakan pienimmän osion koko kertaa (pakan levyjen määrä vähennettynä yhdellä)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2477,13 +2610,13 @@ msgstr ""
 "Pakan pienimmän osion koko kertaa (pakan levyjen määrä vähennettynä kahdella)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2492,7 +2625,7 @@ msgstr ""
 "Kaikkien osioiden määrä jaettuna kimpalekopioiden määrällä (oletusarvo kaksi)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2502,7 +2635,7 @@ msgstr ""
 "url=\"&url-software-raid-howto;\">Software RAID HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2518,7 +2651,7 @@ msgstr ""
 "menuchoice>."
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2538,7 +2671,7 @@ msgstr ""
 "<filename>/boot</filename> on RAID1."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2556,7 +2689,7 @@ msgstr ""
 "asennuksen vaiheita komentotulkista."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2578,7 +2711,7 @@ msgstr ""
 "riippuu MD-laitteelle valitusta tyypistä."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2590,7 +2723,7 @@ msgstr ""
 "MD."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2608,7 +2741,7 @@ msgstr ""
 "virhe; asennin ei päästä jatkamaan ennen kuin levyjen määrät täsmäävät."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2618,7 +2751,7 @@ msgstr ""
 "ainakin <emphasis>kolme</emphasis> levyosiota. "
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2628,7 +2761,7 @@ msgstr ""
 "ainakin <emphasis>neljä</emphasis> levyosiota. "
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2648,7 +2781,7 @@ msgstr ""
 "eri levylle."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2666,7 +2799,7 @@ msgstr ""
 "100 Gt <filename>/home</filename>-osio)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2681,13 +2814,13 @@ msgstr ""
 "esimerkiksi liitoskohdat."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Loogisten levyniteiden hallintaohjelman (LVM) asetukset"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2703,7 +2836,7 @@ msgstr ""
 "symbolisilla linkeillä jne."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2723,7 +2856,7 @@ msgstr ""
 "se muodostuu) voi olla osia jotka ovat eri fyysisillä kiintolevyllä."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2743,7 +2876,7 @@ msgstr ""
 "\">LVM HOWTO</ulink> ei vielä ole luettu siihen kannattaisi tutustua."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2760,7 +2893,7 @@ msgstr ""
 "levynide LVM:lle</guimenuitem> </menuchoice>."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2780,7 +2913,7 @@ msgstr ""
 "Mahdolliset toiminnot ovat:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2790,43 +2923,43 @@ msgstr ""
 "n rakenteen, loogisten levyniteiden nimet, koot ja muuta"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Luo levynideryhmä"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Luo looginen nide"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Poista levynideryhmä"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Poista looginen nide"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Kasvata levynideryhmää"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Pienennä levynideryhmää"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2836,7 +2969,7 @@ msgstr ""
 "pääruutuun"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2846,7 +2979,7 @@ msgstr ""
 "loogisia levyniteitä."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2858,13 +2991,13 @@ msgstr ""
 "olisi samalla tavalla käsiteltäväkin)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Salattujen levyniteiden asetukset"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2885,7 +3018,7 @@ msgstr ""
 "oikeaa salausavainta levyn sisältö näyttää satunnaiselta mössöltä. "
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2913,7 +3046,7 @@ msgstr ""
 "osiolta."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2926,7 +3059,7 @@ msgstr ""
 "suorituskyky, salausmenetelmä ja avaimen pituus."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2946,7 +3079,7 @@ msgstr ""
 "asetuksia osiolle."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2962,7 +3095,7 @@ msgstr ""
 "suositellaan jos ei ole pakottavaa syytä muuhun."
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2976,13 +3109,13 @@ msgstr ""
 "valittu tietoturvasyistä."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Salausmenetelmä: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3006,13 +3139,13 @@ msgstr ""
 "vakiosalausmenetelmäksi 2000-luvulla."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Avaimen koko: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -3025,13 +3158,13 @@ msgstr ""
 "Salausmenetelmä määrää käytettävissä olevat avaimien pituudet."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV-menetelmä: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3050,7 +3183,7 @@ msgstr ""
 "hahmoista."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3065,25 +3198,25 @@ msgstr ""
 "käyttää uudempia salausmenetelmiä."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Salausavain: <userinput>Tunnuslause</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Tässä valitaan tälle osiolle käytettävän salausavaimen tyyppi."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Tunnuslause"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3097,13 +3230,13 @@ msgstr ""
 "kysyttävästä tunnuslauseesta."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Satunnainen avain"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3121,7 +3254,7 @@ msgstr ""
 "ihmisen ikä.)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3140,13 +3273,13 @@ msgstr ""
 "on mahdotonta (käynnistettäessä suspendin jälkeen)."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Tiedot pyyhitään: <userinput>kyllä</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3167,7 +3300,7 @@ msgstr ""
 "taltion päälle olisi kirjoitettu montakin kertaa. </para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3179,13 +3312,13 @@ msgstr ""
 "vaihtuu näyttämään seuraavat valitsimet:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Salaus: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3198,25 +3331,25 @@ msgstr ""
 "pituudesta."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Salausavain: <userinput>Avaintiedosto (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "Valitaan tälle osiolle käytettävän salausavaimen tyyppi."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Avaintiedosto (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3230,19 +3363,19 @@ msgstr ""
 "asennuksen aikana)."
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "Katso aiempaa lukua satunnaisavaimista."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "Katso aiempaa lukua tiedon pyyhkimisestä."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3260,7 +3393,7 @@ msgstr ""
 "Isoilla osiolla tämä saattaa kestää hyvän tovin."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3276,7 +3409,7 @@ msgstr ""
 "lemmikkien nimiä, perheenjäsenten tai sukulaisten nimiä jne.)."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3300,7 +3433,7 @@ msgstr ""
 "tunnuslausetta."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3323,7 +3456,7 @@ msgstr ""
 "salattaville osioille."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3356,7 +3489,7 @@ msgstr ""
 "vaihdettava tiedostojärjestelmien tyyppiä jos oletusarvot eivät kelpaa."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3374,7 +3507,7 @@ msgstr ""
 "\"mount-encrypted-volumes\"/>."
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3382,13 +3515,13 @@ msgid ""
 msgstr "Kun osiointi on halutunlainen voidaan asennusta jatkaa."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "Perusjärjestelmän asennus"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3402,7 +3535,7 @@ msgstr ""
 "kulua toinenkin tovi."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3418,7 +3551,7 @@ msgstr ""
 "<keycombo><keycap>Vasen Alt</keycap><keycap>F1</keycap></keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3430,7 +3563,7 @@ msgstr ""
 "jos asennukseen käytetään sarjapäätettä."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3443,7 +3576,7 @@ msgstr ""
 "Käytettäessä pienempää prioriteettia ydin voidaan valita luettelosta."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3460,7 +3593,7 @@ msgstr ""
 "mielestä tavallisissa tapauksissa asentaa sovelluksen kanssa. "
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3474,134 +3607,6 @@ msgstr ""
 "asentamisen jälkeen."
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "Käyttäjät ja salasanat"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"Kun perusjärjestelmä on asennettu, päästään tekemään käyttäjätunnus "
-"<quote>root</quote> ja/tai tunnus ensimmäiselle käyttäjälle. Muita "
-"käyttäjätunnuksia voidaan luoda kun asennus on valmis."
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "Asetetaan pääkäyttäjän salasana"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"Pääkäyttäjän tunnus <emphasis>root</emphasis> on superkäyttäjä; root ohittaa "
-"kaikki järjestelmän suojaukset. Pääkäyttäjän tunnusta olisi käytettävä vain "
-"järjestelmän ylläpitoon, ja vain kun se on välttämätöntä."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"Luotavissa salasanoissa olisi oltava ainakin 6 merkkiä ja sekä isoja että "
-"pieniä kirjaimia, samoin kuin välimerkkejä. Ole erityisen huolellinen "
-"luotaessa salasanaa pääkäyttäjälle, tuolla tunnuksella on rajoittamattomat "
-"oikeudet. Älä käytä sanakirjasta löytyviä sanoja eikä arvattavissa olevia "
-"henkilötietoja."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Vaikka kuka tahansa kysyisi mikä on pääkäyttäjän salasana, on syytä olla "
-"erittäin varovainen. Pääkäyttäjän salasanaa ei tavallisesti pitäisi kertoa "
-"muille kuin järjestelmän ylläpitäjille."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "Luo tavallisen käyttäjän tunnus"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"Asennin kysyy halutaanko tässä kohtaa luoda käyttäjätunnus tavalliselle "
-"käyttäjälle. Tunnus on tarkoitettu henkilökohtaiseeen käyttöön. Pääkäyttäjän "
-"tunnusta <emphasis>ei</emphasis> pidä käyttää tavalliseen käyttöön eikä "
-"henkilökohtaisena kirjautumistunnuksena."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"Ja miksi ei? No yksi syy on pääkäyttäjän rajoittamattomat oikeudet, joilla "
-"voi helposti saada aikaan korjaamatonta vahinkoa. Toinen syy on, että "
-"käyttäjä voidaan höynäyttää käynnistämään <emphasis>troijalainen</emphasis> "
-"&mdash; haittaohjelma joka pääkäyttäjän oikeuksia käyttämällä avaa reikiä "
-"järjestelmän suojauksiin käyttäjän huomaamatta. Kaikki hyvät kirjat Unix-"
-"järjestelmien ylläpidosta kertovat tästä lisää &mdash; kannattaisi perehtyä "
-"jos ei ole tehnyt ylläpitoa aiemmin."
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Ensimmäiseen kehotteeseen kirjoitetaan käyttäjän koko nimi. Sitten kysytään "
-"käyttäjätunnus; useimmiten etunimi tai jotain vastaavaa on ihan hyvä ja "
-"etunimi onkin oletusarvo. Lopuksi kirjoitetaan käyttäjälle salasana."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Haluttaessa luoda lisää käyttäjätunnuksia asennuksen jälkeen käytetään "
-"komentoa <command>adduser</command>."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4500,14 +4505,21 @@ msgstr "Valitse oikea levyosio!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "Osion valintaperusteena on FAT-tiedostojärjestelmä ja "
 "<emphasis>käynnistyskelpoisuuden</emphasis> ilmaisin päällä. &d-i; saattaa "
diff --git a/po/hu/administrivia.po b/po/hu/administrivia.po
index 46cc30a6f..83009aa34 100644
--- a/po/hu/administrivia.po
+++ b/po/hu/administrivia.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-17 11:12+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -31,10 +31,15 @@ msgstr "E dokumentumról"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This manual was created for Sarge's debian-installer, based on the Woody "
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -210,7 +215,7 @@ msgstr ""
 #| "Kuře has documented a lot of the new functionality in Sarge's debian-"
 #| "installer."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/hu/bookinfo.po b/po/hu/bookinfo.po
index 5b47e5f75..f15f1ae01 100644
--- a/po/hu/bookinfo.po
+++ b/po/hu/bookinfo.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-18 07:20+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -40,17 +40,28 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Ez a telepítő kézikönyv a régi (<quote>boot-floppies</quote> nevű) Debian "
 "telepítő rendszerhez írt egy korábbi kézikönyvre épül, és az új Debian "
diff --git a/po/hu/hardware.po b/po/hu/hardware.po
index d0e0dd1e2..d0b2bc234 100644
--- a/po/hu/hardware.po
+++ b/po/hu/hardware.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-18 16:35+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -62,12 +62,12 @@ msgid ""
 "\"&url-ports;\"></ulink> for more details on &arch-title; architecture "
 "systems which have been tested with &debian-gnu;."
 msgstr ""
-"A &debian; nem igényel a Linux és a GNU eszköz-készletek által kívántnál több "
-"hardvert. Ezért minden gépen, melyen a Linux kernel, a libc, a <command>gcc</"
-"command> és a többi fut, és melyre a &debian; portolva van, futtatható a "
-"&debian;. Lásd a Debian portok oldalát a <ulink url=\"&url-ports;\"></ulink> "
-"címen a jelen &arch-title; architektúra rendszerekről, melyek teszteltek a "
-"&debian-gnu; rendszerrel."
+"A &debian; nem igényel a Linux és a GNU eszköz-készletek által kívántnál "
+"több hardvert. Ezért minden gépen, melyen a Linux kernel, a libc, a "
+"<command>gcc</command> és a többi fut, és melyre a &debian; portolva van, "
+"futtatható a &debian;. Lásd a Debian portok oldalát a <ulink url=\"&url-"
+"ports;\"></ulink> címen a jelen &arch-title; architektúra rendszerekről, "
+"melyek teszteltek a &debian-gnu; rendszerrel."
 
 #. Tag: para
 #: hardware.xml:32
@@ -578,8 +578,8 @@ msgid ""
 "<emphasis>any</emphasis> ARM CPU."
 msgstr ""
 "Minden ARM architektúra saját kernelt igényel. Ezért a szabvány &debian; "
-"terjesztés csak a legelterjedtebb platformokat támogatja. A &debian; csomagok "
-"természetesen <emphasis>minden</emphasis> ARM CPU-n jól működnek."
+"terjesztés csak a legelterjedtebb platformokat támogatja. A &debian; "
+"csomagok természetesen <emphasis>minden</emphasis> ARM CPU-n jól működnek."
 
 #. Tag: para
 #: hardware.xml:286
@@ -617,11 +617,11 @@ msgid ""
 "IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
 msgstr ""
 "Az Intel I/O Processzor (IOP) vonal sok adat-tároló és feldolgozó termékben "
-"megtalálható. A &debian; jelenleg az IOP32 platformot támogatja benne Network "
-"Attached Storage (NAS) eszközökben lévő IOP 80219 és 32x csipeket. A &debian; "
-"kimondottan támogat 2 eszközt: az IO-Data <ulink url=\"&url-arm-cyrius-"
-"glantank;\">GLAN Tank</ulink> eszközét és a <ulink url=\"&url-arm-cyrius-"
-"n2100;\">Thecus N2100</ulink> eszközt."
+"megtalálható. A &debian; jelenleg az IOP32 platformot támogatja benne "
+"Network Attached Storage (NAS) eszközökben lévő IOP 80219 és 32x csipeket. A "
+"&debian; kimondottan támogat 2 eszközt: az IO-Data <ulink url=\"&url-arm-"
+"cyrius-glantank;\">GLAN Tank</ulink> eszközét és a <ulink url=\"&url-arm-"
+"cyrius-n2100;\">Thecus N2100</ulink> eszközt."
 
 #. Tag: term
 #: hardware.xml:315
@@ -757,19 +757,19 @@ msgid ""
 msgstr ""
 "Tudni kell, hogy a &debian; GNU/Linux &releasename; immár <emphasis>nem</"
 "emphasis> fut 386-os vagy korábbi processzoron. Az \"i386\" architektúra-név "
-"ellenére a a 80386 processzorok (és másolataik) támogatása megszűnt a &debian; "
-"Sarge (r3.1) kiadás óta<footnote> <para> Sokáig megpróbáltuk elkerülni ezt, "
-"de végül a fordító és a kernel hibáinak egy szerencsétlen sora miatt, amely "
-"egy a GCC által szállított C++ ABI hibával kezdődött ez szükséges volt. A "
-"&debian; GNU/Linux még mindig futtatható 80386-os processzoron, de ehhez "
-"magadnak kell lefordítanod a kernelt és az összes használt csomagot, és ez "
-"túlmutat e kézikönyv célján. </para> </footnote>. (A Linux nem támogatja a "
-"286-os vagy korábbi x86 processzorokat.) Minden i486 és későbbi processzor "
-"támogatott<footnote> <para> A modern gépeken sok &debian; csomag így "
-"érezhetően gyorsabban fut, ami a régi gépek támogatása elvetésének pozitív "
-"oldala. Az i486 (1989) 3 utasításkóddal bír (bswap, cmpxchg, és xadd) "
-"mellyel az i386 (1986) nem. Korábban a legtöbb &debian; csomagban ezek nemigen "
-"voltak használhatók; most igen. </para> </footnote>."
+"ellenére a a 80386 processzorok (és másolataik) támogatása megszűnt a "
+"&debian; Sarge (r3.1) kiadás óta<footnote> <para> Sokáig megpróbáltuk "
+"elkerülni ezt, de végül a fordító és a kernel hibáinak egy szerencsétlen "
+"sora miatt, amely egy a GCC által szállított C++ ABI hibával kezdődött ez "
+"szükséges volt. A &debian; GNU/Linux még mindig futtatható 80386-os "
+"processzoron, de ehhez magadnak kell lefordítanod a kernelt és az összes "
+"használt csomagot, és ez túlmutat e kézikönyv célján. </para> </footnote>. "
+"(A Linux nem támogatja a 286-os vagy korábbi x86 processzorokat.) Minden "
+"i486 és későbbi processzor támogatott<footnote> <para> A modern gépeken sok "
+"&debian; csomag így érezhetően gyorsabban fut, ami a régi gépek támogatása "
+"elvetésének pozitív oldala. Az i486 (1989) 3 utasításkóddal bír (bswap, "
+"cmpxchg, és xadd) mellyel az i386 (1986) nem. Korábban a legtöbb &debian; "
+"csomagban ezek nemigen voltak használhatók; most igen. </para> </footnote>."
 
 #. Tag: para
 #: hardware.xml:450
@@ -801,9 +801,9 @@ msgstr "I/O Busz"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "A rendszerbusz az alaplap része, mellyel a CPU a perifériákkal kommunikál, "
 "például a tároló eszközökkel. A gépnek ISA-t, EISA-t, PCI-t, Mikrocsatornás "
@@ -1454,32 +1454,25 @@ msgstr "S/390 és zSeries géptípusok"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
-msgstr ""
-"A támogatott S/390 és zSeries gépekről szóló teljes információ forrása az "
-"IBM vörös könyv <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/"
-"sg246264.pdf\"> Linux az IBM eServer zSeries és S/390 gépekre: "
-"Disztribúciók</ulink> 2.1 fejezet illetve a <ulink url=\"http://www-128.ibm."
-"com/developerworks/linux/linux390/index.html\">zSeries oldal a "
-"developerWorks lapon</ulink>. Röviden: a G5, Multiprise 3000, G6 és minden "
-"zSeries teljesen támogatott; a Multiprise 2000, G3 és G4 gépek csak IEEE "
-"lebegőpontos emulációval, ami csökkenti a teljesítményt."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
+msgstr ""
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU és alaplap támogatás"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1489,13 +1482,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1505,7 +1498,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1514,13 +1507,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1532,13 +1525,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1548,7 +1541,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1556,13 +1549,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "Laptopok"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Laptops are also supported. Laptops are often specialized or contain "
@@ -1582,13 +1575,13 @@ msgstr ""
 "oldalakat</ulink>"
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "Többszörös processzorok"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1612,7 +1605,7 @@ msgstr ""
 "rendszeren is elindul; egyszerűen csak kicsit túlműködik."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1630,7 +1623,7 @@ msgstr ""
 "quote> lehetőségének kikapcsolásával lehetséges.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1655,7 +1648,7 @@ msgstr ""
 "automatikusan kikapcsolja az SMP-t az 1-processzoros rendszereken."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1665,7 +1658,7 @@ msgstr ""
 "támogatás nélkül fordított."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1681,7 +1674,7 @@ msgstr ""
 "SMP-rendszereken; egyszerűen csak az 1. CPU-t használja."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -1699,7 +1692,7 @@ msgstr ""
 "quote> lehetőségének bekapcsolásával lehetséges.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1711,13 +1704,13 @@ msgid ""
 msgstr ""
 "A több-processzoros támogatás &mdash; melyre az angol <quote>symmetric multi-"
 "processing</quote> vagy SMP &mdash; néven is hivatkoznak szintén elérhető "
-"ezen architektúrához és egy elő-fordított &debian; kernel-kép által támogatott "
-"A telepítő médiától függően települ vagy sem alapértelmezetten az SMP-képes "
-"kernel. Ez nem gátolja a telepítést, mert az alap nem-SMP kernel elindul SMP-"
-"rendszereken; egyszerűen csak az 1. CPU-t használja."
+"ezen architektúrához és egy elő-fordított &debian; kernel-kép által "
+"támogatott A telepítő médiától függően települ vagy sem alapértelmezetten az "
+"SMP-képes kernel. Ez nem gátolja a telepítést, mert az alap nem-SMP kernel "
+"elindul SMP-rendszereken; egyszerűen csak az 1. CPU-t használja."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1726,7 +1719,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can also build your own customized kernel to support SMP. <phrase "
@@ -1750,20 +1743,27 @@ msgstr ""
 "</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "Grafikus kártya támogatás"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "VGA-kompatibilis kijelző csatoló használatát ajánljuk a konzol terminálhoz. "
 "Sok éve már főleg ilyenek készülnek. A CGA, MDA, HDA és más ősi szabványok "
@@ -1771,29 +1771,29 @@ msgstr ""
 "nem használjuk a telepítés alatt."
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "A &debian; támogatása az alapvető grafikus felülethez az X.Org X11 "
-"rendszerében adott támogatástól függ. A legtöbb AGP, PCI, PCIe és PCI-X videó "
-"kártya működik X.Org alatt. A támogatott grafikus buszok, kártyák, monitorok "
-"és mutató eszközök részletei a <ulink url=\"&url-xorg;\"></ulink> címen "
-"találhatók. A &debian; &release; az X.Org &x11ver; változattal érkezik."
+"rendszerében adott támogatástól függ. A legtöbb AGP, PCI, PCIe és PCI-X "
+"videó kártya működik X.Org alatt. A támogatott grafikus buszok, kártyák, "
+"monitorok és mutató eszközök részletei a <ulink url=\"&url-xorg;\"></ulink> "
+"címen találhatók. A &debian; &release; az X.Org &x11ver; változattal érkezik."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1806,7 +1806,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1823,13 +1823,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Hálózati csatoló hardverek"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1844,7 +1844,7 @@ msgstr ""
 "<phrase arch=\"i386\">Több régi ISA kártya is támogatott.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1854,61 +1854,61 @@ msgstr ""
 "alábbi Sun NIC eszközöket:"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "A támogatott hálózati eszközök listája:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) és ESCON kapcsolat (valódi vagy emulált)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet és OSA-Express Fast Ethernet (nem-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express QDIO módban, HiperSockets és Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -1928,19 +1928,19 @@ msgstr ""
 "ezt."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Drótnélküli hálózati kártyák"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Wireless NICs are in general supported as well, with one big proviso. A "
@@ -1962,7 +1962,7 @@ msgstr ""
 "&debian-gnu; alatt, de a telepítőben nem támogatottak."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Wireless NICs are in general supported as well, with one big proviso. A "
@@ -1981,7 +1981,7 @@ msgstr ""
 "alatt, de a telepítőben nem támogatottak."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -1990,7 +1990,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If there is no other NIC you can use during the installation, it is still "
@@ -2009,7 +2009,7 @@ msgstr ""
 "eljárással, ami fent le van írva a firmware-t igénylő csatolók esetén."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2026,13 +2026,13 @@ msgstr ""
 "használata, mely lehetővé teszi egy Windows meghajtó használatát.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2040,13 +2040,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2058,7 +2058,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2068,7 +2068,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2080,13 +2080,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2096,13 +2096,13 @@ msgstr ""
 "rendszerekkel."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2114,13 +2114,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2134,13 +2134,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Perifériák és más hardverek"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2152,7 +2152,7 @@ msgstr ""
 "telepítéskor."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2162,7 +2162,7 @@ msgstr ""
 "kell egyéni beállítás (lásd a <xref linkend=\"hardware-issues\"/> részt)."
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2173,7 +2173,7 @@ msgstr ""
 "kompatibilitás HOGYAN</ulink> leírást a Linux által támogatott hardverről."
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2185,7 +2185,7 @@ msgstr ""
 "hálózatról NFS, HTTP vag FTP használatával elérhetőnek kell lennie."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2193,14 +2193,14 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, fuzzy, no-c-format
 #| msgid "Drivers Requiring Firmware"
 msgid "Devices Requiring Firmware"
 msgstr "Firmware-t igénylő meghajtók"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2212,7 +2212,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2224,7 +2224,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2236,13 +2236,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "GNU/&arch-kernel; szempontok hardver vásárlásakor"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2258,7 +2258,7 @@ msgstr ""
 "kapod."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2274,7 +2274,7 @@ msgstr ""
 "kifejezéssel találhatsz még erről sok információt."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2291,13 +2291,13 @@ msgstr ""
 "&arch-kernel;-alapút). Támogasd a &arch-kernel;-barát hardver-szállítókat."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Tulajdonkorlátos vagy zárt hardverek mellőzése"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2310,7 +2310,7 @@ msgstr ""
 "meghajtó &arch-kernel; forrásának közzétételét."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2325,13 +2325,13 @@ msgstr ""
 "hogy a szabad szoftver közösség egy fontos és egyre nagyobb piac."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Windows-specifikus hardver"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2355,7 +2355,7 @@ msgstr ""
 "lehet, mint a megfelelő, de beépített értelmet megtartó eszközök."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2390,7 +2390,7 @@ msgstr ""
 "beépített feldolgozó erején spórolnak."
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can help improve this situation by encouraging these manufacturers to "
@@ -2412,13 +2412,13 @@ msgstr ""
 "howto;\">Linux Hardver Kompatibilitás HOGYAN</ulink> leírásban."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "Telepítő média"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2428,20 +2428,20 @@ msgid ""
 "advantages and disadvantages of each media type. You may want to refer back "
 "to this page once you reach that section."
 msgstr ""
-"E szakasz leírja, milyen média típusokat használhatsz a &debian; telepítésére. "
-"Például, ha van egy flopi lemez meghajtód a gépen, telepíthető róla a "
-"&debian;. Van egy egész, médiára szánt fejezet, a <xref linkend=\"install-"
-"methods\"/>, mely leírja minden média típus előnyét és hátrányát. Amennyiben "
-"odaugrasz, vissza is térhetsz majd ide."
+"E szakasz leírja, milyen média típusokat használhatsz a &debian; "
+"telepítésére. Például, ha van egy flopi lemez meghajtód a gépen, telepíthető "
+"róla a &debian;. Van egy egész, médiára szánt fejezet, a <xref linkend="
+"\"install-methods\"/>, mely leírja minden média típus előnyét és hátrányát. "
+"Amennyiben odaugrasz, vissza is térhetsz majd ide."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "Flopik"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2453,19 +2453,19 @@ msgstr ""
 "hüvelykes flopi meghajtó kell."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "A CHRP-hez a flopi támogatás most nem működik."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2479,7 +2479,7 @@ msgstr ""
 "nem SCSI vagy IDE/ATAPI elvűek."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2498,7 +2498,7 @@ msgstr ""
 "megtörtént másképpen; lásd itt: <xref linkend=\"boot-installer\"/>."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2507,7 +2507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2517,13 +2517,13 @@ msgstr ""
 "eszközök szintén támogatottak."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, fuzzy, no-c-format
 #| msgid ""
 #| "On DECstations, booting from CD-ROM requires a SCSI CD-ROM drive capable "
@@ -2548,13 +2548,13 @@ msgstr ""
 "<quote>512</quote> helyzetre."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "Merevlemez"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2566,7 +2566,7 @@ msgstr ""
 "merevlemezre töltéséhez."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2576,13 +2576,13 @@ msgstr ""
 "indítást, telepíthetsz egy SunOS partícióról (UFS szeletek)."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB háttértároló"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2592,20 +2592,20 @@ msgid ""
 "This is also useful for small systems which have no room for unnecessary "
 "drives."
 msgstr ""
-"Sok &debian; gépnél csak a telepítésre vagy mentésre merülne fel flopi és/vagy "
-"CD-ROM meghajtók használata. Ha üzemeltetsz pár kiszolgálót, alighanem "
+"Sok &debian; gépnél csak a telepítésre vagy mentésre merülne fel flopi és/"
+"vagy CD-ROM meghajtók használata. Ha üzemeltetsz pár kiszolgálót, alighanem "
 "eszedbe fog jutni e meghajtók elhagyása és USB háttértároló használata a "
 "rendszer telepítésére és (ha szükséges) visszaállítására. Ez kis "
 "rendszereknél is hasznos, ahol nincs hely felesleges meghajtóknak."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "Hálózat"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2623,7 +2623,7 @@ msgstr ""
 "HTTP vagy FTP átvitellel. A telepítés után az ISDN és PPP is beállítható."
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2638,7 +2638,7 @@ msgstr ""
 "arch=\"mips\">Ez a fő telepítő mód &arch-title;.gépekhez.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2648,13 +2648,13 @@ msgstr ""
 "fájlrendszer NFS-csatolásával egy másik lehetőség."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x vagy GNU rendszer"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2670,13 +2670,13 @@ msgstr ""
 "részt."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Támogatott tárolók"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
@@ -2695,7 +2695,7 @@ msgstr ""
 "telepíthetőségét a legtöbb hardveren."
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Generally, the Debian installation system includes support for floppies, "
@@ -2714,7 +2714,7 @@ msgstr ""
 "mellett a FAT, Win-32 FAT bővítés (VFAT) és NTFS is támogatott."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2738,7 +2738,7 @@ msgstr ""
 "ulink> leírást további részletekért."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2761,7 +2761,7 @@ msgstr ""
 "leírást a Linux kernel által támogatott valamennyi SPARC hardverért."
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2772,7 +2772,7 @@ msgstr ""
 "jelenlegi Linux kernel nem támogatja a flopit CHRP rendszereken."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2783,7 +2783,7 @@ msgstr ""
 "jelenlegi Linux kernel nem támogatja a flopi meghajtót."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2792,7 +2792,7 @@ msgstr ""
 "Minden Linux kernel által támogatott tárolót támogatja az indító rendszer."
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2804,13 +2804,13 @@ msgstr ""
 "(cdl) támogatja az FBA-t és az ECKD DASD tárolókat."
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Memória és lemezterület szükséglet"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You must have at least &minimum-memory; of memory and &minimum-fs-size; "
@@ -2827,7 +2827,7 @@ msgstr ""
 "\"minimum-hardware-reqts\"/>."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2839,6 +2839,26 @@ msgid ""
 "is only advised for experienced users."
 msgstr ""
 
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "A támogatott S/390 és zSeries gépekről szóló teljes információ forrása az "
+#~ "IBM vörös könyv <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
+#~ "redbooks/sg246264.pdf\"> Linux az IBM eServer zSeries és S/390 gépekre: "
+#~ "Disztribúciók</ulink> 2.1 fejezet illetve a <ulink url=\"http://www-128."
+#~ "ibm.com/developerworks/linux/linux390/index.html\">zSeries oldal a "
+#~ "developerWorks lapon</ulink>. Röviden: a G5, Multiprise 3000, G6 és "
+#~ "minden zSeries teljesen támogatott; a Multiprise 2000, G3 és G4 gépek "
+#~ "csak IEEE lebegőpontos emulációval, ami csökkenti a teljesítményt."
+
 #~ msgid "DEC Alpha"
 #~ msgstr "DEC Alpha"
 
diff --git a/po/hu/install-methods.po b/po/hu/install-methods.po
index 0ecf2625f..ec5ef7eb4 100644
--- a/po/hu/install-methods.po
+++ b/po/hu/install-methods.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-18 18:13+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -49,8 +49,8 @@ msgstr ""
 "A &debian-gnu; legegyszerűbb telepítése a Hivatalos &debian; CD-ROM Készlet "
 "segítségével lehetséges. Ez boltban is megvásárolható (lásd a <ulink url="
 "\"&url-debian-cd-vendors;\">CD-forgalmazók oldalát</ulink>). A CD-ROM képek "
-"letölthetők egy &debian; tükörről is, így egy közepes hálózati kapcsolattal és "
-"egy CD-íróval a CD-ROM készlet egyénileg is elkészíthető."
+"letölthetők egy &debian; tükörről is, így egy közepes hálózati kapcsolattal "
+"és egy CD-íróval a CD-ROM készlet egyénileg is elkészíthető."
 
 #. Tag: para
 #: install-methods.xml:30
@@ -933,8 +933,8 @@ msgstr ""
 "\"x86\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/sda2</"
 "replaceable> /mnt</userinput>), melyen most <phrase arch=\"x86\">egy FAT "
 "fájlrendszer</phrase> <phrase arch=\"powerpc\">egy HFS fájlrendszer</phrase> "
-"van, és másolj rá egy &debian; netinst vagy businesscard ISO képet (lásd ezt: "
-"<xref linkend=\"usb-add-iso\"/>). Csatold le (<userinput>umount /mnt</"
+"van, és másolj rá egy &debian; netinst vagy businesscard ISO képet (lásd "
+"ezt: <xref linkend=\"usb-add-iso\"/>). Csatold le (<userinput>umount /mnt</"
 "userinput>) és kész."
 
 #. Tag: title
@@ -1131,7 +1131,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "A <filename>syslinux.cfg</filename> beállító fájl az alábbi 2 sort "
 "tartalmazza: <informalexample><screen>\n"
@@ -1468,7 +1468,7 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "Másold az alábbi fájlokat a &debian; archívumokból egy alkalmas helyre a "
@@ -2315,9 +2315,9 @@ msgid ""
 "removable media, and used to fill in answers to questions asked during the "
 "installation process."
 msgstr ""
-"A &debian; Telepítő támogatja az automata telepítéseket elő-beállító fájlokon "
-"át. Egy elő-beállító fájl a hálózatról vagy cserélhető médiáról tölthető le "
-"és a telepítő folyamat kérdéseinek megválaszolására használható."
+"A &debian; Telepítő támogatja az automata telepítéseket elő-beállító "
+"fájlokon át. Egy elő-beállító fájl a hálózatról vagy cserélhető médiáról "
+"tölthető le és a telepítő folyamat kérdéseinek megválaszolására használható."
 
 #. Tag: para
 #: install-methods.xml:1611
diff --git a/po/hu/preparing.po b/po/hu/preparing.po
index 8399be440..a8ff42d64 100644
--- a/po/hu/preparing.po
+++ b/po/hu/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-18 16:25+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -49,9 +49,9 @@ msgid ""
 "that will require a complete re-installation of your system is very rare; "
 "perhaps mechanical failure of the hard disk would be the most common case."
 msgstr ""
-"Először csak egy megjegyzés az újratelepítésről. A &debian; esetében az olyan "
-"körülmény, mely újratelepítést igényelne rendkívül ritka; talán a merevlemez "
-"mechanikai hibája a leggyakrabb eset."
+"Először csak egy megjegyzés az újratelepítésről. A &debian; esetében az "
+"olyan körülmény, mely újratelepítést igényelne rendkívül ritka; talán a "
+"merevlemez mechanikai hibája a leggyakrabb eset."
 
 #. Tag: para
 #: preparing.xml:27
@@ -84,8 +84,8 @@ msgstr ""
 "A &debian-gnu; esetében a rendszer szinte mindig javítható, ha valami "
 "tönkremegy. A frissítések sohasem igényelnek teljes újratelepítést. A "
 "programok szinte mindig kompatibilisek a rendszer új kiadásaival. Ha egy "
-"program új változata újabb támogató szoftvereket igényel, a &debian; csomagoló "
-"rendszer biztosítja az összes szükséges szoftver azonosítását és "
+"program új változata újabb támogató szoftvereket igényel, a &debian; "
+"csomagoló rendszer biztosítja az összes szükséges szoftver azonosítását és "
 "telepítését. A fő cél az újratelepítés elkerülése, ezért erre mindig végső "
 "lehetőségként gondolj. A telepítőnek <emphasis>nem</emphasis> célja egy "
 "létező rendszerre való újratelepítés."
@@ -122,7 +122,8 @@ msgstr ""
 #: preparing.xml:68
 #, no-c-format
 msgid "Create partitionable space for &debian; on your hard disk."
-msgstr "Hozz létre particionálható területet a &debian; számára a merevlemezen."
+msgstr ""
+"Hozz létre particionálható területet a &debian; számára a merevlemezen."
 
 #. Tag: para
 #: preparing.xml:73
@@ -399,9 +400,9 @@ msgid ""
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
-"E dokumentum, mely a &debian; &releasename; kiadás Telepítő Útmutató hivatalos "
-"változata <ulink url=\"&url-release-area;/installmanual\">különböző "
-"formátumok és fordítások</ulink> hivatkozásain mindig elérhető."
+"E dokumentum, mely a &debian; &releasename; kiadás Telepítő Útmutató "
+"hivatalos változata <ulink url=\"&url-release-area;/installmanual"
+"\">különböző formátumok és fordítások</ulink> hivatkozásain mindig elérhető."
 
 #. Tag: para
 #: preparing.xml:261
@@ -457,20 +458,18 @@ msgstr "&arch-title; Hardver referenciák"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Telepítési utasítások és eszköz-meghajtók (DASD, XPRAM, Konzol, szalag, z90 "
-"crypto, chandev, hálózat) Linuxra &arch-title; architektúrán 2.4 kernellel."
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Eszköz-meghajtók és telepítő parancsok"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -480,13 +479,13 @@ msgstr ""
 "hardveren."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux &arch-title; architektúrára"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
@@ -498,19 +497,19 @@ msgstr ""
 "title; terjesztésen."
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux IBM eServer zSeries és &arch-title; architektúrára: Terjesztések"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Hardver-adatok forrásai"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -521,19 +520,19 @@ msgstr ""
 "hardverrel való megismerkedést a telepítés előtt."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "A hardver-adatok beszerzési helyei:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "Az egyes hardverekkel adott kézikönyvek."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -545,19 +544,19 @@ msgstr ""
 "gyakran a <keycap>Delete</keycap> billentyű (a gép sokszor kiírja)."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "Az egyes hardverek csomagolásai és dobozai."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "A rendszer ablak az esetleges windows vezérlőpultban."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -569,7 +568,7 @@ msgstr ""
 "adatokhoz."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -579,175 +578,175 @@ msgstr ""
 "hálózati és email beállításokat."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Egy telepítéshez szükséges hardver adatok"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "Hardver"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "A sokszor szükséges adatok"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "Merevlemezek"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "Számuk."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "Sorrendjük a rendszeren."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "Elérhető szabad hely."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "Partíciók."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "A más rendszereket tartalmazó partíciók."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "Monitor"
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "Modell és gyártó"
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "Támogatott felbontások."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Vízszintes frissítés."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Függőleges frissítés."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Támogatott színmélység (színek száma)."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "Képernyő méret."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "Egér"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Típus: soros, PS/2, vagy USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "Port."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "Gyártó."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "Gombok száma."
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "Hálózat"
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "Adapter típusa."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "Nyomtató"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Támogatott nyomtatási felbontások."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "Videó kártya"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "Elérhető videó RAM."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -757,37 +756,37 @@ msgstr ""
 "össze kell vetni)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "Eszközszám(ok)."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "Eszközszámok."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "Relatív adapter szám OSA kártyákhoz."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Hardver kompatibilitás"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -800,7 +799,7 @@ msgstr ""
 "operációs rendszer, mely még több hardvert támogat."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -810,7 +809,7 @@ msgstr ""
 "egy aktuális Windows-verzió futását."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -823,7 +822,7 @@ msgstr ""
 "ezért hamar elavulnak."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -833,19 +832,19 @@ msgstr ""
 "nyomtatók és hasonlók is ide tartoznak."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "A kompatibilitás ellenőrzése:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "A gyártó weblapján új meghajtók ellenőrzése."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -855,7 +854,7 @@ msgstr ""
 "ismertebbek meghajtóit vagy beállításait használják."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -865,19 +864,19 @@ msgstr ""
 "listáinak ellenőrzése."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "Más felhasználók tapasztalatai az Interneten."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "Hálózati beállítások"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -888,31 +887,31 @@ msgstr ""
 "&mdash; nem PPP), a hálózati rendszergazda megadja."
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "Gépnév (általában önállóan megadható)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "Tartomány (domain) név"
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "A gép IP címe."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "Az adott hálózat hálózati maszkja."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -922,7 +921,7 @@ msgstr ""
 "<emphasis>van</emphasis> átjárója."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -931,7 +930,7 @@ msgstr ""
 "A hálózaton DNS (Domain Name Service) kiszolgálóként használható rendszer."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -944,31 +943,31 @@ msgstr ""
 "átadja ezeket a gépnek a telepítő folyamat során."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Drótnélküli hálózat esetén ezek is kellenek:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "A drótnélküli hálózathoz tartozó ESSID."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEP biztonsági kulcs (ha alkalmazható)"
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Szükséges hardverkövetelmények"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -979,7 +978,7 @@ msgstr ""
 "telepítési módnak."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -991,109 +990,116 @@ msgstr ""
 "javaslatokra."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "Egy 1/2-1GHz rendszer ajánlott egy asztali rendszerhez."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr "Bármilyen OldWorld vagy NewWorld PowerPC jó asztali rendszernek."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Ajánlott legkisebb hardverkövetelmények"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "Telepítő típus"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (minimális)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (ajánlott)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "Merevlemez"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "Asztal nélkül"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 megabájt"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 megabájt"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 gigabájt"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "Asztallal"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 megabájt"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 megabájt"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, fuzzy, no-c-format
 msgid "5 gigabytes"
 msgstr "5 gigabájt"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "A tényleges legkisebb memória sokkal kevesebb, mint e táblázat számai. "
 "Architektúrától függően a &debian; telepítése minden funkcióval együtt is "
-"lehetséges 20MB (s390) és 60MB (amd64) között is. A lemezre is ez "
-"áll különös tekintettel a választott alkalmazásokra; lásd a <xref linkend="
+"lehetséges 20MB (s390) és 60MB (amd64) között is. A lemezre is ez áll "
+"különös tekintettel a választott alkalmazásokra; lásd a <xref linkend="
 "\"tasksel-size-list\"/> részt további adatokért erről."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1110,7 +1116,7 @@ msgstr ""
 "classname> vagy <classname>wmaker</classname> mellett vannak még mások is."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1121,7 +1127,7 @@ msgstr ""
 "igényt, mert ez nagyban attól függ, mire használjuk a kiszolgálót."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1133,7 +1139,7 @@ msgstr ""
 "számára adott hellyel."
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1148,21 +1154,21 @@ msgid ""
 msgstr ""
 "A &debian-gnu; rendszer alapjainak sima használatához szükséges helyet "
 "szintén beszámítottuk ezekbe az ajánlott rendszer-követelményekbe. Főleg a "
-"<filename>/var</filename> tartalmaz sok állapot adatot a &debian; rendszerről "
-"szabványos napló fájljaival együtt. A <command>dpkg</command> fájlok (a "
-"telepített csomagok adataival) könnyen elérhetik a 40 MB méretet. Az "
-"<command>apt-get</command> is ide teszi a letöltött fájlokat telepítés "
+"<filename>/var</filename> tartalmaz sok állapot adatot a &debian; "
+"rendszerről szabványos napló fájljaival együtt. A <command>dpkg</command> "
+"fájlok (a telepített csomagok adataival) könnyen elérhetik a 40 MB méretet. "
+"Az <command>apt-get</command> is ide teszi a letöltött fájlokat telepítés "
 "előtt. Általában legalább 200 MB helyet számíts a <filename>/var</filename> "
 "számára és többet grafikus asztali környezet telepítése esetén."
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Több-rendszeres gép elő-particionálása"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1175,7 +1181,7 @@ msgstr ""
 "szobában nincs hatással a másik szobára."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1187,39 +1193,40 @@ msgstr ""
 "gépeket is jelenti ez esetben."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Debian on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Unix systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
+#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> and want to stick Debian on the same disk, "
+#| "you will need to repartition the disk. Debian requires its own hard disk "
+#| "partitions. It cannot be installed on Windows or MacOS partitions. It may "
+#| "be able to share some partitions with other Unix systems, but that's not "
+#| "covered here. At the very least you will need a dedicated partition for "
+#| "the Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "Ha már van egy másik rendszered is a gépen <phrase arch=\"x86\"> (OpenBSD, "
 "NetBSD, FreeBSD, Solaris, MacOS, OS/2, Windows 9x/NT/2000/XP/2003/"
-"Vista/7&hellip;)</phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) "
-"</phrase> és arra a lemezre akarod tenni a &debian; rendszert is, szükség "
-"lehet a lemez újraparticionálására. A &debian; önálló partíciókat igényel. A "
-"Windows vagy MacOS partíciótól külön kell választani, ha ezeket "
+"Vista/7&hellip;)</phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> és arra a lemezre akarod tenni a &debian; rendszert is, "
+"szükség lehet a lemez újraparticionálására. A &debian; önálló partíciókat "
+"igényel. A Windows vagy MacOS partíciótól külön kell választani, ha ezeket "
 "megtartanánk. Képes megosztani partíciókat egyéb Unix rendszerekkel, de ezt "
 "itt nem írjuk. Legalább a &debian; gyökér számára önálló partíciót kell adni."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can find information about your current partition setup by using a "
@@ -1244,7 +1251,7 @@ msgstr ""
 "partíciók módosítás nélkül."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1259,13 +1266,13 @@ msgstr ""
 "így biztosan nem sérülnek."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: mi van a HP-UX lemezekkel?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your computer has more than one hard disk, you may want to dedicate "
@@ -1283,7 +1290,7 @@ msgstr ""
 
 # FIXME !
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1306,7 +1313,7 @@ msgstr ""
 "ugyanazt a merevlemezt particionáljuk, ez sokszor törli az indító fájlokat."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
@@ -1317,14 +1324,14 @@ msgid ""
 "force you to partition before installing anyway."
 msgstr ""
 "Ha a gépen már több partíció van és elég hely biztosítható egy vagy több "
-"partíció törlésével vagy áthelyezésével, akkor is rögtön indítható a &debian; "
-"telepítő, melyre lehet számítani a particionáláskor. Érdemes lehet elolvasni "
-"az alábbiakat, melyben vannak különleges esetek, például a létező partíciós "
-"tábla partícióinak sorrendje, mely egyes esetekben a telepítés előtti "
-"particionálásra késztet."
+"partíció törlésével vagy áthelyezésével, akkor is rögtön indítható a "
+"&debian; telepítő, melyre lehet számítani a particionáláskor. Érdemes lehet "
+"elolvasni az alábbiakat, melyben vannak különleges esetek, például a létező "
+"partíciós tábla partícióinak sorrendje, mely egyes esetekben a telepítés "
+"előtti particionálásra késztet."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1335,7 +1342,7 @@ msgstr ""
 "használ, a &debian; telepítő particionálója ezeket képes átméretezni."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
@@ -1347,16 +1354,16 @@ msgid ""
 "you should just create the native operating system's partitions you will "
 "want to retain."
 msgstr ""
-"Ha a fentiek egyike sem igaz, a telepítés előtt particionálni kell a &debian; "
-"számára szükséges hely létrehozásához. Ha egyes partíciókat később majd más "
-"rendszerek fogják használni, azok saját particionáló programjaival is létre "
-"lehet majd hozni. Egyes particionáló programok hibái miatt ajánljuk, "
-"<emphasis>ne</emphasis> más rendszerek particionáló programjaival hozd létre "
-"a &debian-gnu; partícióit. Legfeljebb azok saját partícióit hozd majd létre "
-"azokkal."
+"Ha a fentiek egyike sem igaz, a telepítés előtt particionálni kell a "
+"&debian; számára szükséges hely létrehozásához. Ha egyes partíciókat később "
+"majd más rendszerek fogják használni, azok saját particionáló programjaival "
+"is létre lehet majd hozni. Egyes particionáló programok hibái miatt "
+"ajánljuk, <emphasis>ne</emphasis> más rendszerek particionáló programjaival "
+"hozd létre a &debian-gnu; partícióit. Legfeljebb azok saját partícióit hozd "
+"majd létre azokkal."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are going to install more than one operating system on the same "
@@ -1378,7 +1385,7 @@ msgstr ""
 "saját partícióik újraformázására köteleznek."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1388,7 +1395,7 @@ msgstr ""
 "telepítése átmenetileg megspórol egy kis tanulást."
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
@@ -1419,7 +1426,7 @@ msgstr ""
 "tényleges telepítéskor végleges &arch-parttype; partíciókra cserélhető."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you currently have one hard disk with one partition (a common setup "
@@ -1434,13 +1441,13 @@ msgstr ""
 "&debian; mellé más rendszert is akarsz, a lépések legegyszerűbb sora:"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Mentsd el a gépről a legfontosabb adataidat."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1454,7 +1461,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1465,13 +1472,13 @@ msgstr ""
 "&debian-gnu; számára."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "Telepítsd az adott rendszert új partíciójára."
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
@@ -1481,19 +1488,19 @@ msgstr ""
 "indító fájlokat."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "Indítsd a &debian; telepítőt és futtasd le a &debian; telepítését."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Particionálás DOS-ban vagy Windowsból"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
@@ -1507,7 +1514,7 @@ msgstr ""
 "eszközök sokkal jobb munkát végeznek."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1521,31 +1528,31 @@ msgstr ""
 "Ha nagy IDE lemezed van, és nem használsz sem LBA címzést, sem átfedő "
 "meghajtókat (a merevlemez-gyártók gyakran mellékelik) sem új (1998 utáni) "
 "BIOS-t, mely támogatja a nagy lemezekhez való hozzáférési bővítéseket, akkor "
-"ennek megfelelően kell megadni a &debian; indító partíciót. Ebben az esetben a "
-"merevlemez első 1024 cilinderére kell tenni (BIOS általi módosítás nélkül "
+"ennek megfelelően kell megadni a &debian; indító partíciót. Ebben az esetben "
+"a merevlemez első 1024 cilinderére kell tenni (BIOS általi módosítás nélkül "
 "körülbelül 524 MB). Ez a létező FAT vagy NTFS partíció áthelyezését "
 "igényelheti."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr ""
 "Veszteségmentes újraparticionálás DOS-ból, Win-32-ből vagy OS/2-ből indítva"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "Az egyik legnépszerűbb telepítés egy olyan gépre telepíteni, melyen már van "
 "egy DOS (+ netán Windows 3.1), Win32 (mondjuk 95, 98, Me, NT, 2000, XP, "
@@ -1558,7 +1565,7 @@ msgstr ""
 "alább leírt módra."
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
@@ -1575,7 +1582,7 @@ msgstr ""
 "felhasználására, például cserehelyként és fájlrendszerként."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1592,19 +1599,28 @@ msgstr ""
 "legnagyobb új partíciót létrehozni."
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
-msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+#: preparing.xml:983
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The first thing needed is a copy of <command>fips</command> which is "
+#| "available in the <filename>tools/</filename> directory on your nearest "
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
+#| "filename> to a bootable floppy. A bootable floppy can be created using "
+#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
+#| "command> comes with very good documentation which you may want to read. "
+#| "You will definitely need to read the documentation if you use a disk "
+#| "compression driver or a disk manager. Create the disk and read the "
+#| "documentation <emphasis>before</emphasis> you defragment the disk."
+msgid ""
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "Először szükség lesz egy <command>fips</command> programra, mely elérhető a "
 "legközelebbi &debian; tükör <filename>tools/</filename> könyvtárából. "
@@ -1618,7 +1634,7 @@ msgstr ""
 "mentesíted a lemezt."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1636,7 +1652,7 @@ msgstr ""
 "DOS nem érti a VFAT-ot, mely hosszú fájlneveket támogat e rendszereken."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1648,7 +1664,7 @@ msgstr ""
 "van. Gépeld be ezt: <filename>a:\\fips</filename> és kövesd az utasításokat."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1658,13 +1674,13 @@ msgstr ""
 "command> nem válna be."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Particionálás DOS számára"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1679,7 +1695,7 @@ msgstr ""
 "gondok, vagy fura hibák jelentkeztek DOS-ban vagy Windowsban."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1692,19 +1708,19 @@ msgstr ""
 "az alábbi paranccsal &debian;:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Particionálás SunOS alól"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
@@ -1721,13 +1737,13 @@ msgstr ""
 "partíciókról."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1742,7 +1758,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1752,13 +1768,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1769,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1778,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1794,7 +1810,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1806,13 +1822,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Telepítés-előtti hardver és operációs rendszer beállítás"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1831,13 +1847,13 @@ msgstr ""
 "gondokat is hangsúlyozzuk."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "A BIOS beállító menü behívása"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
@@ -1855,7 +1871,7 @@ msgstr ""
 "vagy lehetetlenné válik a &debian; telepítése."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1869,25 +1885,25 @@ msgstr ""
 "attól függ, ki írta az adott BIOS szoftvert:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "<keycap>Delete</keycap> a POST alatt (bekapcsolás utáni ön-teszt)"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1897,25 +1913,25 @@ msgstr ""
 "keycombo> vagy <keycap>Delete</keycap> a POST alatt"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "<keycap>Esc</keycap> a POST alatt"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -1927,13 +1943,13 @@ msgstr ""
 "keycap><keycap>Delete</keycap> </keycombo> után"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1945,7 +1961,7 @@ msgstr ""
 "keycap><keycap>S</keycap> </keycombo> vagy <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -1955,7 +1971,7 @@ msgstr ""
 "info;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -1970,13 +1986,13 @@ msgstr ""
 "program kell. Próbálkozhatsz itt: <ulink url=\"&url-simtel;\"></ulink>."
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Indító eszköz választás"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
@@ -1997,7 +2013,7 @@ msgstr ""
 "legnépszerűbb eszközei."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2009,7 +2025,7 @@ msgstr ""
 "részén."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2025,7 +2041,7 @@ msgstr ""
 "USB eszközről indításhoz."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2036,13 +2052,13 @@ msgstr ""
 "majd úgy beállítani, hogy rögtön a merevlemezről induljon."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Indító sorrend cseréje IDE gépeken"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2054,7 +2070,7 @@ msgstr ""
 "természetesen nézd meg az alaplap füzetében."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2064,19 +2080,19 @@ msgstr ""
 "függő, de megtalálod a meghajtókat soroló mezőt."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "Sok buta IDE gépben van C, A, cdrom vagy A, C, cdrom bejegyzés."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "E buta gépekben a C egy merevlemez, az A egy flopi meghajtó."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2088,7 +2104,7 @@ msgstr ""
 "a lehetséges választások közt."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2096,20 +2112,20 @@ msgid ""
 msgstr "Mentsd módosításaid. A képernyő utasításai megmondják, hogyan."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Indító sorrend módosítása SCSI gépeken"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr "A gép indulása után, üsd le a SCSI beállításba lépő billentyűt."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2119,7 +2135,7 @@ msgstr ""
 "megjelent a BIOS segéd-program indítása módjának üzenete."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2131,13 +2147,13 @@ msgstr ""
 "el a hardver leírását a pontos adatokért."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Keresd meg az indító sorrend beállítást."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2145,7 +2161,7 @@ msgstr ""
 "Állítsd be, hogy a CD meghajtó SCSI azonosítója legyen az 1. a listában."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2155,19 +2171,19 @@ msgstr ""
 "az <keycap>F10</keycap> billentyűvel."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Egyéb BIOS beállítások"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "CD-ROM beállítások"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2180,13 +2196,13 @@ msgstr ""
 "failed</userinput> üzenet jön, akkor jó ez."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Kiterjesztett vagy kibővített memória"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2200,13 +2216,13 @@ msgstr ""
 "memória területet mellőzi."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Virus Protection"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2229,13 +2245,13 @@ msgstr ""
 "footnote>."
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Shadow RAM"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2259,13 +2275,13 @@ msgstr ""
 "hardver eszközök &arch-kernel; elérésével."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Memory Hole"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2277,7 +2293,7 @@ msgstr ""
 "ennyi."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2296,13 +2312,13 @@ msgstr ""
 "lényeg, hogy működik így, e nélkül nem."
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Advanced Power Management"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2316,13 +2332,13 @@ msgstr ""
 "és a merevlemez leállító időzítőt. A &arch-kernel; jobban kezeli e módokat."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2333,7 +2349,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2345,7 +2361,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2360,7 +2376,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2374,13 +2390,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2391,7 +2407,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2404,7 +2420,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2414,7 +2430,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2427,7 +2443,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2451,7 +2467,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2469,19 +2485,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS beállítás"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2503,7 +2519,7 @@ msgstr ""
 "karakter-alapú."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2521,7 +2537,7 @@ msgstr ""
 "kártya olvasója vagy egy LPAR HMC része, ha a HMC és e lehetőség elérhető."
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2544,13 +2560,13 @@ msgstr ""
 "telepítő lépésekhez."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Natív és LPAR telepítés"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2566,13 +2582,13 @@ msgstr ""
 "beállításához Linuxra."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Telepítés VM ügyfélként"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2588,26 +2604,34 @@ msgstr ""
 "ügyfél beállításához Linux futtatására."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "A <filename>generic</filename> könyvtárban lévő fájlokat a CMS lemezre kell "
 "másolni. A <filename>kernel.debian</filename> és <filename>initrd.debian</"
 "filename> átvitele rögzített 80-karakteres bináris módban történjen."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Egy telepítő kiszolgáló beállítása"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2621,7 +2645,7 @@ msgstr ""
 "vagy FTP módon."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2634,25 +2658,25 @@ msgstr ""
 "odamásolható."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: több adat kell &mdash; egy Vörös könyvből?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Kivédendő hardver gondok"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS támogatás és billentyűzetek"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2672,13 +2696,13 @@ msgstr ""
 "támogatás</quote> opcióit."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Kijelző-láthatóság régi Powermaceken"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2698,6 +2722,17 @@ msgstr ""
 "kijelző beállításokat MacOS alatt 256 színre <quote>ezrek</quote> vagy "
 "<quote>milliók</quote> helyett."
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Telepítési utasítások és eszköz-meghajtók (DASD, XPRAM, Konzol, szalag, "
+#~ "z90 crypto, chandev, hálózat) Linuxra &arch-title; architektúrán 2.4 "
+#~ "kernellel."
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Eszköz-meghajtók és telepítő parancsok"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha GYIK"
 
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index 32062e60d..e34a2e160 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-18 19:17+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -1027,9 +1027,9 @@ msgid ""
 "automate &debian; installs should only be done with care."
 msgstr ""
 "A DHCP előírás egy jó módja csak a hálózatra vonatkozó értékek előírása, "
-"mind például a &debian; tükör. Így a hálózat automatikusan egy jó tükröt kap, "
-"emellett a telepítés interaktívan végezhető. A &debian; telepítés teljes "
-"automatizálását DHCP előírással figyelmesen kell végezni."
+"mind például a &debian; tükör. Így a hálózat automatikusan egy jó tükröt "
+"kap, emellett a telepítés interaktívan végezhető. A &debian; telepítés "
+"teljes automatizálását DHCP előírással figyelmesen kell végezni."
 
 #. Tag: title
 #: preseed.xml:571
@@ -1947,9 +1947,7 @@ msgstr "Particionálás RAID használatával"
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
 msgstr ""
 "Az előírás szoftver RAID partíciók beállítására is használható. A támogatott "
 "RAID szintek: 0, 1 és 5, csökkentett tömbök és tartalék eszközök. RAID 1 "
@@ -1957,7 +1955,25 @@ msgstr ""
 "itt: <xref linkend=\"preseed-bootloader\"/>."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1 and 5, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgstr ""
+"Az előírás szoftver RAID partíciók beállítására is használható. A támogatott "
+"RAID szintek: 0, 1 és 5, csökkentett tömbök és tartalék eszközök. RAID 1 "
+"esetén előírható a grub telepítése minden a tömbben használt eszközre; lásd "
+"itt: <xref linkend=\"preseed-bootloader\"/>."
+
+#. Tag: para
+#: preseed.xml:905
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This type of automated partitioning is easy to get wrong. It is also a "
@@ -1979,7 +1995,7 @@ msgstr ""
 "filename> fájlt."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# NOTE: this option is of beta release quality and should be used "
@@ -2131,13 +2147,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2149,7 +2165,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2157,7 +2173,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2168,7 +2184,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2180,13 +2196,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "Az Alaprendszer telepítése"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2197,7 +2213,7 @@ msgstr ""
 "telepítéséhez vannak kérdések."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, fuzzy, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2218,13 +2234,13 @@ msgstr ""
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "Fiók beállítások"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2236,7 +2252,7 @@ msgstr ""
 "emphasis> kódok."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2251,7 +2267,7 @@ msgstr ""
 "elkövetett nyers erejű támadást."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, fuzzy, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2303,7 +2319,7 @@ msgstr ""
 "#d-i passwd/user-password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2322,26 +2338,26 @@ msgstr ""
 "command>)."
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tmagam\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "Az APT beállítása"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2354,7 +2370,7 @@ msgstr ""
 "válaszoktól függően. További (úgynevezett helyi) tárak is megadhatók."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, fuzzy, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2410,13 +2426,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "Csomag választás"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2424,73 +2440,73 @@ msgid ""
 msgstr "Az elérhető feladatok bármely kombinációja használható. Például:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "szabvány"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "asztal"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-kiszolgáló"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "nyomtató-kiszolgáló"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-kiszolgáló"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "fájl-kiszolgáló"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "levél-kiszolgáló"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-adatbázis"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2502,7 +2518,7 @@ msgstr ""
 "<userinput>szabvány</userinput> feladatot."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2517,7 +2533,7 @@ msgstr ""
 "listája, mely lehetővé teszi, hogy a kernelnek is könnyen átadható legyen."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, fuzzy, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2551,13 +2567,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Boot betöltő telepítés"
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1087
 #, fuzzy, no-c-format
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
@@ -2593,6 +2609,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2627,7 +2645,7 @@ msgstr ""
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2636,13 +2654,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, fuzzy, no-c-format
 msgid "Finishing up the installation"
 msgstr "A telepítés első szakaszának vége"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, fuzzy, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2671,13 +2689,13 @@ msgstr ""
 "#d-i cdrom-detect/eject boolean false"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Más csomagok előírása"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2697,19 +2715,19 @@ msgstr ""
 "#   debconf-get-selections >> fájl"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "Haladó lehetőségek"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Egyéni parancs futtatása telepítéskor"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2719,7 +2737,7 @@ msgstr ""
 "szkriptek futtatása a telepítés egyes pontjain."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# d-i preseeding is inherently not secure. Nothing in the installer "
@@ -2787,13 +2805,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "Előírás használata alap értékek módosítására"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, fuzzy, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2824,7 +2842,7 @@ msgstr ""
 "quote> paraméterekre nem."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2834,7 +2852,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, fuzzy, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2864,13 +2882,13 @@ msgstr ""
 "quote> paraméterekre nem."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Előíró fájlok lánc-betöltése"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2885,7 +2903,7 @@ msgstr ""
 "fájlba és pontosabb beállításokat egyes konfigurációkhoz más fájlokba."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, fuzzy, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2936,7 +2954,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/hu/random-bits.po b/po/hu/random-bits.po
index ceb432a61..697267677 100644
--- a/po/hu/random-bits.po
+++ b/po/hu/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-17 10:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -827,8 +827,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS kiszolgáló"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -843,13 +871,13 @@ msgstr ""
 "legalább 100MB méretet érdemes rá számolni."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "A &debian-gnu; telepítése egy Unix/Linux rendszerből"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -872,7 +900,7 @@ msgstr ""
 "kiadott parancsot jelöli."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -881,13 +909,13 @@ msgid ""
 "also a clever way for dealing with hardware that otherwise doesn't play "
 "friendly with various boot or installation media."
 msgstr ""
-"A &debian; telepítés végeztével átviheted rá létező felhasználói adataidat (ha "
-"vannak), és folyamatosan életben tarthatod. Ezért ez egy <quote>zéró "
+"A &debian; telepítés végeztével átviheted rá létező felhasználói adataidat "
+"(ha vannak), és folyamatosan életben tarthatod. Ezért ez egy <quote>zéró "
 "leállású</quote> &debian-gnu; telepítés. A különböző indító vagy telepítő "
 "médiával nem baráti hardverekkel is el lehet így bánni."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -901,13 +929,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "Kezdés"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -923,7 +951,7 @@ msgstr ""
 "mint például a GNOME vagy KDE, akkor jelentősen több)."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -941,7 +969,7 @@ msgstr ""
 "j</userinput> opciót."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -965,7 +993,7 @@ msgstr ""
 "alább hivatkozunk rá."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -975,7 +1003,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -986,13 +1014,13 @@ msgstr ""
 "hoznod és csatolnod a könyvtárakat a következők előtt."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "A <command>debootstrap</command> telepítése"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -1016,7 +1044,7 @@ msgstr ""
 "és telepítsd a <command>debootstrap</command> programot."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -1042,7 +1070,7 @@ msgstr ""
 "telepítéséhez."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1054,13 +1082,13 @@ msgstr ""
 "# zcat /a-munka-útvonala/munka/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Futtasd a <command>debootstrap</command> programot"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -1076,7 +1104,7 @@ msgstr ""
 "\"></ulink>."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1088,7 +1116,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Substitute one of the following for <replaceable>ARCH</replaceable> in "
@@ -1117,7 +1145,7 @@ msgstr ""
 "<userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1127,13 +1155,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Az alaprendszer beálíltása"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1146,23 +1174,23 @@ msgstr ""
 "lemezen. A <command>chroot</command> segítségével válts ebbe gyökeret: "
 "<informalexample><screen>\n"
 "# LANG=C chroot /mnt/debinst /bin/bash\n"
-"</screen></informalexample> Ezután be kell állítanod egy &debian; rendszerrel "
-"kompatibilis terminál definíciót, például:"
+"</screen></informalexample> Ezután be kell állítanod egy &debian; "
+"rendszerrel kompatibilis terminál definíciót, például:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1175,19 +1203,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1195,14 +1223,14 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1211,13 +1239,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Partíciók csatolása"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You need to create <filename>/etc/fstab</filename>. "
@@ -1340,13 +1368,13 @@ msgstr ""
 "folytatás előtt:"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1357,19 +1385,19 @@ msgstr ""
 "kell csatolnod:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Időzóna beállítása"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1382,7 +1410,7 @@ msgstr ""
 "alábbi paranccsal ez és az időzóna beállítható."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1392,13 +1420,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "Hálózat beállítása"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To configure networking, edit <filename>/etc/network/interfaces</"
@@ -1580,13 +1608,13 @@ msgstr ""
 "eth1 és így tovább)."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Az APT beállítása"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, fuzzy, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1612,13 +1640,13 @@ msgstr ""
 "userinput> parancsot a forrás-lista fájl módosítása után."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Honosítás és billentyűzet beállítása"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1637,7 +1665,7 @@ msgstr ""
 "</screen></informalexample> Állítsd be a billentyűzetet (ha szükséges):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1647,7 +1675,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1657,13 +1685,13 @@ msgstr ""
 "újraindítás után igen."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Kernel telepítése"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you intend to boot this system, you probably want a Linux kernel and a "
@@ -1676,19 +1704,19 @@ msgstr ""
 "elérhető elő-csomagolt kernelek:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1696,13 +1724,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "A boot betöltő beállítása"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1716,7 +1744,7 @@ msgstr ""
 "<command>aptitude</command> használható a &debian; chroot környezetben erre."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1748,7 +1776,7 @@ msgstr ""
 "rendszer <filename>lilo.conf</filename> fájlját használja)."
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1771,7 +1799,7 @@ msgstr ""
 "készít egy működő <filename>/boot/grub/menu.lst</filename> fájlt."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1780,13 +1808,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Itt egy alap <filename>/etc/lilo.conf</filename> példaként:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, fuzzy, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1807,7 +1835,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1826,7 +1854,7 @@ msgstr ""
 "fájlját használja)."
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1856,13 +1884,13 @@ msgstr ""
 "használata kell a <userinput>hd:</userinput> helyett."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Végső lépések"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1881,7 +1909,7 @@ msgstr ""
 "használható az egyes csomagok telepítésére."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1893,19 +1921,19 @@ msgstr ""
 "hely például így:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "A &debian-gnu; telepítése Parallel Line IP (PLIP) felett"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1920,7 +1948,7 @@ msgstr ""
 "elérő hálózaton van (például Interneten)."
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1935,7 +1963,7 @@ msgstr ""
 "(természetesen, ha ezeket használjuk, más ne használja a hálózaton)."
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1946,7 +1974,7 @@ msgstr ""
 "után is elérhető (lásd: <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1959,13 +1987,13 @@ msgstr ""
 "<literal>io=0x378</literal>, <literal>irq=7</literal>."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "Követelmények"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1975,13 +2003,13 @@ msgstr ""
 "rendszert most telepítjük."
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "Rendszer telepítő média; lásd: <xref linkend=\"installation-media\"/>."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1991,7 +2019,7 @@ msgstr ""
 "emphasis>, mely az átjárót adja majd."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -2003,13 +2031,13 @@ msgstr ""
 "készítésének módjáról."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "Forrás beállítása"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -2019,7 +2047,7 @@ msgstr ""
 "állítására az Internetre a ppp0 által."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -2061,13 +2089,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "A cél telepítése"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2093,13 +2121,13 @@ msgstr ""
 "válaszok."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Telepítő összetevők betöltése CD-lemezről"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2109,13 +2137,13 @@ msgstr ""
 "meghajtók elérhetőek lesznek a telepítő rendszer számára."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Hálózati hardver érzékelése"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2129,7 +2157,7 @@ msgstr ""
 "hálózati kártya, a telepítő nem adja e listát."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2141,26 +2169,26 @@ msgstr ""
 "modult."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "Hálózat beállítása"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Hálózat automata-beállítása DHCP segítségével: Nem"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 msgstr "IP cím: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2169,7 +2197,7 @@ msgstr ""
 "Pont-pont cím: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2179,13 +2207,13 @@ msgstr ""
 "<filename>/etc/resolv.conf</filename> fájlt)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "A &debian-gnu; telepítése PPP over Ethernet (PPPoE) használatával"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2200,7 +2228,7 @@ msgstr ""
 "telepítő, de nagyon könnyen használatba vehető. E szakasz leírja: hogyan."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2211,7 +2239,7 @@ msgstr ""
 "újraindítása után is elérhető (lásd: <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2224,7 +2252,7 @@ msgstr ""
 "netboot<phrase condition=\"supports-floppy-boot\"> vagy floppy</phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2233,7 +2261,7 @@ msgstr ""
 "A PPPoE és más telepítések szinte egyeznek. Az alábbi lépések a különbségek."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Boot the installer with <userinput>modules=ppp-udeb</userinput> as boot "
@@ -2264,7 +2292,7 @@ msgstr ""
 "udeb</classname>) önműködően betöltésre és futtatásra kerül."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2284,7 +2312,7 @@ msgstr ""
 "</footnote>)"
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2294,7 +2322,7 @@ msgstr ""
 "Ethernet kártya azonosítására."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2305,7 +2333,7 @@ msgstr ""
 "PPPoE koncentrátort (egy PPPoE kapcsolatokat kezelő kiszolgáló típus)."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2320,7 +2348,7 @@ msgstr ""
 "a telepítő fő menüjéből."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2330,7 +2358,7 @@ msgstr ""
 "(a PPPoE felhasználónevet és jelszót)."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2349,13 +2377,13 @@ msgstr ""
 "kapcsolat beállítása és indítása</guimenuitem> ponttal."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "A grafikus telepítő"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2368,7 +2396,7 @@ msgstr ""
 "felületen."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2385,7 +2413,7 @@ msgstr ""
 "néha pár kérdés egy képernyőre vonható."
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The graphical installer is available with all CD images and with the hd-"
@@ -2412,7 +2440,7 @@ msgstr ""
 "<userinput>expertgui</userinput> és <userinput>rescuegui</userinput> szóval."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, fuzzy, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2430,7 +2458,7 @@ msgstr ""
 "kép."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, fuzzy, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2447,7 +2475,7 @@ msgstr ""
 "kártyás PowerPC rendszeren működik más kártyákkal viszont valószínűleg nem."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2455,7 +2483,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2467,7 +2495,7 @@ msgstr ""
 "memory-gtk;. Ha kevés van, a sima <quote>newt</quote> felület pótolja."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2477,13 +2505,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "A grafikus telepítő használata"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2493,7 +2521,7 @@ msgstr ""
 "A grafikus telepítő a simához hasonlóan működik, melyet e kézikönyv bemutat."
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, fuzzy, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2513,7 +2541,7 @@ msgstr ""
 "gombot működteti."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2522,7 +2550,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/hu/using-d-i.po b/po/hu/using-d-i.po
index b8077380f..51c03c240 100644
--- a/po/hu/using-d-i.po
+++ b/po/hu/using-d-i.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-03-14 08:35+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -403,8 +403,8 @@ msgid ""
 "Presents a list of &debian; archive mirrors. The user may choose the source "
 "of his installation packages."
 msgstr ""
-"A &debian; archívum tükrök egy listáját adja. A felhasználó az általa használt "
-"telepítő csomagok forrását választhatja ki ezzel."
+"A &debian; archívum tükrök egy listáját adja. A felhasználó az általa "
+"használt telepítő csomagok forrását választhatja ki ezzel."
 
 #. Tag: term
 #: using-d-i.xml:219
@@ -460,11 +460,23 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup (felhasználói fiókok)"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "Beállítja a root jelszót és hozzáad egy sima felhasználót."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup (óra-beállítás)"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, fuzzy, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -472,25 +484,25 @@ msgid ""
 msgstr "Megadja, hogy a hardver óra az UTC szerinti időre legyen-e beállítva."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup (időzóna beállítás)"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "Megadja az időzónát a korábban megadott elhelyezkedés alapján."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman (partíció-kezelő)"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
@@ -503,13 +515,13 @@ msgstr ""
 "önműködő mód vagy LVM támogatás. Ez a &debian; ajánlott particionáló eszköze."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner (particionáló)"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -519,13 +531,13 @@ msgstr ""
 "program megfelel a választott számítógép architektúrának."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf (partíciók beállítása)"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -535,13 +547,13 @@ msgstr ""
 "felhasználói utasításoknak megfelelően."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg (LVM beállító)"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -551,13 +563,13 @@ msgstr ""
 "beállításában."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -569,13 +581,13 @@ msgstr ""
 "alaplapokon lévő olcsó IDE (látszólagos hardver) RAID vezérlőknél."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer (alap-telepítő)"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -585,18 +597,6 @@ msgstr ""
 "alatti működtetését újraindítás után."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup (felhasználói fiókok)"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "Beállítja a root jelszót és hozzáad egy sima felhasználót."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -1060,13 +1060,14 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "A billentyűzetek gyakran egy nyelvre vannak szabva. Válassz egy kiosztást, "
 "mely megfelel a használtnak, vagy egy hasonlót, ha nincs pont a kívánt. A "
 "telepítés után több közül is lehet választani (akkor futtasd majd a "
-"<command>dpkg-reconfigure keyboard-configuration</command> parancsot rendszergazdaként)."
+"<command>dpkg-reconfigure keyboard-configuration</command> parancsot "
+"rendszergazdaként)."
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1148,9 +1149,9 @@ msgstr ""
 "filename>-t és <filename>/data/<replaceable>bármi</replaceable>.iso</"
 "filename>-t, de a <filename>/data/tmp/<replaceable>bármi</replaceable>.iso</"
 "filename>-t nem). Egy ISO képre lelve az <command>iso-scan</command> "
-"ellenőrzi tartalmát, hogy meghatározza, e kép egy érvényes &debian; ISO kép-e. "
-"Előbbi esetben kész is vagyunk, utóbbiban az <command>iso-scan</command> más "
-"képet keres."
+"ellenőrzi tartalmát, hogy meghatározza, e kép egy érvényes &debian; ISO kép-"
+"e. Előbbi esetben kész is vagyunk, utóbbiban az <command>iso-scan</command> "
+"más képet keres."
 
 #. Tag: para
 #: using-d-i.xml:700
@@ -1365,11 +1366,138 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Felhasználók és jelszavaik felvétele"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, no-c-format
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "A root jelszó beállítása"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"A <emphasis>root</emphasis> fiók szokásos másik neve <emphasis>super-user</"
+"emphasis>; e bejelentkezés átlépi a rendszer alapvető biztonsági védelmét. A "
+"root hozzáférést csak a rendszer adminisztrációjára szabad használni és még "
+"ekkor is csak a lehető legrövidebb ideig."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"A létrehozott jelszavak legalább 8 karakterből álljanak és tartalmazzanak "
+"nagy- és kisbetűket és központozási karaktereket is. Kiemelten figyelj a "
+"root jelszóra, mivel ez egy rendkívül erős hozzáférés, itt még erősebb "
+"legyen a jelszó. Kerüld a szótári szavakat vagy kitalálható személyes adatok "
+"használatát."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Ha bárki bármikor azt állítja, hogy a root jelszavadra van szüksége, légy "
+"szélsőségesen bizalmatlan. Általában soha ne add ki a root jelszót, kivéve, "
+"ha egy gépet másokkal felügyelsz."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Egy szokásos felhasználó létrehozása"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"A rendszer kér egy normál felhasználó létrehozására. E hozzáférés lesz "
+"valószínűleg az elsődleges személyes bejelentkezésed. <emphasis>Tilos</"
+"emphasis> a root fiók használata a napi munkára vagy személyes "
+"bejelentkezésre."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"Miért tiltott ez? Nos, az egyik ok a root előjogok használatának kerülésére "
+"az, hogy nagyon könnyű javíthatatlan hibát létrehozni root felhasználóként. "
+"Egy másik fontos ok, hogy <emphasis>trójai</emphasis> programok futtatásába "
+"futhatsz &mdash; ez egy program, mely a super-user jogod adta erővel hátad "
+"mögött lerombolja a rendszer biztonságát. Minden jó könyv a unixos rendszer-"
+"adminisztrációról részletesen taglalja e témát &mdash; fontold meg, hogy "
+"elolvasol egyet, ha ez új neked."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Először a felhasználó teljes nevét kell megadni. Ezután a felhasználó "
+"fiókjának nevét; általában egy saját névből vett ékezet nélküli szó vagy "
+"hasonló megfelel és valóban alap lesz. Végül meg kell adni az e felhasználói "
+"fiókhoz tartozó jelszót."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Ha a telepítés után bármikor létrehoznál egy fiókot, használd az "
+"<command>adduser</command> parancsot."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Particionálás és csatolási pont választás"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, fuzzy, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1387,7 +1515,7 @@ msgstr ""
 "LVM vagy RAID eszközök beállítása."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, fuzzy, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1398,7 +1526,7 @@ msgstr ""
 "linkend=\"partitioning\"/> részt."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1419,7 +1547,7 @@ msgstr ""
 "</screen></informalexample> Ez a lemez korábbi adatait elérhetetlenné teszi."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1433,14 +1561,14 @@ msgstr ""
 "<guimenuitem>Kézi</guimenuitem> pontot a menüből."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, fuzzy, no-c-format
 #| msgid "Created partitions"
 msgid "Supported partitioning options"
 msgstr "Létrehozott partíciók"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1449,7 +1577,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1462,7 +1590,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1470,39 +1598,39 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, fuzzy, no-c-format
 #| msgid "Configuring the Logical Volume Manager (LVM)"
 msgid "Logical Volume Management (LVM)"
 msgstr "Logikai kötet-kezelő (LVM) beállítása"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1512,13 +1640,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1527,13 +1655,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1542,7 +1670,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1551,7 +1679,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
@@ -1560,7 +1688,7 @@ msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "Nem minden architektúrán lehetséges (titkosított) LVM használata."
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
@@ -1569,14 +1697,14 @@ msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "Nem minden architektúrán lehetséges (titkosított) LVM használata."
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1586,13 +1714,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1600,13 +1728,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1614,19 +1742,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1634,13 +1762,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, fuzzy, no-c-format
 msgid "Guided Partitioning"
 msgstr "Particionáló séma"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1657,14 +1785,14 @@ msgstr ""
 "beállítja a kernel <quote>dm-crypt</quote> támogatást. </para> </footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr "Nem minden architektúrán lehetséges (titkosított) LVM használata."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1680,7 +1808,7 @@ msgstr ""
 "biztonságát nyújtja."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1695,7 +1823,7 @@ msgstr ""
 "nyomait is törli), de a lemez méretétől függően eltart egy ideig."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1712,7 +1840,7 @@ msgstr ""
 "kéri, mielőtt lemezre írná őket."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1729,7 +1857,7 @@ msgstr ""
 "mutatott méretek is segíthetnek azonosítani őket."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1745,7 +1873,7 @@ msgstr ""
 "(titkosított) LVM használatakor ez nem lehetséges."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1762,73 +1890,73 @@ msgstr ""
 "választott sémától függően) az irányított particionálás elvetésre kerül."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Particionáló séma"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Minimum hely"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Létrehozott partíciók"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Minden fájl 1 partíción"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600 MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, csere"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Önálló /home partíció"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500 MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, csere"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Önálló /home, /usr, /var és /tmp partíció"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1 GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1838,7 +1966,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, csere"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1851,7 +1979,7 @@ msgstr ""
 "partícióval együtt, az LVM partíción belül jön létre."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1864,7 +1992,7 @@ msgstr ""
 "menüelem is látszik a formázó menüben EFI indító partíció kézi beállítására."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1875,7 +2003,7 @@ msgstr ""
 "táblát, benne a leendő formázási és csatolási információkat."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -1925,7 +2053,7 @@ msgstr ""
 "lehetséges változatot mutat."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -1945,14 +2073,14 @@ msgstr ""
 "alább írt kézi particionálás szerint."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, fuzzy, no-c-format
 msgid "Manual Partitioning"
 msgstr "Particionáló séma"
 
 #. Tag: para
-#: using-d-i.xml:1219
-#, no-c-format"
+#: using-d-i.xml:1303
+#, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
 "manual partitioning except that your existing partition table will be shown "
@@ -1966,7 +2094,7 @@ msgstr ""
 "szakasz további részeiben."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -1980,7 +2108,7 @@ msgstr ""
 "jelenik meg a választott lemezen."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2015,7 +2143,7 @@ msgstr ""
 "<command>partman</command> fő képernyőjéhez."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2036,7 +2164,7 @@ msgstr ""
 "partíció."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2051,7 +2179,7 @@ msgstr ""
 "gyökér fájlrendszer csatolására."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2063,7 +2191,7 @@ msgstr ""
 "meg nem teszed."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2079,7 +2207,7 @@ msgstr ""
 "<filename>partman-lvm</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2093,13 +2221,13 @@ msgstr ""
 "kért módon történő létrehozásának megerősítését."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, fuzzy, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Több-lemezes eszköz beállítása (szoftver RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2126,7 +2254,7 @@ msgstr ""
 "után <firstterm>szoftver RAID</firstterm>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2140,7 +2268,7 @@ msgstr ""
 "csatolható, és így tovább)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, fuzzy, no-c-format
 #| msgid ""
 #| "What benefits this brings depends on the type of MD device you are "
@@ -2266,98 +2394,98 @@ msgstr ""
 "para></listitem> </varlistentry> </variablelist> Összefoglalva:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Típus"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Legkisebb eszköz-szám"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Tartalék eszköz"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "Túlél lemez hibát?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Elérhető hely"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>nincs</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
 "A legkisebb partíció mérete szorozva a RAID tömbben lévő eszközök számával"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "lehet"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>igen</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "A RAID tömbben lévő legkisebb partíció mérete"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2367,21 +2495,21 @@ msgstr ""
 "száma -1"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, fuzzy, no-c-format
 #| msgid "RAID0"
 msgid "RAID6"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, fuzzy, no-c-format
 #| msgid "<entry>2</entry>"
 msgid "<entry>4</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2394,14 +2522,14 @@ msgstr ""
 "száma -1"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, fuzzy, no-c-format
 #| msgid "RAID0"
 msgid "RAID10"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2409,7 +2537,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2419,7 +2547,7 @@ msgstr ""
 "howto;\">Szoftver RAID HOGYAN</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2434,7 +2562,7 @@ msgstr ""
 "fizikai kötet</guimenuitem> </menuchoice> pontot.)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2447,7 +2575,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Support for MD is a relatively new addition to the installer. You may "
@@ -2470,7 +2598,7 @@ msgstr ""
 "megoldhatják."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2491,7 +2619,7 @@ msgstr ""
 "következők a választott MD típustól függenek."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2502,7 +2630,7 @@ msgstr ""
 "listája, és az egyetlen feladat a leendő MD-t alkotó partíciók kijelölése."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, fuzzy, no-c-format
 #| msgid ""
 #| "RAID1 is a bit more tricky. First, you will be asked to enter the number "
@@ -2527,7 +2655,7 @@ msgstr ""
 "az előbb megadott számmal. Ne aggódj! A &d-i; figyelmeztet hiba esetén."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2537,7 +2665,7 @@ msgstr ""
 "emphasis> aktív partíciót kell megadni."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, fuzzy, no-c-format
 #| msgid ""
 #| "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2550,7 +2678,7 @@ msgstr ""
 "emphasis> aktív partíciót kell megadni."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2563,7 +2691,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2581,7 +2709,7 @@ msgstr ""
 "partíció)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2595,13 +2723,13 @@ msgstr ""
 "például csatolási pontok társítására."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Logikai kötet-kezelő (LVM) beállítása"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2617,7 +2745,7 @@ msgstr ""
 "így tovább kellett kezelni."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2636,7 +2764,7 @@ msgstr ""
 "közt is átnyúlhatnak."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2657,7 +2785,7 @@ msgstr ""
 "ulink> leírást."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2674,7 +2802,7 @@ msgstr ""
 "guimenuitem> </menuchoice> pontot."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2693,7 +2821,7 @@ msgstr ""
 "lehetséges műveleteket mutatja. A lehetséges műveletek:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2703,43 +2831,43 @@ msgstr ""
 "eszköz struktúrát, a logikai kötetek neveit, méreteit és egyebeket"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Kötet csoport létrehozása"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Logikai kötet létrehozása"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Kötet csoport törlése"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Logikai kötet törlése"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Kötet csoport bővítése"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Kötet csoport csökkentése"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2749,7 +2877,7 @@ msgstr ""
 "képernyőhöz"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2759,7 +2887,7 @@ msgstr ""
 "kötetek létrehozására."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2771,13 +2899,13 @@ msgstr ""
 "is kezelhetők)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Titkosított kötetek beállítása"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2799,7 +2927,7 @@ msgstr ""
 "adatok véletlen karaktereknek tűnnek."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2827,7 +2955,7 @@ msgstr ""
 "betöltése."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2841,7 +2969,7 @@ msgstr ""
 "hosszán múlik."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2861,7 +2989,7 @@ msgstr ""
 "módosul és különböző titkosító lehetőségeket ad a partícióhoz."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2877,7 +3005,7 @@ msgstr ""
 "ok, ajánlott az alap használata."
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2891,13 +3019,13 @@ msgstr ""
 "lettek kiválasztva."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Titkosítás: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2922,13 +3050,13 @@ msgstr ""
 "érzékeny adatok védelmére a XXI. században."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Kulcs méret: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2941,13 +3069,13 @@ msgstr ""
 "teljesítményre. Az elérhető kulcs méretek a titkosítástól függenek."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV algoritmus: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2964,7 +3092,7 @@ msgstr ""
 "adatok általi törés megakadályozása."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2978,25 +3106,25 @@ msgstr ""
 "az újabb algoritmusokat."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Titkosító kulcs: <userinput>Jelmondat</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Itt állítható be a titkosító kulcs e partícióhoz."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Jelmondat"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3010,13 +3138,13 @@ msgstr ""
 "alapján, mely e folyamat folyatásában adható meg."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Véletlen kulcs"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3033,7 +3161,7 @@ msgstr ""
 "algoritmus ismeretlen gyengesége nélkül ez nem lehetséges a mi életünkben.)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3052,13 +3180,13 @@ msgstr ""
 "partícióra a felfüggesztéskor írt adatok visszaállítása."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Adatok törlése: <userinput>igen</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3078,7 +3206,7 @@ msgstr ""
 "felülírás után. </para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3090,13 +3218,13 @@ msgstr ""
 "alábbi lehetőségeket adja:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Titkosítás: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3108,25 +3236,25 @@ msgstr ""
 "szakaszt a titkosításokról és kulcsok méreteiről további adatokért."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Titkosító kulcs: <userinput>Kulcsfájl (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "Itt adható meg a titkosító kulcs típusa e partícióhoz."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Kulcsfájl (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3140,19 +3268,19 @@ msgstr ""
 "egy ilyen megadására)."
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "Lásd a véletlen kulcsok szakaszt fent."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "Lásd az adatok törlése szakaszt fent."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3169,7 +3297,7 @@ msgstr ""
 "egy új partíciós tábla írását. A nagy partíciókon ez eltart egy ideig."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3185,7 +3313,7 @@ msgstr ""
 "rokonok nevei és így tovább)."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3208,7 +3336,7 @@ msgstr ""
 "gyökér fájlrendszer számára."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3230,7 +3358,7 @@ msgstr ""
 "titkosítandó partíciónál megismételhető."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3262,7 +3390,7 @@ msgstr ""
 "kötetekhez és módosítani fájlrendszer típusukat, ha nem tetszik."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, fuzzy, no-c-format
 #| msgid ""
 #| "One thing to note here are the identifiers in parentheses "
@@ -3288,7 +3416,7 @@ msgstr ""
 "linkend=\"mount-encrypted-volumes\"/>."
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3296,13 +3424,13 @@ msgid ""
 msgstr "Ha a partíciós séma megfelel, folyatható a telepítés."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "Az alaprendszer telepítése"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3315,7 +3443,7 @@ msgstr ""
 "Lassú gép vagy hálózati kapcsolat esetén eltart egy kis ideig."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3331,7 +3459,7 @@ msgstr ""
 "Alt</keycap><keycap>F1</keycap></keycombo> használható."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3343,7 +3471,7 @@ msgstr ""
 "ellenőrzésükre, ha a telepítés soros konzolon át történik."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3356,7 +3484,7 @@ msgstr ""
 "az elérhető kernelek egy listából választhatók."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3368,7 +3496,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3378,133 +3506,6 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "Felhasználók és jelszavaik felvétele"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "A root jelszó beállítása"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"A <emphasis>root</emphasis> fiók szokásos másik neve <emphasis>super-user</"
-"emphasis>; e bejelentkezés átlépi a rendszer alapvető biztonsági védelmét. A "
-"root hozzáférést csak a rendszer adminisztrációjára szabad használni és még "
-"ekkor is csak a lehető legrövidebb ideig."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"A létrehozott jelszavak legalább 8 karakterből álljanak és tartalmazzanak "
-"nagy- és kisbetűket és központozási karaktereket is. Kiemelten figyelj a "
-"root jelszóra, mivel ez egy rendkívül erős hozzáférés, itt még erősebb "
-"legyen a jelszó. Kerüld a szótári szavakat vagy kitalálható személyes adatok "
-"használatát."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Ha bárki bármikor azt állítja, hogy a root jelszavadra van szüksége, légy "
-"szélsőségesen bizalmatlan. Általában soha ne add ki a root jelszót, kivéve, "
-"ha egy gépet másokkal felügyelsz."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "Egy szokásos felhasználó létrehozása"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"A rendszer kér egy normál felhasználó létrehozására. E hozzáférés lesz "
-"valószínűleg az elsődleges személyes bejelentkezésed. <emphasis>Tilos</"
-"emphasis> a root fiók használata a napi munkára vagy személyes "
-"bejelentkezésre."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"Miért tiltott ez? Nos, az egyik ok a root előjogok használatának kerülésére "
-"az, hogy nagyon könnyű javíthatatlan hibát létrehozni root felhasználóként. "
-"Egy másik fontos ok, hogy <emphasis>trójai</emphasis> programok futtatásába "
-"futhatsz &mdash; ez egy program, mely a super-user jogod adta erővel hátad "
-"mögött lerombolja a rendszer biztonságát. Minden jó könyv a unixos rendszer-"
-"adminisztrációról részletesen taglalja e témát &mdash; fontold meg, hogy "
-"elolvasol egyet, ha ez új neked."
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Először a felhasználó teljes nevét kell megadni. Ezután a felhasználó "
-"fiókjának nevét; általában egy saját névből vett ékezet nélküli szó vagy "
-"hasonló megfelel és valóban alap lesz. Végül meg kell adni az e felhasználói "
-"fiókhoz tartozó jelszót."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Ha a telepítés után bármikor létrehoznál egy fiókot, használd az "
-"<command>adduser</command> parancsot."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -3840,12 +3841,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2470
-#, g, no-c-format
-#| msgid ""
-#| "Some tasks may be pre-selected based on the characteristics of the "
-#| "computer you are installing. If you disagree with these selections you "
-#| "can un-select the tasks. You can even opt to install no tasks at all at "
-#| "this point."
+#, no-c-format
 msgid ""
 "Some tasks may be pre-selected based on the characteristics of the computer "
 "you are installing. If you disagree with these selections you can deselect "
@@ -4309,14 +4305,21 @@ msgstr "Válaszd a helyes partíciót!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "Egy partíció kiválasztásának feltétele, hogy FAT fájlrendszer legyen rajta "
 "<emphasis>boot</emphasis> kapcsolóval. A &d-i; több lehetőséget is adhat az "
@@ -4449,8 +4452,8 @@ msgid ""
 "by the symbolic link <filename>/vmlinuz</filename>."
 msgstr ""
 "Ez a tömörített kernel maga. Ez a <filename>/etc/elilo.conf</filename> "
-"fájlban hivatkozott fájl egy másolata. A &debian; szabványos telepítésében ez "
-"a <filename>/boot</filename> könyvtárban lévő fájl, melyre a <filename>/"
+"fájlban hivatkozott fájl egy másolata. A &debian; szabványos telepítésében "
+"ez a <filename>/boot</filename> könyvtárban lévő fájl, melyre a <filename>/"
 "vmlinuz</filename> jelképes lánc hivatkozik."
 
 #. Tag: title
@@ -4831,8 +4834,8 @@ msgid ""
 "installer/</filename> on your new &debian; system."
 msgstr ""
 "Ha a telepítés sikeres, a telepítő folyamat során keletkező napló fájlok "
-"automatikusan mentésre kerülnek az új &debian; rendszeren a <filename>/var/log/"
-"installer/</filename> könyvtárba."
+"automatikusan mentésre kerülnek az új &debian; rendszeren a <filename>/var/"
+"log/installer/</filename> könyvtárba."
 
 #. Tag: para
 #: using-d-i.xml:3145
diff --git a/po/ja/administrivia.po b/po/ja/administrivia.po
index f10345b41..829332386 100644
--- a/po/ja/administrivia.po
+++ b/po/ja/administrivia.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-26 09:51+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -28,10 +28,15 @@ msgstr "この文書について"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This manual was created for Sarge's debian-installer, based on the Woody "
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -193,9 +198,17 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Many, many &debian; users and developers contributed to this document. "
+#| "Particular note must be made of Michael Schmitz (m68k support), Frank "
+#| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
+#| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
+#| "(SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous "
+#| "edits and text. We have to thank Pascal Le Bail for useful information "
+#| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/ja/bookinfo.po b/po/ja/bookinfo.po
index 410d9135c..30c485988 100644
--- a/po/ja/bookinfo.po
+++ b/po/ja/bookinfo.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-03 14:21+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -37,17 +37,28 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "このインストールガイドは、旧 Debian インストールシステム (<quote>boot-"
 "floppies</quote>) 用に書かれた初期のマニュアルをベースにしており、新しい "
diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po
index 49d1dfdd8..30a260b5c 100644
--- a/po/ja/boot-installer.po
+++ b/po/ja/boot-installer.po
@@ -1,18 +1,19 @@
 # KURASAWA Nozomu <nabetaro@debian.or.jp>, 2010.
+# Christian Perrier <bubulle@debian.org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-10-10 12:35+0000\n"
-"PO-Revision-Date: 2010-07-26 10:07+0900\n"
-"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"PO-Revision-Date: 2010-10-24 12:23+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Generator: Lokalize 1.0\n"
 
 #. Tag: title
 #: boot-installer.xml:4
@@ -78,8 +79,7 @@ msgstr ""
 msgid ""
 "Older systems such as the 715 might require the use of an RBOOT server "
 "instead of a BOOTP server."
-msgstr ""
-"715 のような古いシステムは、BOOTP サーバではなく RBOOT サーバが必要です。"
+msgstr "715 のような古いシステムは、BOOTP サーバではなく RBOOT サーバが必要です。"
 
 #. Tag: para
 #: boot-installer.xml:53 boot-installer.xml:663 boot-installer.xml:1202
@@ -154,8 +154,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
-msgstr ""
-"起動に問題があれば、<xref linkend=\"boot-troubleshooting\"/> をご覧ください。"
+msgstr "起動に問題があれば、<xref linkend=\"boot-troubleshooting\"/> をご覧ください。"
 
 #. Tag: title
 #: boot-installer.xml:107
@@ -562,7 +561,7 @@ msgstr "MacOS からの起動"
 msgid ""
 "Boot into DOS (not Windows). To do this, you can for instance boot from a "
 "recovery or diagnostic disk."
-msgstr ""
+msgstr "bla"
 
 #. Tag: para
 #: boot-installer.xml:471
@@ -574,7 +573,7 @@ msgid ""
 "</screen></informalexample> else make sure you have first prepared your hard "
 "disk as explained in <xref linkend=\"files-loadlin\"/>, and change the "
 "current drive to it if needed."
-msgstr ""
+msgstr "bla"
 
 #. Tag: para
 #: boot-installer.xml:481
@@ -588,15 +587,14 @@ msgid ""
 "cd gtk\n"
 "</screen></informalexample> Next, execute <command>install.bat</command>. "
 "The kernel will load and launch the installer system."
-msgstr ""
+msgstr "bla"
 
 #. Tag: title
 #: boot-installer.xml:499
 #, no-c-format
 msgid ""
 "Booting from Linux Using <command>LILO</command> or <command>GRUB</command>"
-msgstr ""
-"<command>LILO</command> や <command>GRUB</command> を用いた Linux からの起動"
+msgstr "<command>LILO</command> や <command>GRUB</command> を用いた Linux からの起動"
 
 #. Tag: para
 #: boot-installer.xml:502
@@ -1580,8 +1578,7 @@ msgstr ""
 msgid ""
 "Select the kernel version and installation mode most appropriate to your "
 "needs with the arrow keys."
-msgstr ""
-"カーネルのバージョンと目的に対して最も適切なモードを、矢印キーで選択する。"
+msgstr "カーネルのバージョンと目的に対して最も適切なモードを、矢印キーで選択する。"
 
 #. Tag: para
 #: boot-installer.xml:1149
@@ -2750,8 +2747,7 @@ msgstr "debconf/priority (priority)"
 #: boot-installer.xml:2109
 #, no-c-format
 msgid "This parameter sets the lowest priority of messages to be displayed."
-msgstr ""
-"このパラメータには、表示するメッセージのもっとも低い優先度を設定します。"
+msgstr "このパラメータには、表示するメッセージのもっとも低い優先度を設定します。"
 
 #. Tag: para
 #: boot-installer.xml:2113
@@ -4301,8 +4297,7 @@ msgstr ""
 #: boot-installer.xml:3031
 #, no-c-format
 msgid "We recommend to install such systems by netbooting the installer."
-msgstr ""
-"そのようなシステムでは、インストーラをネットから起動するのをお勧めします。"
+msgstr "そのようなシステムでは、インストーラをネットから起動するのをお勧めします。"
 
 #. Tag: title
 #: boot-installer.xml:3040
diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index 0f7f1d604..8f968fc6c 100644
--- a/po/ja/hardware.po
+++ b/po/ja/hardware.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-03 14:34+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -28,9 +28,9 @@ msgid ""
 "started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
-"この節では、&debian; を始めるために必要なハードウェアに関する情報を扱います。ま"
-"た、GNU や &arch-kernel; でサポートされるハードウェアに関するより詳しい情報へ"
-"のリンクも用意しました。"
+"この節では、&debian; を始めるために必要なハードウェアに関する情報を扱います。"
+"また、GNU や &arch-kernel; でサポートされるハードウェアに関するより詳しい情報"
+"へのリンクも用意しました。"
 
 #. Tag: title
 #: hardware.xml:20
@@ -58,12 +58,12 @@ msgid ""
 "\"&url-ports;\"></ulink> for more details on &arch-title; architecture "
 "systems which have been tested with &debian-gnu;."
 msgstr ""
-"&debian; は、Linux カーネルや GNU ツールセットが必要とする以上のハードウェアを"
-"要求しません。それゆえ、Linux カーネル、libc、<command>gcc</command> などが移"
-"植されていて、&debian; の移植版が存在すれば、どんなアーキテクチャや プラット"
-"フォームでも &debian; を動作させることができます。すでに &debian-gnu; でテスト"
-"されている &arch-title; アーキテクチャの詳細は、移植版のページ (<ulink url="
-"\"&url-ports;\"></ulink>) を参照してください。"
+"&debian; は、Linux カーネルや GNU ツールセットが必要とする以上のハードウェア"
+"を要求しません。それゆえ、Linux カーネル、libc、<command>gcc</command> などが"
+"移植されていて、&debian; の移植版が存在すれば、どんなアーキテクチャや プラッ"
+"トフォームでも &debian; を動作させることができます。すでに &debian-gnu; でテ"
+"ストされている &arch-title; アーキテクチャの詳細は、移植版のページ (<ulink "
+"url=\"&url-ports;\"></ulink>) を参照してください。"
 
 #. Tag: para
 #: hardware.xml:32
@@ -90,8 +90,8 @@ msgid ""
 "&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
-"&debian; GNU/Linux &release; は 11 の主要なアーキテクチャと、<quote>フレーバー"
-"</quote>と呼ばれる各アーキテクチャのバリエーションをサポートしています。"
+"&debian; GNU/Linux &release; は 11 の主要なアーキテクチャと、<quote>フレー"
+"バー</quote>と呼ばれる各アーキテクチャのバリエーションをサポートしています。"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
@@ -573,9 +573,9 @@ msgid ""
 "<emphasis>any</emphasis> ARM CPU."
 msgstr ""
 "それぞれの ARM アーキテクチャは自分自身のカーネルを必要とします。そのため、標"
-"準の &debian; ディストリビューションは、多くの最も一般的なプラットフォーム上へ"
-"のインストールを支援するだけです。しかし、&debian; のユーザランドは、<emphasis>"
-"どの</emphasis> ARM CPU で使用しても構いません。"
+"準の &debian; ディストリビューションは、多くの最も一般的なプラットフォーム上"
+"へのインストールを支援するだけです。しかし、&debian; のユーザランドは、"
+"<emphasis>どの</emphasis> ARM CPU で使用しても構いません。"
 
 #. Tag: para
 #: hardware.xml:286
@@ -613,11 +613,12 @@ msgid ""
 "IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
 msgstr ""
 "Intel の I/O プロセッサ (IOP) ラインは、データのストレージやプロセッシングに"
-"関係する製品の数だけ存在します。&debian; では現在、ネットワーク接続ストレージ "
-"(NAS) デバイスによく使われている、IOP 80219 や 32x チップといった IOP32x プ"
-"ラットフォームをサポートしています。&debian; が確実にサポートしているのは、IO-"
-"Data の <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> と <ulink "
-"url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink> の 2 つのデバイスです。"
+"関係する製品の数だけ存在します。&debian; では現在、ネットワーク接続ストレー"
+"ジ (NAS) デバイスによく使われている、IOP 80219 や 32x チップといった IOP32x "
+"プラットフォームをサポートしています。&debian; が確実にサポートしているのは、"
+"IO-Data の <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> と "
+"<ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink> の 2 つのデバイス"
+"です。"
 
 #. Tag: term
 #: hardware.xml:315
@@ -767,21 +768,22 @@ msgid ""
 "not be easily used by most &debian; packages; now they can. </para> </"
 "footnote>."
 msgstr ""
-"しかし &debian; GNU/Linux &releasename; は、386 以前のプロセッサでは<emphasis>"
-"動作しません</emphasis>。アーキテクチャ名が \"i386\" であるにもかかわらず、実"
-"際の 80386 プロセッサ (とそのクローン) のサポートは、&debian; の Sarge (r3.1) "
-"リリースで打ち切られました<footnote> <para> 私たちは打ち切りを避けようと努力"
-"してきましたが、GCC の提供する C++ ABI のバグに始まるコンパイラとカーネルの問"
-"題により、最終的にそうせざるを得なくなりました。自分のカーネルとすべてのパッ"
-"ケージをソースからコンパイルすれば、まだ 80386 プロセッサで &debian; GNU/Linux "
-"が動作するかもしれませんが、本マニュアルの範疇を越えてしまいます。</para> </"
-"footnote>。(Linux では 286 やそれ以前のチップをサポートしたことはありません) "
-"i486 以降のすべてのプロセッサをサポートしています<footnote> <para> 古いチップ"
-"をサポートしないことによる正の影響として、多くの &debian; パッケージが最近のコ"
-"ンピュータ上で、多少速く動作することが挙げられます。1989 年に発売された i486 "
-"では、オペコードを 3 つ (bswap, cmpxchg, xadd) 持っていますが、1986 年に発売"
-"された i386 にはありません。以前はほとんどの &debian; パッケージでこれを使用で"
-"きませんでしたが、現在では使用できます。</para> </footnote>。"
+"しかし &debian; GNU/Linux &releasename; は、386 以前のプロセッサでは"
+"<emphasis>動作しません</emphasis>。アーキテクチャ名が \"i386\" であるにもかか"
+"わらず、実際の 80386 プロセッサ (とそのクローン) のサポートは、&debian; の "
+"Sarge (r3.1) リリースで打ち切られました<footnote> <para> 私たちは打ち切りを避"
+"けようと努力してきましたが、GCC の提供する C++ ABI のバグに始まるコンパイラと"
+"カーネルの問題により、最終的にそうせざるを得なくなりました。自分のカーネルと"
+"すべてのパッケージをソースからコンパイルすれば、まだ 80386 プロセッサで "
+"&debian; GNU/Linux が動作するかもしれませんが、本マニュアルの範疇を越えてしま"
+"います。</para> </footnote>。(Linux では 286 やそれ以前のチップをサポートした"
+"ことはありません) i486 以降のすべてのプロセッサをサポートしています"
+"<footnote> <para> 古いチップをサポートしないことによる正の影響として、多くの "
+"&debian; パッケージが最近のコンピュータ上で、多少速く動作することが挙げられま"
+"す。1989 年に発売された i486 では、オペコードを 3 つ (bswap, cmpxchg, xadd) "
+"持っていますが、1986 年に発売された i386 にはありません。以前はほとんどの "
+"&debian; パッケージでこれを使用できませんでしたが、現在では使用できます。</"
+"para> </footnote>。"
 
 #. Tag: para
 #: hardware.xml:450
@@ -807,15 +809,15 @@ msgstr "I/O バス"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "システムバスとは、CPU と記憶装置のような周辺機器との通信を可能にするためにマ"
 "ザーボードに搭載されているものです。あなたのコンピュータでは、ISA、EISA、"
-"PCI、PCIe、PCI-X、VESA ローカルバス (VLB、VL バスとも呼ばれます) のいずれかが使われ"
-"ているはずです。本質的に、近年販売されたパーソナルコンピュータには、このどれ"
-"かが使われています。"
+"PCI、PCIe、PCI-X、VESA ローカルバス (VLB、VL バスとも呼ばれます) のいずれかが"
+"使われているはずです。本質的に、近年販売されたパーソナルコンピュータには、こ"
+"のどれかが使われています。"
 
 #. Tag: para
 #: hardware.xml:484
@@ -843,13 +845,13 @@ msgstr ""
 "参照できます。 </para></listitem> <listitem><para> SGI IP32: このプラット"
 "フォームは一般的に SGI O2 として知られています。</para></listitem> "
 "<listitem><para> MIPS Malta: このプラットフォームは QEMU でエミュレートされて"
-"おり、そのためハードウェアがなくても MIPS での &debian; のテストや実行を行う良"
-"い方法です。</para></listitem> </itemizedlist> mips/mipsel マシンのサポートに"
-"ついての完全な情報は、<ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</"
-"ulink> にあります。以下では、&debian; インストーラでサポートされているシステム"
-"についてのみ対象にしています。その他のサブアーキテクチャのサポートが必要な場"
-"合は、<ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; メーリング"
-"リスト</ulink>に連絡してください。"
+"おり、そのためハードウェアがなくても MIPS での &debian; のテストや実行を行う"
+"良い方法です。</para></listitem> </itemizedlist> mips/mipsel マシンのサポート"
+"についての完全な情報は、<ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</"
+"ulink> にあります。以下では、&debian; インストーラでサポートされているシステ"
+"ムについてのみ対象にしています。その他のサブアーキテクチャのサポートが必要な"
+"場合は、<ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; メーリン"
+"グリスト</ulink>に連絡してください。"
 
 #. Tag: para
 #: hardware.xml:519
@@ -861,9 +863,9 @@ msgid ""
 "supported."
 msgstr ""
 "R4000, R4400, R4600, R5000 プロセッサを搭載した SGI IP22, SGI Indy, Indigo "
-"2, Challenge S は、ビッグエンディアン MIPS 用 &debian; インストールシステムでサ"
-"ポートしています。SGI IP32 では現在、R5000 ベースのシステムのみサポートしてい"
-"ます。"
+"2, Challenge S は、ビッグエンディアン MIPS 用 &debian; インストールシステムで"
+"サポートしています。SGI IP32 では現在、R5000 ベースのシステムのみサポートして"
+"います。"
 
 #. Tag: para
 #: hardware.xml:525
@@ -899,12 +901,13 @@ msgstr ""
 "Cobalt マシン (Cobalt RaQ, Qube2, RaQ2, Gateway Microserver) のみを対象としま"
 "す。</para></listitem> <listitem><para> MIPS Malta: このプラットフォームは "
 "QEMU でエミュレートされており、そのためハードウェアがなくても MIPS での "
-"&debian; のテストや実行を行う良い方法です。</para></listitem> </itemizedlist> "
-"mips/mipsel マシンサポートについての完全な情報は、<ulink url=\"&url-linux-"
-"mips;\">Linux-MIPS homepage</ulink> にあります。以下では、&debian; インストーラ"
-"でサポートされているシステムについてのみ対象にしています。その他のサブアーキ"
-"テクチャのサポートが必要な場合は、<ulink url=\"&url-list-subscribe;\"> "
-"debian-&arch-listname; メーリングリスト</ulink> に連絡してください。"
+"&debian; のテストや実行を行う良い方法です。</para></listitem> </"
+"itemizedlist> mips/mipsel マシンサポートについての完全な情報は、<ulink url="
+"\"&url-linux-mips;\">Linux-MIPS homepage</ulink> にあります。以下では、"
+"&debian; インストーラでサポートされているシステムについてのみ対象にしていま"
+"す。その他のサブアーキテクチャのサポートが必要な場合は、<ulink url=\"&url-"
+"list-subscribe;\"> debian-&arch-listname; メーリングリスト</ulink> に連絡して"
+"ください。"
 
 #. Tag: title
 #: hardware.xml:570
@@ -957,8 +960,8 @@ msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
-"&debian; では、以下の CPU タイプに基づいて、powerpc カーネルのフレーバーが 2 種"
-"類あります。"
+"&debian; では、以下の CPU タイプに基づいて、powerpc カーネルのフレーバーが 2 "
+"種類あります。"
 
 #. Tag: term
 #: hardware.xml:625
@@ -1040,8 +1043,8 @@ msgid ""
 msgstr ""
 "Apple (そしてたとえば Power Computing のような他のメーカー) は、PowerPC プロ"
 "セッサベースの Macintosh コンピュータを製造しています。アーキテクチャのサポー"
-"トの種類により、NuBus (&debian; では未サポート), OldWorld PCI, NewWorld に分類"
-"されています。"
+"トの種類により、NuBus (&debian; では未サポート), OldWorld PCI, NewWorld に分"
+"類されています。"
 
 #. Tag: para
 #: hardware.xml:695
@@ -1475,9 +1478,9 @@ msgid ""
 "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgstr ""
 "NuBus システムは現在 &debian;/powerpc でサポートされていません。モノリシック "
-"Linux/PPC カーネルアーキテクチャでは、マシンをサポートしておらず、&debian; では"
-"まだサポートしていない MkLinux Mach マイクロカーネルを使用しなければならない"
-"ものがあります。以下のものが含まれます。<itemizedlist> <listitem><para> "
+"Linux/PPC カーネルアーキテクチャでは、マシンをサポートしておらず、&debian; で"
+"はまだサポートしていない MkLinux Mach マイクロカーネルを使用しなければならな"
+"いものがあります。以下のものが含まれます。<itemizedlist> <listitem><para> "
 "Power Macintosh 6100, 7100, 8100 </para></listitem> <listitem><para> "
 "Performa 5200, 6200, 6300 </para></listitem> <listitem><para> Powerbook "
 "1400, 2300, and 5300 </para></listitem> <listitem><para> Workgroup Server "
@@ -1546,32 +1549,25 @@ msgstr "S/390 や zSeries マシンタイプ"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
 msgstr ""
-"S/390 や zSeries マシンについての完全な情報は、IBM の レッドブック 2.1 章内"
-"の <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf"
-"\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> か、"
-"<ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/index.html"
-"\">zSeries page at the developerWorks</ulink> で見つかります。要するに、G5, "
-"Multiprise 3000, G6 および全 zSeries はフルサポート、Multiprise 2000, G3, G4 "
-"はパフォーマンスが低下しますが、IEEE 浮動小数点演算エミュレーションでサポート"
-"しています。"
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU・マザーボードのサポート"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1585,13 +1581,13 @@ msgstr ""
 "ろうか、といったことを一覧します。"
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1605,25 +1601,25 @@ msgstr ""
 "ページ</ulink> をご覧ください。"
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
 "already been discontinued after earlier releases."
 msgstr ""
-"sparc32 をサポートする最後の &debian; リリースは Etch でしたが、そこでも sun4m "
-"システムしかサポートしていません。他の 32 ビットサブアーキテクチャのサポート"
-"は、初期リリースから継続されていません。"
+"sparc32 をサポートする最後の &debian; リリースは Etch でしたが、そこでも "
+"sun4m システムしかサポートしていません。他の 32 ビットサブアーキテクチャのサ"
+"ポートは、初期リリースから継続されていません。"
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1640,13 +1636,13 @@ msgstr ""
 "にあわせて、sparc64 か sparc64-smp のカーネルを使用してください。"
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1660,24 +1656,24 @@ msgstr ""
 "い。"
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
 "not supported due to lack of support in the Linux kernel."
 msgstr ""
 "サーバの PRIMEPOWER ファミリで使用されている富士通の SPARC64 CPU は、Linux "
-"カーネルのサポートが不充分なため、&debian; でもサポートしていないことにご注意く"
-"ださい。"
+"カーネルのサポートが不充分なため、&debian; でもサポートしていないことにご注意"
+"ください。"
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "ラップトップコンピュータ"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1694,13 +1690,13 @@ msgstr ""
 "ださい。"
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "マルチプロセッサ"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1711,13 +1707,13 @@ msgid ""
 "this will hardly be noticable."
 msgstr ""
 "このアーキテクチャでは、マルチプロセッササポート (<quote>対称型マルチプロセッ"
-"シング</quote> や SMP と呼ばれている) が利用できます。&debian; &release; の標準"
-"カーネルイメージは SMP サポートを有効にしてコンパイルされています。標準カーネ"
-"ルは非 SMP システムでも使用できますが、わずかな性能劣化となる若干のオーバー"
+"シング</quote> や SMP と呼ばれている) が利用できます。&debian; &release; の標"
+"準カーネルイメージは SMP サポートを有効にしてコンパイルされています。標準カー"
+"ネルは非 SMP システムでも使用できますが、わずかな性能劣化となる若干のオーバー"
 "ヘッドがあります。通常のシステムでは、ほとんど問題とならないでしょう。"
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1727,15 +1723,15 @@ msgid ""
 "deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
 "section;</quote> section of the kernel config.</phrase>"
 msgstr ""
-"シングル CPU システムにカーネルを最適化したい場合は、&debian; の標準カーネルを"
-"置き換える必要があります。<phrase arch=\"linux-any\">その手順に関する議論は "
-"<xref linkend=\"kernel-baking\"/> にあります。現時点 (カーネルバージョン "
+"シングル CPU システムにカーネルを最適化したい場合は、&debian; の標準カーネル"
+"を置き換える必要があります。<phrase arch=\"linux-any\">その手順に関する議論"
+"は <xref linkend=\"kernel-baking\"/> にあります。現時点 (カーネルバージョン "
 "&kernelversion;) で SMP を無効にするためには、カーネルコンフィグレーションの "
 "<quote>&smp-config-section;</quote> セクションにある <quote>&smp-config-"
 "option;</quote> の選択を解除してください。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1746,23 +1742,23 @@ msgid ""
 "SMP on uniprocessor systems."
 msgstr ""
 "このアーキテクチャでは、マルチプロセッササポート (<quote>対称型マルチプロセッ"
-"シング</quote> や SMP と呼ばれている) が利用できます。&debian; &release; の標準"
-"カーネルイメージは <firstterm>SMP-alternatives</firstterm> をサポートするよう"
-"コンパイルされています。このため、プロセッサの数 (やプロセッサコアの数) を検"
-"出し、単一プロセッサシステムの場合、自動的に SMP を無効にします。"
+"シング</quote> や SMP と呼ばれている) が利用できます。&debian; &release; の標"
+"準カーネルイメージは <firstterm>SMP-alternatives</firstterm> をサポートするよ"
+"うコンパイルされています。このため、プロセッサの数 (やプロセッサコアの数) を"
+"検出し、単一プロセッサシステムの場合、自動的に SMP を無効にします。"
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr ""
-"&arch-title; 用 &debian; カーネルイメージパッケージの 486 フレーバーでは、SMP "
-"をサポートするようコンパイルされていません。"
+"&arch-title; 用 &debian; カーネルイメージパッケージの 486 フレーバーでは、"
+"SMP をサポートするようコンパイルされていません。"
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1778,7 +1774,7 @@ msgstr ""
 "標準カーネルは単に 1 番目の CPU を用います。"
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -1788,15 +1784,15 @@ msgid ""
 "<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</"
 "quote> section of the kernel config.</phrase>"
 msgstr ""
-"マルチプロセッサを利用するためには、&debian; の標準カーネルを置き換える必要があ"
-"ります。<phrase arch=\"linux-any\">その手順に関する話題は <xref linkend="
+"マルチプロセッサを利用するためには、&debian; の標準カーネルを置き換える必要が"
+"あります。<phrase arch=\"linux-any\">その手順に関する話題は <xref linkend="
 "\"kernel-baking\"/> にあります。現時点 (カーネルバージョン &kernelversion;) "
 "で SMP を有効にするためには、カーネルコンフィグレーションの <quote>&smp-"
 "config-section;</quote> セクションにある <quote>&smp-config-option;</quote> "
 "を選択してください。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1814,7 +1810,7 @@ msgstr ""
 "ありません。標準カーネルは単に 1 番目の CPU を用います。"
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1826,7 +1822,7 @@ msgstr ""
 "ジを選ぶ必要があります。"
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can also build your own customized kernel to support SMP. <phrase "
@@ -1849,20 +1845,27 @@ msgstr ""
 "ションにある <quote>&smp-config-option;</quote> を選択してください。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "グラフィックカードのサポート"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "コンソール端末を使用するためには、VGA 互換ディスプレイインターフェースが必要"
 "です。最近のビデオカードは、そのほぼすべてが VGA と互換性があります。かつての"
@@ -1870,30 +1873,30 @@ msgstr ""
 "しょう。なお、この文書で扱うインストールの過程では X11 を用いません。"
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
-"&debian; がサポートするグラフィックインターフェースは、X.Org の X11 System のサ"
-"ポートに基づいたものです。ほとんどの AGP, PCI, PCIe, PCI-X ビデオカードは X.Org の下"
-"で動作します。サポートされているグラフィックバス、カード、モニタ、ポインティ"
-"ングデバイスに関するより詳細な情報については、<ulink url=\"&url-xorg;\"></"
-"ulink> をご覧ください。なお &debian; &release; は X.Org バージョン &x11ver; を"
-"採用しています。"
+"&debian; がサポートするグラフィックインターフェースは、X.Org の X11 System の"
+"サポートに基づいたものです。ほとんどの AGP, PCI, PCIe, PCI-X ビデオカードは "
+"X.Org の下で動作します。サポートされているグラフィックバス、カード、モニタ、"
+"ポインティングデバイスに関するより詳細な情報については、<ulink url=\"&url-"
+"xorg;\"></ulink> をご覧ください。なお &debian; &release; は X.Org バージョン "
+"&x11ver; を採用しています。"
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org X ウィンドウシステムは SGI Indy と O2 でのみサポートしています。"
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1914,7 +1917,7 @@ msgstr ""
 "るドキュメントをお読みください。"
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1941,13 +1944,13 @@ msgstr ""
 "動的にシリアルコンソールを使用する物があります。"
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "ネットワーク接続機器"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1963,7 +1966,7 @@ msgstr ""
 "\"i386\">多くの古い ISA カードが、きちんとサポートされています。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1973,62 +1976,62 @@ msgstr ""
 "の NIC が含まれます。"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "以下にサポートしているネットワークデバイスを挙げます。"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr ""
 "Channel to Channel (CTC) や ESCON 接続 (リアルもしくはエミュレーション)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet や OSA-Express Fast Ethernet (非 QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "QDIO モードの OSA-Express, HiperSockets, Guest-LAN"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2047,19 +2050,19 @@ msgstr ""
 "\"&url-slug-firmware;\">Slug-Firmware site</ulink> で手に入れられます。"
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN はサポートしていますが、インストール中には使用できません。"
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "ワイヤレスネットワークカード"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2076,7 +2079,7 @@ msgstr ""
 "ついての詳細は、<xref linkend=\"loading-firmware\"/> をご覧ください。"
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2087,7 +2090,7 @@ msgstr ""
 "gnu; で動作しますが、インストールの間はサポートされません。"
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2099,7 +2102,7 @@ msgstr ""
 "せん。"
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2117,7 +2120,7 @@ msgstr ""
 "い。"
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2127,21 +2130,21 @@ msgid ""
 "your last resort is to use the <classname>ndiswrapper</classname> package, "
 "which allows you to use a Windows driver.</phrase>"
 msgstr ""
-"いくつかの場合、必要なドライバが &debian; パッケージとして利用できないことがあ"
-"ります。その場合、インターネットから利用できるソースコードがあるかどうか探"
+"いくつかの場合、必要なドライバが &debian; パッケージとして利用できないことが"
+"あります。その場合、インターネットから利用できるソースコードがあるかどうか探"
 "し、自分でドライバをコンパイルする必要があるでしょう。どのように行うかはこの"
 "マニュアルでは扱いません。<phrase arch=\"x86\">利用できる Linux のドライバが"
 "ない場合、Windows のドライバを利用できる <classname>ndiswrapper</classname> "
 "パッケージが最後の楽園になります。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "&arch-title; に対する既知の問題"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2150,13 +2153,13 @@ msgstr ""
 "以下にあえて言及する特定のネットワークカードには、2, 3 の問題があります。"
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip ドライバと dfme ドライバの競合"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2174,7 +2177,7 @@ msgstr ""
 "場合、NIC は動作しないか誤動作します。"
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2188,7 +2191,7 @@ msgstr ""
 "ジュールをブラックリストに入れることで防げます。"
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2206,13 +2209,13 @@ msgstr ""
 "込まれたままになる可能性があることに注意してください。"
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2222,13 +2225,13 @@ msgstr ""
 "動作しません。"
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "点字ディスプレイ"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2246,13 +2249,13 @@ msgstr ""
 "<classname>brltty</classname> のバージョン &brlttyver; を提供しています。"
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "ハードウェア音声合成"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2273,13 +2276,13 @@ msgstr ""
 "classname> のバージョン &speakupver; を提供しています。"
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "周辺機器やその他のハードウェア"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2291,7 +2294,7 @@ msgstr ""
 "らのデバイスが必要なわけではありません。"
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2301,7 +2304,7 @@ msgstr ""
 "かもしれません (<xref linkend=\"hardware-issues\"/> をご覧ください)。"
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2313,7 +2316,7 @@ msgstr ""
 "ulink> をご覧ください。"
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2325,7 +2328,7 @@ msgstr ""
 "トワークからインストールする必要があります。"
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2335,13 +2338,13 @@ msgstr ""
 "ひとつあります。"
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "ファームウェアが必要なデバイス"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2359,7 +2362,7 @@ msgstr ""
 "クコントローラでも、ファームウェアが必要なものがあります。"
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2376,7 +2379,7 @@ msgstr ""
 "free セクションに独立したパッケージとして、利用できることがしばしばあります。"
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2394,13 +2397,13 @@ msgstr ""
 "た詳細情報は、<xref linkend=\"loading-firmware\"/> をご覧ください。"
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "GNU/&arch-kernel; に適したハードウェアの購入"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2416,7 +2419,7 @@ msgstr ""
 "信できるわけですから。"
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2432,7 +2435,7 @@ msgstr ""
 "にはいるかも知れません。"
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2450,13 +2453,13 @@ msgstr ""
 "ハードウェアベンダを支援しましょう。"
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "独占的・閉鎖的なハードウェアを避ける"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2469,7 +2472,7 @@ msgstr ""
 "意) をしない限り、文書を見せてくれないメーカーもあります。"
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2484,13 +2487,13 @@ msgstr ""
 "れば、彼らも &arch-kernel; が重要な市場であると認識するでしょう。"
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Windows に特化したハードウェア"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2514,7 +2517,7 @@ msgstr ""
 "等の機能を持つハードウェア内蔵のものよりも高価になることもあります。"
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2553,7 +2556,7 @@ msgstr ""
 "くなります。"
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can help improve this situation by encouraging these manufacturers to "
@@ -2576,13 +2579,13 @@ msgstr ""
 "です。"
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "インストールに利用できるメディア"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2592,20 +2595,20 @@ msgid ""
 "advantages and disadvantages of each media type. You may want to refer back "
 "to this page once you reach that section."
 msgstr ""
-"本節は、&debian; をインストールするのに、どのメディアを使用するかを決める助けと"
-"なるでしょう。例えば、マシンにフロッピーディスクドライブがあれば、&debian; をイ"
-"ンストールするのに使用することができます。各メディアに対して利点と欠点を挙げ"
-"た、章全体をメディアに費やした章 (<xref linkend=\"install-methods\"/>) があり"
-"ます。その章から、このページをもう一度参照するかもしれません。"
+"本節は、&debian; をインストールするのに、どのメディアを使用するかを決める助け"
+"となるでしょう。例えば、マシンにフロッピーディスクドライブがあれば、&debian; "
+"をインストールするのに使用することができます。各メディアに対して利点と欠点を"
+"挙げた、章全体をメディアに費やした章 (<xref linkend=\"install-methods\"/>) が"
+"あります。その章から、このページをもう一度参照するかもしれません。"
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "フロッピーディスク"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2616,19 +2619,19 @@ msgstr ""
 "う。通常 3.5 インチ高密度 (1440 kB) フロッピードライブがあれば充分です。"
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "CHRP では、フロッピーのサポートは、現在中断しています。"
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2641,7 +2644,7 @@ msgstr ""
 "IDE/ATAPI でもないような、非常に古く非標準な CD-ROM ドライブを除く)"
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2660,7 +2663,7 @@ msgstr ""
 "<xref linkend=\"boot-installer\"/> を参照して一度他の方法で起動してください。"
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2672,7 +2675,7 @@ msgstr ""
 "り下げた情報があります。"
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2682,13 +2685,13 @@ msgstr ""
 "ROM ドライブもサポートしています。"
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "すべての ARM マシンで IDE/ATAPI CD-ROM をサポートしています。"
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2708,13 +2711,13 @@ msgstr ""
 "ます。"
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "ハードディスク"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2726,7 +2729,7 @@ msgstr ""
 "ロードするよう要求します。"
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2736,13 +2739,13 @@ msgstr ""
 "SunOS パーティション (UFS スライス) からインストールすることは可能です。"
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB メモリ"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2752,20 +2755,20 @@ msgid ""
 "This is also useful for small systems which have no room for unnecessary "
 "drives."
 msgstr ""
-"多くの &debian; ボックスではシステムのセットアップやレスキュー用途のみにフロッ"
-"ピー・CD-ROM ドライブが必要です。複数のサーバの操作をしている場合、そんなドラ"
-"イブを省略して USB メモリを使用して、システムのインストールや (必要なら) 修復"
-"することを既に考えていることでしょう。また、不要なドライブを格納する余地のな"
-"い、小さなシステムに対しても便利です。"
+"多くの &debian; ボックスではシステムのセットアップやレスキュー用途のみにフ"
+"ロッピー・CD-ROM ドライブが必要です。複数のサーバの操作をしている場合、そんな"
+"ドライブを省略して USB メモリを使用して、システムのインストールや (必要なら) "
+"修復することを既に考えていることでしょう。また、不要なドライブを格納する余地"
+"のない、小さなシステムに対しても便利です。"
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "ネットワーク"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2784,7 +2787,7 @@ msgstr ""
 "用するようにシステムの設定ができます。"
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2796,7 +2799,7 @@ msgstr ""
 "でしょう。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2806,13 +2809,13 @@ msgstr ""
 "トして、ディスクレスインストールをすることも一つの選択です。"
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x・GNU システム"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2828,13 +2831,13 @@ msgstr ""
 "\"/> へスキップしてください。"
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "サポートする記憶装置"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
@@ -2845,15 +2848,15 @@ msgid ""
 "is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
-"&debian; の起動ディスクには、様々なシステムに最大限対応したカーネルが収められて"
-"います。そのため残念ながら、まったく使われることのないたくさんのドライバが"
+"&debian; の起動ディスクには、様々なシステムに最大限対応したカーネルが収められ"
+"ています。そのため残念ながら、まったく使われることのないたくさんのドライバが"
 "カーネルを肥大化させています<phrase arch=\"linux-any\"> (再構築の仕方は "
 "<xref linkend=\"kernel-baking\"/> をご覧ください)</phrase>。しかし、様々な"
-"ハードウェアへ確実に &debian; をインストールするにはできるだけ幅広いデバイスを"
-"サポートするのが望ましいでしょう。"
+"ハードウェアへ確実に &debian; をインストールするにはできるだけ幅広いデバイス"
+"をサポートするのが望ましいでしょう。"
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
@@ -2861,13 +2864,13 @@ msgid ""
 "SATA and SCSI controllers and drives, USB, and FireWire. The supported file "
 "systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
 msgstr ""
-"一般的に &debian; のインストーラは、フロッピー、 (PATA としても知られる) IDEド"
-"ライブ、IDE フロッピー、パラレルポートの IDE デバイス、SATA や SCSI コント"
+"一般的に &debian; のインストーラは、フロッピー、 (PATA としても知られる) IDE"
+"ドライブ、IDE フロッピー、パラレルポートの IDE デバイス、SATA や SCSI コント"
 "ローラとドライブ、USB、FireWire をサポートしています。サポートしているファイ"
 "ルシステムは、FAT、Win-32 拡張 FAT (VFAT)、NTFS です。"
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2883,7 +2886,7 @@ msgstr ""
 "ご覧ください。"
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2907,7 +2910,7 @@ msgstr ""
 "ulink> をご覧ください。"
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2919,7 +2922,7 @@ msgstr ""
 "をまったくサポートしていないことにご注意ください。"
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2931,7 +2934,7 @@ msgstr ""
 "ポートしていないことにご注意ください。"
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2941,7 +2944,7 @@ msgstr ""
 "ポートされています。"
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2954,13 +2957,13 @@ msgstr ""
 "です。"
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "必要なメモリとディスクスペース"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2974,7 +2977,7 @@ msgstr ""
 "をご覧ください。"
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2992,6 +2995,26 @@ msgstr ""
 "ラを選ぶ選択肢が表示された場合は、前者を選択してください。</para> </footnote>"
 "へのインストールも可能ですが、経験を積んだユーザにのみお勧めします。"
 
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "S/390 や zSeries マシンについての完全な情報は、IBM の レッドブック 2.1 章"
+#~ "内の <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264."
+#~ "pdf\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> か、"
+#~ "<ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/index."
+#~ "html\">zSeries page at the developerWorks</ulink> で見つかります。要する"
+#~ "に、G5, Multiprise 3000, G6 および全 zSeries はフルサポート、Multiprise "
+#~ "2000, G3, G4 はパフォーマンスが低下しますが、IEEE 浮動小数点演算エミュレー"
+#~ "ションでサポートしています。"
+
 #~ msgid "DEC Alpha"
 #~ msgstr "DEC Alpha"
 
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index f19a4dd84..45862c54d 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-03 14:35+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -46,14 +46,14 @@ msgstr ""
 "現在、&debian-gnu; をインストールする最も簡単な方法は、公式 &debian; CD-ROM "
 "セットを使うことです。ベンダからこのセットを購入できます (<ulink url=\"&url-"
 "debian-cd-vendors;\">CD ベンダページ</ulink>をご覧ください)。高速なネットワー"
-"ク接続と CD 書き込み装置があれば、 &debian; ミラーから CD-ROM イメージをダウン"
-"ロードしてもかまいません (詳細説明は <ulink url=\"&url-debian-cd;\">Debian "
-"CD ページ</ulink> をご覧ください)。 &debian; CD セットを持っていて、マシンをこ"
-"の CD から起動できるなら、<xref linkend=\"boot-installer\"/> の項目までスキッ"
-"プできます。多くの人がそれぞれの環境で必要になるであろうファイルを CD に収め"
-"るには、たくさんの労力が費やされています。それでも、バイナリパッケージのフル"
-"セットには、CD が数枚必要です。3 枚以上 CD を使うのが嫌なら、棚の節約になっ"
-"て CD 交換マラソンをしなくてすむ DVD 版を考えてもいいでしょう。"
+"ク接続と CD 書き込み装置があれば、 &debian; ミラーから CD-ROM イメージをダウ"
+"ンロードしてもかまいません (詳細説明は <ulink url=\"&url-debian-cd;\">Debian "
+"CD ページ</ulink> をご覧ください)。 &debian; CD セットを持っていて、マシンを"
+"この CD から起動できるなら、<xref linkend=\"boot-installer\"/> の項目までス"
+"キップできます。多くの人がそれぞれの環境で必要になるであろうファイルを CD に"
+"収めるには、たくさんの労力が費やされています。それでも、バイナリパッケージの"
+"フルセットには、CD が数枚必要です。3 枚以上 CD を使うのが嫌なら、棚の節約に"
+"なって CD 交換マラソンをしなくてすむ DVD 版を考えてもいいでしょう。"
 
 #. Tag: para
 #: install-methods.xml:30
@@ -78,10 +78,10 @@ msgstr ""
 "\">ハードディスク、</phrase> <phrase condition=\"bootable-usb\">usb メモリ、"
 "</phrase> <phrase condition=\"supports-tftp\">ネットブート、</phrase> カーネ"
 "ルを CD から手動起動といった別の方法が使えます。 これらの別法による起動に必要"
-"なファイルも CD にあります。 &debian; ネットワークアーカイブと CD のフォルダ構"
-"成は同じです。 よって、起動に必要となる何らかのファイルの、 アーカイブ中での"
-"ファイルパスが (後述するように) わかっていれば、 CD の同じディレクトリやサブ"
-"ディレクトリからファイルを探せます。"
+"なファイルも CD にあります。 &debian; ネットワークアーカイブと CD のフォルダ"
+"構成は同じです。 よって、起動に必要となる何らかのファイルの、 アーカイブ中で"
+"のファイルパスが (後述するように) わかっていれば、 CD の同じディレクトリやサ"
+"ブディレクトリからファイルを探せます。"
 
 #. Tag: para
 #: install-methods.xml:52
@@ -126,8 +126,8 @@ msgid ""
 "url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "もっとも近い (そしておそらくもっとも速い) ミラーサイトを探すには、 <ulink "
-"url=\"&url-debian-mirrors;\">&debian; ミラーサイト一覧</ulink> を参照してくださ"
-"い。"
+"url=\"&url-debian-mirrors;\">&debian; ミラーサイト一覧</ulink> を参照してくだ"
+"さい。"
 
 #. Tag: para
 #: install-methods.xml:90
@@ -136,9 +136,9 @@ msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
 msgstr ""
-"&debian; ミラーサイトから FTP でファイルをダウンロードする際は、必ず <emphasis>"
-"バイナリ(binary)</emphasis> モードでファイルをダウンロードしてください。テキ"
-"スト (text) モードや自動選択モードではだめです。"
+"&debian; ミラーサイトから FTP でファイルをダウンロードする際は、必ず "
+"<emphasis>バイナリ(binary)</emphasis> モードでファイルをダウンロードしてくだ"
+"さい。テキスト (text) モードや自動選択モードではだめです。"
 
 #. Tag: title
 #: install-methods.xml:98
@@ -618,8 +618,8 @@ msgid ""
 msgstr ""
 "公式 &debian-gnu; CD にあったファイルからフロッピーイメージを作る場合は、 "
 "Type と Creator は既に適切な値になっています。 ここに示す <command>Creator-"
-"Changer</command> の作業は、イメージファイルを &debian; ミラーからダウンロード"
-"した場合でのみ必要となります。"
+"Changer</command> の作業は、イメージファイルを &debian; ミラーからダウンロー"
+"ドした場合でのみ必要となります。"
 
 #. Tag: para
 #: install-methods.xml:435
@@ -1005,9 +1005,9 @@ msgstr ""
 "\"powerpc\">HFS ファイルシステムの</phrase> USB メモリをマウントし <phrase "
 "arch=\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</"
 "userinput>)</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-"<replaceable>sdX2</replaceable> /mnt</userinput>)</phrase>、そこに &debian; の "
-"netinst か businesscard の ISO イメージをコピーしてください。USB メモリをアン"
-"マウント (<userinput>umount /mnt</userinput>) すると完了です。"
+"<replaceable>sdX2</replaceable> /mnt</userinput>)</phrase>、そこに &debian; "
+"の netinst か businesscard の ISO イメージをコピーしてください。USB メモリを"
+"アンマウント (<userinput>umount /mnt</userinput>) すると完了です。"
 
 #. Tag: title
 #: install-methods.xml:663
@@ -1168,8 +1168,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> グラフィカルインストーラ用には、2 行目に "
-"<userinput>vga=788</userinput> を追加すると良いでしょ"
-"う。"
+"<userinput>vga=788</userinput> を追加すると良いでしょう。"
 
 #. Tag: para
 #: install-methods.xml:768
@@ -1548,7 +1547,7 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "以下のファイルを、 &debian; アーカイブからあなたのハードディスクの適当な場所 "
@@ -1616,15 +1615,15 @@ msgid ""
 "active System Folder."
 msgstr ""
 "<application>BootX</application> の配布パッケージを <ulink url=\"&url-"
-"powerpc-bootx;\"></ulink> から、 または &debian; http/ftp ミラーや 公式 &debian; "
-"CD の <filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"ディレクトリから入手して、unstuff してください。 アーカイブから取り出すには "
-"<application>Stuffit Expander</application> を使ってください。 パッケージの中"
-"には、<filename>Linux Kernels</filename> という名前の空のフォルダがありま"
-"す。 <filename>linux.bin</filename> と <filename>ramdisk.image.gz</filename> "
-"を <filename>disks-powerpc/current/powermac</filename> フォルダからダウンロー"
-"ドし、 これらを <filename>Linux Kernels</filename> フォルダに置いてくださ"
-"い。 その後、<filename>Linux Kernels</filename> フォルダをアクティブな "
+"powerpc-bootx;\"></ulink> から、 または &debian; http/ftp ミラーや 公式 "
+"&debian; CD の <filename>dists/woody/main/disks-powerpc/current/powermac</"
+"filename> ディレクトリから入手して、unstuff してください。 アーカイブから取り"
+"出すには <application>Stuffit Expander</application> を使ってください。 パッ"
+"ケージの中には、<filename>Linux Kernels</filename> という名前の空のフォルダが"
+"あります。 <filename>linux.bin</filename> と <filename>ramdisk.image.gz</"
+"filename> を <filename>disks-powerpc/current/powermac</filename> フォルダから"
+"ダウンロードし、 これらを <filename>Linux Kernels</filename> フォルダに置いて"
+"ください。 その後、<filename>Linux Kernels</filename> フォルダをアクティブな "
 "System Folder に置いてください。"
 
 #. Tag: title
@@ -1663,8 +1662,8 @@ msgid ""
 "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
 "each file to the hard drive icon)."
 msgstr ""
-"前に &debian; アーカイブからダウンロードした次に示すファイルを、 ハードドライブ"
-"の root 階層に <emphasis>コピー</emphasis> (移動では駄目) してください (各"
+"前に &debian; アーカイブからダウンロードした次に示すファイルを、 ハードドライ"
+"ブの root 階層に <emphasis>コピー</emphasis> (移動では駄目) してください (各"
 "ファイルを、 <keycap>option</keycap> を押しながらハードドライブアイコンにド"
 "ラッグします)。"
 
@@ -1792,7 +1791,8 @@ msgid ""
 "is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "古い HPPA マシンのいくつか (例えば 715/75) は、BOOTP ではなく RBOOTD を使いま"
-"す。 &debian; には <classname>rbootd</classname> パッケージが用意されています。"
+"す。 &debian; には <classname>rbootd</classname> パッケージが用意されていま"
+"す。"
 
 #. Tag: para
 #: install-methods.xml:1157
@@ -2210,8 +2210,8 @@ msgid ""
 "to check these log messages in case of boot problems as they are a good "
 "starting point for diagnosing the cause of errors."
 msgstr ""
-"&debian; で利用できる <command>in.tftpd</command> の代替はすべて、デフォルトで "
-"TFTP リクエストをシステムログに出力します。いくつかは、出力を冗長にする "
+"&debian; で利用できる <command>in.tftpd</command> の代替はすべて、デフォルト"
+"で TFTP リクエストをシステムログに出力します。いくつかは、出力を冗長にする "
 "<userinput>-v</userinput> 引数をサポートしています。ブート時に問題がある場"
 "合、エラーの原因を診断する出発点として、ログメッセージをチェックすることをお"
 "勧めします。"
@@ -2233,8 +2233,8 @@ msgid ""
 "</screen></informalexample> to adjust the range of source ports the Linux "
 "TFTP server uses."
 msgstr ""
-"SGI マシンに &debian; をインストールする際、 TFTP サーバが Linux 2.4 で動作して"
-"いる GNU/Linux の場合は、 次の設定を行う必要があります。 "
+"SGI マシンに &debian; をインストールする際、 TFTP サーバが Linux 2.4 で動作し"
+"ている GNU/Linux の場合は、 次の設定を行う必要があります。 "
 "<informalexample><screen>\n"
 "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
 "</screen></informalexample> これを行わないと、SGI の PROM はカーネルをダウン"
@@ -2431,10 +2431,10 @@ msgid ""
 "\">FAI home page</ulink> for detailed information."
 msgstr ""
 "複数のコンピュータにインストールするため、完全自動インストールが可能です。 こ"
-"のための &debian; パッケージは、 <classname>fai</classname> (インストールサーバ"
-"を使う場合), <classname>replicator</classname>, <classname>systemimager</"
-"classname>, <classname>autoinstall</classname>, それに &debian; インストーラそ"
-"のものです。"
+"のための &debian; パッケージは、 <classname>fai</classname> (インストールサー"
+"バを使う場合), <classname>replicator</classname>, <classname>systemimager</"
+"classname>, <classname>autoinstall</classname>, それに &debian; インストーラ"
+"そのものです。"
 
 #. Tag: title
 #: install-methods.xml:1603
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index 36e0577b5..7a2693d72 100644
--- a/po/ja/preparing.po
+++ b/po/ja/preparing.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-03 14:43+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -28,9 +28,9 @@ msgid ""
 "even boot the installer. This includes backing up your data, gathering "
 "information about your hardware, and locating any necessary information."
 msgstr ""
-"本章は、インストーラを起動する前の、&debian; をインストールする準備について扱い"
-"ます。ここでは、データのバックアップ、ハードウェアに関する情報収集、必要な情"
-"報の特定といったことを含みます。"
+"本章は、インストーラを起動する前の、&debian; をインストールする準備について扱"
+"います。ここでは、データのバックアップ、ハードウェアに関する情報収集、必要な"
+"情報の特定といったことを含みます。"
 
 #. Tag: title
 #: preparing.xml:19
@@ -46,9 +46,9 @@ msgid ""
 "that will require a complete re-installation of your system is very rare; "
 "perhaps mechanical failure of the hard disk would be the most common case."
 msgstr ""
-"はじめに、再インストールについて述べておきます。&debian;で、システムの完全な再"
-"インストールが必要になる状況は、非常にまれです。おそらく、もっともありそうな"
-"ケースはハードディスクの機械的な故障でしょう。"
+"はじめに、再インストールについて述べておきます。&debian;で、システムの完全な"
+"再インストールが必要になる状況は、非常にまれです。おそらく、もっともありそう"
+"なケースはハードディスクの機械的な故障でしょう。"
 
 #. Tag: para
 #: preparing.xml:27
@@ -396,9 +396,9 @@ msgid ""
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
-"現在ご覧になっている文書は、&debian; の &releasename; リリース用インストールガ"
-"イドの正式版です。これは <ulink url=\"&url-release-area;/installmanual\">様々"
-"な形式と様々な言語</ulink> で利用できます。"
+"現在ご覧になっている文書は、&debian; の &releasename; リリース用インストール"
+"ガイドの正式版です。これは <ulink url=\"&url-release-area;/installmanual\">"
+"様々な形式と様々な言語</ulink> で利用できます。"
 
 #. Tag: para
 #: preparing.xml:261
@@ -408,9 +408,9 @@ msgid ""
 "Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
-"現在ご覧になっている文書は、&debian; の次期リリース用インストールガイドの開発版"
-"です。これは <ulink url=\"&url-d-i-alioth-manual;\">様々な形式と様々な言語</"
-"ulink> で利用できます。"
+"現在ご覧になっている文書は、&debian; の次期リリース用インストールガイドの開発"
+"版です。これは <ulink url=\"&url-d-i-alioth-manual;\">様々な形式と様々な言語"
+"</ulink> で利用できます。"
 
 #. Tag: title
 #: preparing.xml:273
@@ -453,21 +453,18 @@ msgstr "&arch-title; ハードウェアリファレンス"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"&arch-title; に 2.4 カーネルの Linux をインストールするための説明と、デバイス"
-"ドライバ (DASD, XPRAM, コンソール, テープ, z90 crypto, chandev, ネットワー"
-"ク) に関する情報です。"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Device Drivers and Installation Commands"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -477,13 +474,13 @@ msgstr ""
 "た IBM の仕様書です。"
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux for &arch-title;"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
@@ -491,23 +488,23 @@ msgid ""
 "same across all &arch-title; distributions."
 msgstr ""
 "メインフレームで使える Linux ディストリビューションについて説明した IBM の仕"
-"様書です。&debian; に関する章はありませんが、基本的なインストールの考え方はすべ"
-"ての &arch-title; ディストリビューションで同じです。"
+"様書です。&debian; に関する章はありませんが、基本的なインストールの考え方はす"
+"べての &arch-title; ディストリビューションで同じです。"
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "ハードウェア情報の取得先"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -518,19 +515,19 @@ msgstr ""
 "し、準備としてインストール前にハードウェアに習熟することをお勧めします。"
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "ハードウェアの情報は次のようなところから集められます。"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "各ハードウェアに付属してきたマニュアル。"
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -542,19 +539,19 @@ msgstr ""
 "さい。<keycap>Delete</keycap> キーの場合が多いようです。"
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "各ハードウェアのケースや箱。"
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Windows のコントロールパネルの「システム」ウィンドウ。"
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -566,7 +563,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -576,175 +573,175 @@ msgstr ""
 "は、ネットワークや電子メールに関する設定情報が得られます。"
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "インストールに必要なハードウェア情報"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "ハードウェア"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "必要な情報"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "ハードディスク"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "ドライブの台数"
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "システムでの接続順序"
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "IDE (PATA としても知られる)、SATA、SCSI のどれか"
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "利用できる空き領域"
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "パーティション"
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "他の OS がインストールされているパーティション"
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "モニタ"
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "メーカーと型番"
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "サポートする解像度"
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "水平同期周波数"
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "垂直同期周波数"
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "サポートする色深度 (色数)"
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "スクリーンサイズ"
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "マウス"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "形式: シリアル, PS/2, USB のいずれか"
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "ポート"
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "メーカー"
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "ボタンの数"
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "ネットワーク"
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "アダプタの形式"
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "プリンタ"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "サポートする印刷解像度"
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "ビデオカード"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "利用できるビデオ RAM"
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -752,37 +749,37 @@ msgid ""
 msgstr "サポートする解像度と色深度 (モニタの機能もチェックすること)"
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "デバイス番号"
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "デバイス番号"
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "OSA カードの相対アダプタ番号"
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "ハードウェア互換性"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -796,7 +793,7 @@ msgstr ""
 "いません。"
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -806,7 +803,7 @@ msgstr ""
 "アを動かすことはできません。"
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -820,7 +817,7 @@ msgstr ""
 "従って、すぐに古いものになってしまいます。"
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -830,19 +827,19 @@ msgstr ""
 "かし他にも、プリンタなどに Windows に特化したものがあります。"
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "以下のようにハードウェアの互換性をチェックできます。"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "新しいドライバが出ていないか、メーカーの web サイトを調べます。"
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -852,7 +849,7 @@ msgstr ""
 "ンドの場合、もっと有名なブランドのドライバや設定が使えることもあります。"
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -862,19 +859,19 @@ msgstr ""
 "トで調べます。"
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "他に使ったことのあるユーザがいないか、インターネットで調べます。"
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "ネットワークの設定"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -886,31 +883,31 @@ msgstr ""
 "ク管理者に以下の情報を尋ねておかなければなりません。"
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "ホスト名 (自分で決められるかもしれません)"
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "ドメイン名"
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "コンピュータの IP アドレス"
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "ネットワークのネットマスク"
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -920,7 +917,7 @@ msgstr ""
 "フォルトゲートウェイシステムの IP アドレス"
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -928,7 +925,7 @@ msgid ""
 msgstr "DNS (Domain Name Service) サーバとして使用するネットワーク上のホスト"
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -941,31 +938,31 @@ msgstr ""
 "ん。"
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "ワイヤレスネットワークが使用できるなら以下の情報も探さねばなりません。"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "ワイヤレスネットワークの ESSID"
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "(適用できるなら) WEP セキュリティキー"
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "必要な最低限のハードウェア"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -977,7 +974,7 @@ msgstr ""
 "う。"
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -989,14 +986,14 @@ msgstr ""
 "合は、結局不満を感じる可能性が高くなってしまうと思います。"
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "デスクトップシステムには最低 Pentium 4, 1GHz をお勧めします。"
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
@@ -1004,96 +1001,103 @@ msgstr ""
 "でも充分でしょう。"
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "最低限必要なシステム (推奨値)"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "インストールタイプ"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (最小)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (推奨)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "ハードディスク"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "デスクトップなし"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 メガバイト"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 メガバイト"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 ギガバイト"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "デスクトップあり"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 メガバイト"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 メガバイト"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 ギガバイト"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "実際に必要な最小メモリはこの表に挙げた物よりも少なくなります。アーキテクチャ"
-"に依存しますが、最小 20MB (s390) から 60MB (amd64) で &debian; をインス"
-"トールできます。必要なディスクスペースにも同じことが言え、特にインストールす"
-"るアプリケーションを選択する場合、必要なディスクスペースについての追加情報"
-"は、<xref linkend=\"tasksel-size-list\"/> をご覧ください。"
+"に依存しますが、最小 20MB (s390) から 60MB (amd64) で &debian; をインストール"
+"できます。必要なディスクスペースにも同じことが言え、特にインストールするアプ"
+"リケーションを選択する場合、必要なディスクスペースについての追加情報は、"
+"<xref linkend=\"tasksel-size-list\"/> をご覧ください。"
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1110,7 +1114,7 @@ msgstr ""
 "<classname>wmaker</classname> が含まれますが、他にも選択できます。"
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1121,7 +1125,7 @@ msgstr ""
 "的なメモリやディスク領域を与えるのは実際には不可能です。"
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1133,7 +1137,7 @@ msgstr ""
 "保しておくに越したことはありません。"
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1148,22 +1152,22 @@ msgid ""
 msgstr ""
 "&debian-gnu; システムを円滑に操作するのに必要なディスクスペースについては、お"
 "勧めするシステム要件で考慮されています。特に、<filename>/var</filename> パー"
-"ティションには、ログファイルのような一般的な内容に加え、&debian; 特有の状態情報"
-"が多く置かれます。<command>dpkg</command> のファイル (インストールされたパッ"
-"ケージすべてに関する情報) は、簡単に 40MB を消費します。また <command>apt-"
-"get</command> は、インストールする前にダウンロードしたパッケージをここに置き"
-"ます。<filename>/var</filename> には最低 200MB は割り当てておくべきですし、グ"
-"ラフィカルデスクトップ環境をインストールする場合には、もっと割り当てるべきで"
-"しょう。"
+"ティションには、ログファイルのような一般的な内容に加え、&debian; 特有の状態情"
+"報が多く置かれます。<command>dpkg</command> のファイル (インストールされた"
+"パッケージすべてに関する情報) は、簡単に 40MB を消費します。また "
+"<command>apt-get</command> は、インストールする前にダウンロードしたパッケージ"
+"をここに置きます。<filename>/var</filename> には最低 200MB は割り当てておくべ"
+"きですし、グラフィカルデスクトップ環境をインストールする場合には、もっと割り"
+"当てるべきでしょう。"
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "マルチブートシステムでの事前パーティション分割"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1177,7 +1181,7 @@ msgstr ""
 "いというわけです。"
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1189,39 +1193,40 @@ msgstr ""
 "場合 <quote>マシン</quote> は LPAR や VM ゲストと置き換えてください。"
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Linux on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Linux systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
+#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> and want to stick Linux on the same disk, you "
+#| "will need to repartition the disk. Debian requires its own hard disk "
+#| "partitions. It cannot be installed on Windows or MacOS partitions. It may "
+#| "be able to share some partitions with other Linux systems, but that's not "
+#| "covered here. At the very least you will need a dedicated partition for "
+#| "the Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "システム上に既にオペレーティングシステム <phrase arch=\"x86\"> (Windows 9x, "
-"Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
-"<phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> が入っていて、"
-"同じディスクに Linux も入れたい場合には、ディスクのパーティション分割をやり直"
-"す必要があります。Linux は Windows や MacOS のパーティションにはインストール"
-"できません。他の Linux システムとはパーティションを共有することも可能かもしれ"
-"ませんが、ここではそれは取り扱いません。少なくとも、&debian; の root には専用の"
-"パーティションが必要となります。"
+"Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
+"phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> が入っ"
+"ていて、同じディスクに Linux も入れたい場合には、ディスクのパーティション分割"
+"をやり直す必要があります。Linux は Windows や MacOS のパーティションにはイン"
+"ストールできません。他の Linux システムとはパーティションを共有することも可能"
+"かもしれませんが、ここではそれは取り扱いません。少なくとも、&debian; の root "
+"には専用のパーティションが必要となります。"
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can find information about your current partition setup by using a "
@@ -1245,7 +1250,7 @@ msgstr ""
 "必ず既存のパーティションを (変更せずに) 表示する機能が付いています。"
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1260,13 +1265,13 @@ msgstr ""
 "を動かす前には、家具が壊れないよう、それらは前もってどけておくでしょう?"
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: HP-UX のディスクについては?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
@@ -1274,13 +1279,13 @@ msgid ""
 "that disk before booting the installation system; the installer's included "
 "partitioning program can handle the job nicely."
 msgstr ""
-"コンピュータに 2 台以上のハードディスクがある場合は、その内の 1 台を &debian; "
-"専用にするといいかもしれません。そうすれば、インストールシステムの起動前に "
-"パーティション分割を行う必要はありません。インストーラに含まれているパーティ"
-"ション分割プログラムが、この仕事を的確にこなしてくれます。"
+"コンピュータに 2 台以上のハードディスクがある場合は、その内の 1 台を "
+"&debian; 専用にするといいかもしれません。そうすれば、インストールシステムの起"
+"動前に パーティション分割を行う必要はありません。インストーラに含まれている"
+"パーティション分割プログラムが、この仕事を的確にこなしてくれます。"
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1308,7 +1313,7 @@ msgstr ""
 "しょうが。"
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
@@ -1319,14 +1324,14 @@ msgid ""
 "force you to partition before installing anyway."
 msgstr ""
 "既にコンピュータに複数のパーティションがあり、それらの一部を消したり置き換え"
-"たりすることによって充分な空き領域が確保できる場合にも、&debian; インストーラの"
-"パーティション分割プログラムで作業を行って構いません。しかしこの場合でも、以"
-"降の内容は目を通しておきましょう。パーティションマップ中の現在のパーティショ"
-"ンの並び順などによって、いずれにしてもインストール前にパーティション分割作業"
-"をしなければならないような場合もあり得るからです。"
+"たりすることによって充分な空き領域が確保できる場合にも、&debian; インストーラ"
+"のパーティション分割プログラムで作業を行って構いません。しかしこの場合でも、"
+"以降の内容は目を通しておきましょう。パーティションマップ中の現在のパーティ"
+"ションの並び順などによって、いずれにしてもインストール前にパーティション分割"
+"作業をしなければならないような場合もあり得るからです。"
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1334,11 +1339,11 @@ msgid ""
 "filesystem."
 msgstr ""
 "DOS や Windows で使用していて、マシンに FAT・NTFS ファイルシステムがある場"
-"合、&debian; インストーラのパーティション分割プログラムでファイルシステムをリサ"
-"イズできます (時間がかかりますが)。"
+"合、&debian; インストーラのパーティション分割プログラムでファイルシステムをリ"
+"サイズできます (時間がかかりますが)。"
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
@@ -1359,7 +1364,7 @@ msgstr ""
 "い。"
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
 msgid ""
 "If you are going to install more than one operating system on the same "
@@ -1368,14 +1373,14 @@ msgid ""
 "ability to start &debian;, or encourage you to reformat non-native "
 "partitions."
 msgstr ""
-"同じマシンに複数の OS をインストールするつもりでしたら、&debian; をインストール"
-"する前に、他の OS を全部先にインストールしておきましょう。Windows などの他の "
-"OS をインストールすると、&debian; を起動する機能が破壊されてしまったり、あるい"
-"はその OS のものでないパーティションをフォーマットし直すよう促されたりするか"
-"らです。"
+"同じマシンに複数の OS をインストールするつもりでしたら、&debian; をインストー"
+"ルする前に、他の OS を全部先にインストールしておきましょう。Windows などの他"
+"の OS をインストールすると、&debian; を起動する機能が破壊されてしまったり、あ"
+"るいはその OS のものでないパーティションをフォーマットし直すよう促されたりす"
+"るからです。"
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1386,7 +1391,7 @@ msgstr ""
 "できます。"
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
@@ -1419,7 +1424,7 @@ msgstr ""
 "えることができます。"
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
@@ -1427,17 +1432,17 @@ msgid ""
 "and &debian;, you will need to:"
 msgstr ""
 "現在ディスクがひとつ、パーティションもひとつ (デスクトップコンピュータだと普"
-"通の設定) になっていて、元の OS と &debian; とのデュアルブートにしたい場合は、"
-"以下の手順を踏む必要があります。"
+"通の設定) になっていて、元の OS と &debian; とのデュアルブートにしたい場合"
+"は、以下の手順を踏む必要があります。"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "コンピュータのすべてをバックアップする。"
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1450,7 +1455,7 @@ msgstr ""
 "しっぱなしにして、強制的に CD をアクティブな MacOS にする。</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1460,13 +1465,13 @@ msgstr ""
 "作る。&debian-gnu; 用にも場所埋めのパーティションか、空き領域を作る。"
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "その OS を、新しくつくったパーティションにインストールする。"
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
@@ -1476,19 +1481,19 @@ msgstr ""
 "&debian; インストーラの起動ファイルをダウンロードする。"
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "&debian; インストーラを起動して、&debian; のインストールを続ける。"
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "DOS や Windows からのパーティション分割"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
@@ -1499,11 +1504,11 @@ msgstr ""
 "既存の FAT もしくは NTFS パーティションを扱う場合には、以降で説明する方法を用"
 "いるか、あるいは Windows や DOS のツールを用いることをお勧めします。扱わない"
 "場合には、DOS や Windows からパーティションを分割する必要はまったくありませ"
-"ん。一般的に &debian; 上のパーティション分割ツールを使えば、より適切に作業が行"
-"えます。"
+"ん。一般的に &debian; 上のパーティション分割ツールを使えば、より適切に作業が"
+"行えます。"
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1516,45 +1521,46 @@ msgid ""
 msgstr ""
 "ただし大きな IDE ディスクを用いる場合で、LBA アドレスも、オーバーレイドライ"
 "バ (HDD のメーカーから提供されることが時々あります) も、ラージディスクアクセ"
-"ス拡張をサポートした新しい (1998 年以降の) BIOS もないときには、&debian; のブー"
-"トパーティションは注意して配置しなければなりません。このような場合、ブート"
-"パーティションをハードディスクの先頭 1024 シリンダ以内に収めなければなりませ"
-"ん (これは BIOS 変換がなければ、通常 524 メガバイトになります)。これはすなわ"
-"ち、既存の FAT パーティションや NTFS パーティションを移動しないといけないこと"
-"を意味します。"
+"ス拡張をサポートした新しい (1998 年以降の) BIOS もないときには、&debian; の"
+"ブートパーティションは注意して配置しなければなりません。このような場合、ブー"
+"トパーティションをハードディスクの先頭 1024 シリンダ以内に収めなければなりま"
+"せん (これは BIOS 変換がなければ、通常 524 メガバイトになります)。これはすな"
+"わち、既存の FAT パーティションや NTFS パーティションを移動しないといけないこ"
+"とを意味します。"
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "DOS, Windows, OS/2 から無駄なくパーティションを切り直す"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "よくあるインストールのかたちとして、すでに DOS (Windows3.1 も含む), Win32 "
-"(Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7), OS/2 などが入っているシステムに新たに "
-"&debian; をインストールする場合、既存のシステムを壊すことなく、同じディスクに "
-"&debian; を入れるという需要があります。DOS や Windows で使用する、FAT ファイル"
-"システム・NTFS ファイルシステムのリサイズをインストーラはサポートしていること"
-"に注意してください。単にインストーラを起動し、パーティション分割の段階に来た"
-"ら、<menuchoice> <guimenuitem>手動</guimenuitem> </menuchoice> パーティション"
-"分割を選択し、リサイズするパーティションを選択、その後、新しいサイズを指定し"
-"てください。ほとんどの場合、以下の方法を使う必要はありません。"
+"(Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7), OS/2 などが入っているシス"
+"テムに新たに &debian; をインストールする場合、既存のシステムを壊すことなく、"
+"同じディスクに &debian; を入れるという需要があります。DOS や Windows で使用す"
+"る、FAT ファイルシステム・NTFS ファイルシステムのリサイズをインストーラはサ"
+"ポートしていることに注意してください。単にインストーラを起動し、パーティショ"
+"ン分割の段階に来たら、<menuchoice> <guimenuitem>手動</guimenuitem> </"
+"menuchoice> パーティション分割を選択し、リサイズするパーティションを選択、そ"
+"の後、新しいサイズを指定してください。ほとんどの場合、以下の方法を使う必要は"
+"ありません。"
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
@@ -1566,12 +1572,12 @@ msgid ""
 msgstr ""
 "先に進む前に、ディスクをどのように分割するのか決めておかなければなりません。"
 "この節では 1 つのパーティションを 2 つに分割する方法のみ説明します。そのうち "
-"1 つには既存の OS を残し、もう 1 つを &debian; で利用します。なお、&debian; に割"
-"り当てたディスク領域を、どの用途 (スワップかファイルシステムか) にどのくらい"
-"ずつ割り当てるかは、&debian; インストールの途中で決定できます。"
+"1 つには既存の OS を残し、もう 1 つを &debian; で利用します。なお、&debian; "
+"に割り当てたディスク領域を、どの用途 (スワップかファイルシステムか) にどのく"
+"らいずつ割り当てるかは、&debian; インストールの途中で決定できます。"
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1589,23 +1595,32 @@ msgstr ""
 "に書き込まれないようにするのが大切です。"
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
-msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+#: preparing.xml:983
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The first thing needed is a copy of <command>fips</command> which is "
+#| "available in the <filename>tools/</filename> directory on your nearest "
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
+#| "filename> to a bootable floppy. A bootable floppy can be created using "
+#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
+#| "command> comes with very good documentation which you may want to read. "
+#| "You will definitely need to read the documentation if you use a disk "
+#| "compression driver or a disk manager. Create the disk and read the "
+#| "documentation <emphasis>before</emphasis> you defragment the disk."
+msgid ""
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "まず最初に必要となるのは、<command>fips</command> のコピーです。これはお近く"
-"の &debian; ミラーサイトの <filename>tools/</filename> ディレクトリから入手でき"
-"ます。そのアーカイブを unzip して、<filename>RESTORRB.EXE</filename>, "
+"の &debian; ミラーサイトの <filename>tools/</filename> ディレクトリから入手で"
+"きます。そのアーカイブを unzip して、<filename>RESTORRB.EXE</filename>, "
 "<filename>FIPS.EXE</filename>, <filename>ERRORS.TXT</filename> の各ファイルを"
 "起動可能なフロッピーにコピーしてください。起動可能なフロッピーは、DOS 上で "
 "<filename>sys a:</filename> というコマンドを用いれば作成できます。"
@@ -1616,7 +1631,7 @@ msgstr ""
 "ントを読んでください。"
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1636,7 +1651,7 @@ msgstr ""
 "ポートする) を認識できないからです。"
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1649,7 +1664,7 @@ msgstr ""
 "ち込んで、その指示にしたがってください。"
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1659,13 +1674,13 @@ msgstr ""
 "管理ソフトウェアはたくさんあることを心に留めておいてください。"
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "DOS のパーティションを分割する"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1675,13 +1690,13 @@ msgid ""
 "weird errors in DOS or Windows."
 msgstr ""
 "DOS のドライブにパーティションを作成したり、DOS パーティションの容量を変更し"
-"たりする作業を &debian; のツールで行うと、その結果できた FAT パーティションでの"
-"作業に問題が残ることがあるようです。例えば DOS や Windows 上でパフォーマンス"
-"が落ちたり、<command>scandisk</command> で整合性の問題が起きたり、その他原因"
-"不明のエラーに遭遇したりといった報告例があります。"
+"たりする作業を &debian; のツールで行うと、その結果できた FAT パーティションで"
+"の作業に問題が残ることがあるようです。例えば DOS や Windows 上でパフォーマン"
+"スが落ちたり、<command>scandisk</command> で整合性の問題が起きたり、その他原"
+"因不明のエラーに遭遇したりといった報告例があります。"
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1691,23 +1706,23 @@ msgid ""
 msgstr ""
 "どうやら DOS で使用するパーティションを作成したりその容量を変更したりする場合"
 "は、その最初のいくつかのセクタを 0 で埋めておくのが良いようです。DOS の "
-"<command>format</command> コマンドを実行する前に、&debian; から次のコマンドを実"
-"行してください。"
+"<command>format</command> コマンドを実行する前に、&debian; から次のコマンドを"
+"実行してください。"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "SunOS からのパーティション分割"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
@@ -1718,20 +1733,20 @@ msgid ""
 "iso9660 (CDROM) partitions."
 msgstr ""
 "SunOS で行えば、パーティション作成はまったく問題なく行えます。同一のマシン上"
-"で SunOS と &debian; を運用する場合は、&debian; をインストールする前に、SunOS を"
-"用いてパーティションを作成しておくことをお勧めします。Linux カーネルは Sun の"
-"ディスクラベルを認識できますので、この方法で問題ありません。SILO は、EXT2 "
-"(Linux), UFS (SunOS), romfs, iso9660 (CDROM) のいずれかのパーティションから "
-"Linux および SunOS を起動できます。"
+"で SunOS と &debian; を運用する場合は、&debian; をインストールする前に、"
+"SunOS を用いてパーティションを作成しておくことをお勧めします。Linux カーネル"
+"は Sun のディスクラベルを認識できますので、この方法で問題ありません。SILO "
+"は、EXT2 (Linux), UFS (SunOS), romfs, iso9660 (CDROM) のいずれかのパーティ"
+"ションから Linux および SunOS を起動できます。"
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Linux や他の OS からのパーティション分割"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1754,7 +1769,7 @@ msgstr ""
 "るでしょう。"
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1768,13 +1783,13 @@ msgstr ""
 "<xref linkend=\"partitioning\"/> をご覧ください。"
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "MacOS/OSX のパーティション分割"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1790,7 +1805,7 @@ msgstr ""
 "<application>Drive Setup</application> からは見えません。"
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1802,7 +1817,7 @@ msgstr ""
 "から、一度消して置き換えることになりますので、タイプは何でも構いません。"
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1829,7 +1844,7 @@ msgstr ""
 "できます。"
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1848,13 +1863,13 @@ msgstr ""
 "でサポートされています。"
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "インストール前に行うハードウェア・OS の設定"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1865,8 +1880,8 @@ msgid ""
 "hardware issues affecting the reliability of &debian-gnu; on your system are "
 "also highlighted."
 msgstr ""
-"この節では、&debian; のインストールに先立って必要となるハードウェアの設定につい"
-"て見ていきます。通常この作業では、システムのファームウェアの設定をチェック"
+"この節では、&debian; のインストールに先立って必要となるハードウェアの設定につ"
+"いて見ていきます。通常この作業では、システムのファームウェアの設定をチェック"
 "し、場合によってはその設定を変更することになります。<quote>ファームウェア</"
 "quote>は、ハードウェアが利用する中核的なソフトウェアで、電源投入後のブートプ"
 "ロセスの間に起動される、最も重要なものです。あなたが使うことになる &debian-"
@@ -1874,13 +1889,13 @@ msgstr ""
 "り扱っていく予定です。"
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOS 設定メニューの起動"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
@@ -1898,7 +1913,7 @@ msgstr ""
 "トールができなくなるかもしれません。"
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1912,13 +1927,13 @@ msgstr ""
 "ニューの呼び出し方は、BIOS ソフトウェアの製造者によって異なります。"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr ""
@@ -1926,13 +1941,13 @@ msgstr ""
 "<keycap>Delete</keycap> キーを押す"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1943,25 +1958,25 @@ msgstr ""
 "す"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "POST の表示中に、<keycap>Esc</keycap> キーを押す"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -1973,13 +1988,13 @@ msgstr ""
 "keycap><keycap>Insert</keycap> </keycombo> を押す"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1991,7 +2006,7 @@ msgstr ""
 "keycap><keycap>S</keycap> </keycombo> または <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2001,7 +2016,7 @@ msgstr ""
 "\"></ulink> にあります。"
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2017,13 +2032,13 @@ msgstr ""
 "\"></ulink> を探してみましょう。"
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "ブートデバイスの選択"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
@@ -2040,11 +2055,11 @@ msgstr ""
 "て CD-ROM デバイスがあるならそこから (おそらく <filename>D:</filename> や "
 "<filename>E:</filename> でしょう)、そして続いて <filename>C:</filename> (最初"
 "のハードディスク) から探すようにします。この設定なら、フロッピーディスクから"
-"も CD-ROM からも起動できます。&debian; のインストールに最も良く用いられるのはこ"
-"の両者ですから。"
+"も CD-ROM からも起動できます。&debian; のインストールに最も良く用いられるのは"
+"この両者ですから。"
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2056,7 +2071,7 @@ msgstr ""
 "BIOS で CD-ROM からのブートを有効にするだけです。"
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2072,7 +2087,7 @@ msgstr ""
 "BIOS の設定をする必要があるかもしれません。"
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2084,13 +2099,13 @@ msgstr ""
 "るようにしておきましょう。"
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "IDE コンピュータで起動順序を変更する"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2102,7 +2117,7 @@ msgstr ""
 "ハードウェアの文書で確認してください。"
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2113,7 +2128,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr ""
@@ -2121,13 +2136,13 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C はハードディスクで、A はフロッピードライブです。"
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2139,7 +2154,7 @@ msgstr ""
 "指定できる選択肢が順に現れます。"
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2147,13 +2162,13 @@ msgid ""
 msgstr "変更を保存します。保存方法は画面の説明に従ってください。"
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "SCSI コンピュータで起動順序を変更する"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
@@ -2162,7 +2177,7 @@ msgstr ""
 "ださい。"
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2172,7 +2187,7 @@ msgstr ""
 "り、BIOS メニューの起動方法に関するメッセージが出た後になります。"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2184,13 +2199,13 @@ msgstr ""
 "ロークはハードウェアの文書で確認してください。"
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "起動順序を変更する項目を探してください。"
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2198,7 +2213,7 @@ msgstr ""
 "その項目で、CD ドライブの SCSI ID がリストの先頭に来るようにしてください。"
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2208,19 +2223,19 @@ msgstr ""
 "を押すことになる場合が多いと思います。"
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "その他の BIOS 設定"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "CD-ROM の設定"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2234,13 +2249,13 @@ msgstr ""
 "というエラーメッセージが出ることがあります。"
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Extended メモリと Expanded メモリ"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2254,13 +2269,13 @@ msgstr ""
 "必要なのは extended メモリで、expanded メモリは使えません。"
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "ウィルス防御"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2285,13 +2300,13 @@ msgstr ""
 "レコード (MBR) を変更する必要はありません。</para> </footnote>。"
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Shadow RAM"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2318,13 +2333,13 @@ msgstr ""
 "ん。"
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Memory Hole"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2336,7 +2351,7 @@ msgstr ""
 "kernel; はこの領域にもメモリがあるものとして動作します。"
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2357,13 +2372,13 @@ msgstr ""
 "ということだけです。"
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Advanced Power Management"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2379,13 +2394,13 @@ msgstr ""
 "き、電源管理の仕事を BIOS よりもうまく行うことができます。"
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "OpenFirmware の起動"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2400,7 +2415,7 @@ msgstr ""
 "にあたる必要があるでしょう。"
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2418,7 +2433,7 @@ msgstr ""
 "faq;\"></ulink> をご覧ください。"
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2442,7 +2457,7 @@ msgstr ""
 "それをモデムポートにつなぐ必要があります。"
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2464,13 +2479,13 @@ msgstr ""
 "nvram にインストールされます。"
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "OpenBoot の起動"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2486,7 +2501,7 @@ msgstr ""
 "て様々なことが行えます。"
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2507,7 +2522,7 @@ msgstr ""
 "ます。"
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2522,7 +2537,7 @@ msgstr ""
 "い。"
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2542,7 +2557,7 @@ msgstr ""
 "ulink> にあります。"
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2585,7 +2600,7 @@ msgstr ""
 "\">Sun OpenBoot Reference</ulink> をご覧ください。"
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2616,19 +2631,19 @@ msgstr ""
 "</screen></informalexample> Solaris では以下のようにしてください。"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 設定"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2652,7 +2667,7 @@ msgstr ""
 "アーキテクチャだからです。"
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2671,7 +2686,7 @@ msgstr ""
 "Management Console) から起動できることもあります。"
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2688,20 +2703,20 @@ msgstr ""
 "実際にインストールを行うまえに、設計したり準備したりする段階をいくつか踏まな"
 "ければなりません。全体の手順、例えばインストールメディアの準備や、そのメディ"
 "アからの実際の起動などは、IBM からの文書で説明されています。ここでその情報を"
-"繰り返すのは不可能ですし、不必要でしょう。しかし、必要となる &debian; 特有の情"
-"報や、その取得先については、ここで述べたいと思います。両方の情報源を元に、マ"
-"シンと起動用インストールメディアを起動前に準備してください。クライアントセッ"
-"ションで welcome メッセージを見たら、またこの文書に戻り、&debian; のインストー"
-"ル手順を行っていってください。"
+"繰り返すのは不可能ですし、不必要でしょう。しかし、必要となる &debian; 特有の"
+"情報や、その取得先については、ここで述べたいと思います。両方の情報源を元に、"
+"マシンと起動用インストールメディアを起動前に準備してください。クライアント"
+"セッションで welcome メッセージを見たら、またこの文書に戻り、&debian; のイン"
+"ストール手順を行っていってください。"
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "ネイティブな LPAR へのインストール"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2717,13 +2732,13 @@ msgstr ""
 "Redbook の 3.2 章をご覧ください。"
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "VM ゲストとしてのインストール"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2739,13 +2754,21 @@ msgstr ""
 "Distributions</ulink> Redbook の 3.1 章をご覧ください。"
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "すべてのファイルを <filename>generic</filename> サブディレクトリから CMS ディ"
 "スクにコピーする必要があります。<filename>kernel.debian</filename> と "
@@ -2753,13 +2776,13 @@ msgstr ""
 "ナリモードで転送してください。"
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "インストールサーバの設定"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2773,7 +2796,7 @@ msgstr ""
 "NFS, HTTP, FTP のいずれかで提供できなければなりません。"
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2787,25 +2810,25 @@ msgstr ""
 "レクトリツリーにコピーしたのでも構いません。"
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "気をつけるべきハードウェアの問題"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS サポートとキーボード"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2825,13 +2848,13 @@ msgstr ""
 "<quote>USB keyboard support</quote> といった BIOS 設定に入ってください。"
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "OldWorld PowerMAC でのディスプレイ表示"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2851,6 +2874,17 @@ msgstr ""
 "MacOS 上で、<quote>数千</quote>、<quote>数百万</quote> と設定せずに、256 色と"
 "してみてください。"
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "&arch-title; に 2.4 カーネルの Linux をインストールするための説明と、デバ"
+#~ "イスドライバ (DASD, XPRAM, コンソール, テープ, z90 crypto, chandev, ネット"
+#~ "ワーク) に関する情報です。"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Device Drivers and Installation Commands"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha FAQ"
 
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 3f44762f8..166054e15 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-26 10:11+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -593,8 +593,8 @@ msgid ""
 "com/d-i/&releasename;/./preseed.cfg</literal>."
 msgstr ""
 "かなりシンプルなコマンドラインをブートプロンプトに与え、任意の複雑なカスタマ"
-"イズを自動インストールに対して行う &debian; Installer の機能があります。これを"
-"説明するため、以下にブートプロンプトで使用できる例を示します。"
+"イズを自動インストールに対して行う &debian; Installer の機能があります。これ"
+"を説明するため、以下にブートプロンプトで使用できる例を示します。"
 "<informalexample><screen>\n"
 "auto url=autoserver\n"
 "</screen></informalexample> これは、DNS で <literal>autoserver</literal> の名"
@@ -1025,10 +1025,10 @@ msgid ""
 "installation can be performed interactively. Using DHCP preseeding to fully "
 "automate &debian; installs should only be done with care."
 msgstr ""
-"DHCP preseed を使用するよい方法は、自分のネットワークには、&debian; ミラーサイ"
-"トのような preseed の値のみ指定することです。自分のネットワークにこの方法でイ"
-"ンストールすると、選択したよいミラーサイトから自動で取得しますが、インストー"
-"ルの残りのプロセスはインタラクティブに行われます。DHCP preseed を用いた "
+"DHCP preseed を使用するよい方法は、自分のネットワークには、&debian; ミラーサ"
+"イトのような preseed の値のみ指定することです。自分のネットワークにこの方法で"
+"インストールすると、選択したよいミラーサイトから自動で取得しますが、インス"
+"トールの残りのプロセスはインタラクティブに行われます。DHCP preseed を用いた "
 "&debian; の完全自動インストールは、充分注意しなければ行うべきではありません。"
 
 #. Tag: title
@@ -1932,13 +1932,36 @@ msgstr "RAID を用いたパーティション分割"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
+msgstr ""
+"ソフトウェア RAID アレイにパーティションをセットアップすることも、preseed を"
+"使用してできます。サポートしているのは、RAID 0, 1, 5, 6, 10、や縮退アレイの作"
+"成、スペアデバイスの指定です。RAID 1 を使用する際には、アレイで使用する全デバ"
+"イスへインストールするよう、preseed で探せます。<xref linkend=\"preseed-"
+"bootloader\"/> をご覧ください。"
+
+#. Tag: para
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
 msgstr ""
 "ソフトウェア RAID アレイにパーティションをセットアップすることも、preseed を"
 "使用してできます。サポートしているのは、RAID 0, 1, 5, 6, 10、や縮退アレイの作"
@@ -1947,7 +1970,7 @@ msgstr ""
 "bootloader\"/> をご覧ください。"
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -1963,7 +1986,7 @@ msgstr ""
 "い。"
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2067,13 +2090,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "パーティションマウント法の制御"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2091,7 +2114,7 @@ msgstr ""
 "マウントされます。"
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2101,7 +2124,7 @@ msgstr ""
 "され続けます。"
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2116,7 +2139,7 @@ msgstr ""
 "す。こうなってしまうと、起動時の挙動が不定になってしまいます。"
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2134,13 +2157,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本システムのインストール"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2151,7 +2174,7 @@ msgstr ""
 "カーネルのインストールに関するものだけです。"
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2183,13 +2206,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "アカウント設定"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2201,7 +2224,7 @@ msgstr ""
 "どちらかを使用できます。"
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2217,7 +2240,7 @@ msgstr ""
 "ん。"
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2275,7 +2298,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2294,7 +2317,7 @@ msgstr ""
 "利です。"
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
@@ -2302,19 +2325,19 @@ msgstr ""
 "以下のコマンドを、パスワードの MD5 ハッシュを生成するのに利用できます。"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "apt 設定"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2327,7 +2350,7 @@ msgstr ""
 "に、他の (ローカルな) リポジトリを追加できます。"
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2385,13 +2408,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "パッケージ選択"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2401,73 +2424,73 @@ msgstr ""
 "スクを以下に書き出します。"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2479,7 +2502,7 @@ msgstr ""
 "クは常に含めるのをお勧めします。"
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2494,7 +2517,7 @@ msgstr ""
 "で区切ったパッケージのリストを取れます。"
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2532,13 +2555,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "ブートローダのインストール"
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1087
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2618,6 +2641,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2672,7 +2697,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2684,13 +2709,13 @@ msgstr ""
 "\"preseed-account\"/> にあるコマンドを使用して生成します。"
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "インストールの仕上げ"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2730,13 +2755,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "他パッケージの preseed"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2756,19 +2781,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "高度なオプション"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "インストール中のカスタムコマンド実行"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2778,7 +2803,7 @@ msgstr ""
 "るといった、とても強力で柔軟なオプションが存在します。"
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2826,13 +2851,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "preseed を用いたデフォルト値変更"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2858,7 +2883,7 @@ msgstr ""
 "やデバッグにも便利です。"
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2872,7 +2897,7 @@ msgstr ""
 "linkend=\"preseed-bootparms\"/> の脚注をご覧ください。"
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2895,13 +2920,13 @@ msgstr ""
 "果を及ぼしません。"
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "事前設定ファイルのチェーンロード"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2916,7 +2941,7 @@ msgstr ""
 "確かな設定を指定するという使い方ができます。"
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2966,7 +2991,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po
index ad35058a0..1fc8990e2 100644
--- a/po/ja/random-bits.po
+++ b/po/ja/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-03 14:44+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -818,8 +818,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS サーバ"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -833,13 +861,13 @@ msgstr ""
 "350MB 必要となります。"
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Unix/Linux システムからの &debian-gnu; のインストール"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section explains how to install &debian-gnu; from an existing Unix "
@@ -865,12 +893,12 @@ msgstr ""
 "について説明します。この <quote>クロスインストール</quote> HOWTO は、Red "
 "Hat, Mandriva, SUSE から &debian-gnu; に移行するユーザの要望で書かれました。"
 "本節では、*nix コマンドの入力について熟知し、ファイルシステムを操作できるのが"
-"前提となっています。本節では、<prompt>#</prompt>が &debian; chroot に入力された"
-"コマンドを示し、<prompt>$</prompt> はユーザの現在のシステムに入力されるコマン"
-"ドを表します。"
+"前提となっています。本節では、<prompt>#</prompt>が &debian; chroot に入力され"
+"たコマンドを示し、<prompt>$</prompt> はユーザの現在のシステムに入力されるコマ"
+"ンドを表します。"
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -879,13 +907,13 @@ msgid ""
 "also a clever way for dealing with hardware that otherwise doesn't play "
 "friendly with various boot or installation media."
 msgstr ""
-"一旦、新しい &debian; システムを好みに設定したら、既存のユーザデータを (あるな"
-"ら) 稼働したまま移行できます。したがって、これは <quote>0 ダウンタイム</"
+"一旦、新しい &debian; システムを好みに設定したら、既存のユーザデータを (ある"
+"なら) 稼働したまま移行できます。したがって、これは <quote>0 ダウンタイム</"
 "quote> &debian-gnu; インストールになります。またこれは、様々な起動・インス"
 "トールメディアと相性のよくないハードウェアに対処するうまい方法です。"
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -898,20 +926,20 @@ msgid ""
 "configuration steps may be needed."
 msgstr ""
 "これはほとんど手作業になりますから、自分でシステムの大部分の基本設定を行う必"
-"要があります。それには通常のインストールよりも &debian; や &arch-kernel; の一般"
-"的な知識が必要なことを覚えておいてください。また、この手順で通常のインストー"
-"ルと全く同じシステムになると期待してはいけません。これはシステムをセットアッ"
-"プする基本的な手順でしかありません。追加インストールや追加設定が必要になるか"
-"もしれません。"
+"要があります。それには通常のインストールよりも &debian; や &arch-kernel; の一"
+"般的な知識が必要なことを覚えておいてください。また、この手順で通常のインス"
+"トールと全く同じシステムになると期待してはいけません。これはシステムをセット"
+"アップする基本的な手順でしかありません。追加インストールや追加設定が必要にな"
+"るかもしれません。"
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "はじめに"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -927,7 +955,7 @@ msgstr ""
 "と) 必要です。"
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -946,7 +974,7 @@ msgstr ""
 "は、<userinput>-j</userinput> を取ってください。"
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -960,8 +988,8 @@ msgid ""
 "it is referenced later below."
 msgstr ""
 "スワップを以下のように初期化して有効にしてください。(パーティション番号は、"
-"&debian; スワップパーティションにするパーティション番号に、読み替えてください) "
-"<informalexample><screen>\n"
+"&debian; スワップパーティションにするパーティション番号に、読み替えてくださ"
+"い) <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -971,7 +999,7 @@ msgstr ""
 "ント名は何でも構いません。以降の説明ではこれを使用します。"
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -981,7 +1009,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -993,13 +1021,13 @@ msgstr ""
 "ます。"
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "<command>debootstrap</command> のインストール"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -1012,8 +1040,8 @@ msgid ""
 "command> and <command>ar</command> if they aren't already on your current "
 "system, then download and install <command>debootstrap</command>."
 msgstr ""
-"&debian; インストーラが使用するユーティリティで、&debian; 基本システムをインス"
-"トールする公式の方法と認められているのが <command>debootstrap</command> で"
+"&debian; インストーラが使用するユーティリティで、&debian; 基本システムをイン"
+"ストールする公式の方法と認められているのが <command>debootstrap</command> で"
 "す。<command>wget</command> と <command>ar</command> を使用しますが、"
 "<classname>/bin/sh</classname> と基本的な Unix/Linux ツール<footnote><para>こ"
 "れには、<command>sed</command>, <command>grep</command>, <command>tar</"
@@ -1024,7 +1052,7 @@ msgstr ""
 "ださい。"
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -1043,14 +1071,14 @@ msgstr ""
 "# mkdir work\n"
 "# cd work\n"
 "</screen></informalexample> <command>debootstrap</command> バイナリは、"
-"&debian; アーカイブ (あなたのアーキテクチャに適合するファイルを必ず選ぶこと) に"
-"あります。<ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/"
-"\">pool</ulink> から <command>debootstrap</command> .deb をダウンロードして、"
-"作業フォルダにパッケージをコピーし、ファイルを展開してください。ファイルをイ"
-"ンストールする際には root 権限を持つ必要があるでしょう。"
+"&debian; アーカイブ (あなたのアーキテクチャに適合するファイルを必ず選ぶこと) "
+"にあります。<ulink url=\"http://ftp.debian.org/debian/pool/main/d/"
+"debootstrap/\">pool</ulink> から <command>debootstrap</command> .deb をダウン"
+"ロードして、作業フォルダにパッケージをコピーし、ファイルを展開してください。"
+"ファイルをインストールする際には root 権限を持つ必要があるでしょう。"
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1062,13 +1090,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "<command>debootstrap</command> の実行"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -1084,7 +1112,7 @@ msgstr ""
 "mirror/list\"></ulink> でリストされています。"
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1096,7 +1124,7 @@ msgstr ""
 "</userinput>) を使用することができます。"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1116,7 +1144,7 @@ msgstr ""
 "<userinput>s390</userinput>, <userinput>sparc</userinput> です。"
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1126,13 +1154,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基本システムの設定"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1141,27 +1169,27 @@ msgid ""
 "</screen></informalexample> After chrooting you may need to set the terminal "
 "definition to be compatible with the &debian; base system, for example:"
 msgstr ""
-"さあ、これでディスクに真の &debian; システムを (いくぶん中がスカスカですが) 手"
-"に入れました。そこに <command>chroot</command> してください。"
+"さあ、これでディスクに真の &debian; システムを (いくぶん中がスカスカですが) "
+"手に入れました。そこに <command>chroot</command> してください。"
 "<informalexample><screen>\n"
 "# LANG=C chroot /mnt/debinst /bin/bash\n"
-"</screen></informalexample> chroot した後で、&debian; 基本システムと互換のある"
-"端末定義にする必要があるかもしれません。例えば以下のようにします。"
+"</screen></informalexample> chroot した後で、&debian; 基本システムと互換のあ"
+"る端末定義にする必要があるかもしれません。例えば以下のようにします。"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "デバイスファイルの作成"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1180,19 +1208,19 @@ msgstr ""
 "で行うかが異なります。"
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "以下のような選択肢があります。"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr "次のようにして、デフォルトの静的デバイスファイル群を作成します。"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1202,7 +1230,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1211,7 +1239,7 @@ msgstr ""
 "します。"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1223,13 +1251,13 @@ msgstr ""
 "するのに注意してください。そのため、この選択肢は注意深く使用するべきです。"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "パーティションのマウント"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1297,10 +1325,10 @@ msgstr ""
 "ださい。また、ファイルシステムを別々にマウントするには、以下のようにしてくだ"
 "さい。<informalexample><screen>\n"
 "# mount /path   # e.g.: mount /usr\n"
-"</screen></informalexample> 現在 &debian; システムでは、リムーバブルメディアの"
-"マウントポイントを <filename>/media</filename> にしていますが、<filename>/</"
-"filename> にシンボリックリンクを置き互換性を保っています。以下の例のように、"
-"必要であれば作成してください。<informalexample><screen>\n"
+"</screen></informalexample> 現在 &debian; システムでは、リムーバブルメディア"
+"のマウントポイントを <filename>/media</filename> にしていますが、<filename>/"
+"</filename> にシンボリックリンクを置き互換性を保っています。以下の例のよう"
+"に、必要であれば作成してください。<informalexample><screen>\n"
 "# cd /media\n"
 "# mkdir cdrom0\n"
 "# ln -s cdrom0 cdrom\n"
@@ -1312,13 +1340,13 @@ msgstr ""
 "前に必ず proc をマウントしてください。"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1330,19 +1358,19 @@ msgstr ""
 "ウントできるかもしれません。"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "タイムゾーンの設定"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1355,7 +1383,7 @@ msgstr ""
 "下のコマンドで、上記の選択とタイムゾーンの選択を行えます。"
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1365,13 +1393,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "ネットワークの設定"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1494,13 +1522,13 @@ msgstr ""
 "ス名 (eth0, eth1 など) と結びつけられます。"
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "apt の設定"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1526,13 +1554,13 @@ msgstr ""
 "update</userinput> を必ず実行してください。"
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "ロケールとキーボードの設定"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1553,7 +1581,7 @@ msgstr ""
 "ださい。"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1563,7 +1591,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1573,13 +1601,13 @@ msgstr ""
 "てください。"
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "カーネルのインストール"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1590,19 +1618,19 @@ msgstr ""
 "ください。"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1610,13 +1638,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "ブートローダのセットアップ"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1627,11 +1655,11 @@ msgstr ""
 "&debian-gnu; システムを起動できるようにするために、インストールしたカーネルを"
 "新しい root パーティションから読み込むように、ブートローダをセットアップして"
 "ください。<command>debootstrap</command> は、ブートローダをインストールしない"
-"ことに注意してください。とは言っても、セットアップするのに &debian; chroot 内部"
-"の <command>aptitude</command> を使用できます。"
+"ことに注意してください。とは言っても、セットアップするのに &debian; chroot 内"
+"部の <command>aptitude</command> を使用できます。"
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1654,16 +1682,16 @@ msgid ""
 "relative to the system you call it from)</phrase>."
 msgstr ""
 "ブートローダのセットアップについての説明は、<userinput>info grub</userinput> "
-"や <userinput>man lilo.conf</userinput> をチェックしてください。&debian; をイン"
-"ストールするのに使用したシステムを保持する場合、既存の grub の "
-"<filename>menu.lst</filename> や <filename>lilo.conf</filename> に、&debian; イ"
-"ンストールへのエントリを単に加えてください。lilo.conf では新システムにそれを"
-"コピーし、そこで編集してください。編集を終えた後、<command>lilo</command> を"
-"呼び出してください。(lilo を呼び出したシステムと関係あるところの、"
+"や <userinput>man lilo.conf</userinput> をチェックしてください。&debian; をイ"
+"ンストールするのに使用したシステムを保持する場合、既存の grub の "
+"<filename>menu.lst</filename> や <filename>lilo.conf</filename> に、&debian; "
+"インストールへのエントリを単に加えてください。lilo.conf では新システムにそれ"
+"をコピーし、そこで編集してください。編集を終えた後、<command>lilo</command> "
+"を呼び出してください。(lilo を呼び出したシステムと関係あるところの、"
 "<filename>lilo.conf</filename> が使われるということを覚えていてください)"
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1687,7 +1715,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1699,13 +1727,13 @@ msgstr ""
 "すが、それはこの付録では扱いません。"
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "以下は基本的な <filename>/etc/lilo.conf</filename> の例です。"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1727,7 +1755,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1738,15 +1766,15 @@ msgid ""
 "conf</filename> relative to the system you call it from)."
 msgstr ""
 "ブートローダのセットアップについての説明は、<userinput>man yaboot.conf</"
-"userinput> をチェックしてください。&debian; をインストールするのに使用したシス"
-"テムを保持する場合、既存の <filename>yaboot.conf</filename> に、&debian; インス"
-"トールへのエントリを単に加えてください。そして新システムにそれをコピーし、そ"
-"こで編集してください。編集を終えた後、ybin を呼び出してください。(ybin を呼び"
-"出したシステムと関係あるところの、<filename>yaboot.conf</filename> が使われる"
-"ということを覚えていてください)"
+"userinput> をチェックしてください。&debian; をインストールするのに使用したシ"
+"ステムを保持する場合、既存の <filename>yaboot.conf</filename> に、&debian; イ"
+"ンストールへのエントリを単に加えてください。そして新システムにそれをコピー"
+"し、そこで編集してください。編集を終えた後、ybin を呼び出してください。(ybin "
+"を呼び出したシステムと関係あるところの、<filename>yaboot.conf</filename> が使"
+"われるということを覚えていてください)"
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1776,13 +1804,13 @@ msgstr ""
 "の代わりに <userinput>ide0:</userinput> を使う必要があるかもしれません。"
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "仕上げに"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1802,7 +1830,7 @@ msgstr ""
 "パッケージをインストールすることもできます。"
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1814,19 +1842,19 @@ msgstr ""
 "を解放できます。"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "パラレルライン IP (PLIP) による &debian-gnu; のインストール"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1838,11 +1866,11 @@ msgstr ""
 "本節では、イーサネットカードがなくても、リモートゲートウェイコンピュータにヌ"
 "ルモデムケーブル (ヌルプリンタケーブルとも呼ばれます) で接続して &debian-"
 "gnu; をコンピュータにインストールする方法を説明します。ゲートウェイコンピュー"
-"タは、&debian; ミラーがあるネットワーク (例: インターネット) に接続していなけれ"
-"ばなりません。"
+"タは、&debian; ミラーがあるネットワーク (例: インターネット) に接続していなけ"
+"ればなりません。"
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1858,7 +1886,7 @@ msgstr ""
 "てはいけません)"
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1869,7 +1897,7 @@ msgstr ""
 "たときに有効になります。(<xref linkend=\"boot-new\"/> をご覧ください)"
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1882,23 +1910,23 @@ msgstr ""
 "通の値は、<literal>io=0x378</literal>, <literal>irq=7</literal> です。"
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "必要な物"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
 "be installed."
 msgstr ""
-"&debian; をインストールする対象コンピュータ。(<emphasis>target</emphasis> と呼"
-"びます)"
+"&debian; をインストールする対象コンピュータ。(<emphasis>target</emphasis> と"
+"呼びます)"
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
@@ -1906,7 +1934,7 @@ msgstr ""
 "ご覧ください。"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1916,7 +1944,7 @@ msgstr ""
 "(<emphasis>source</emphasis> と呼びます)"
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1928,13 +1956,13 @@ msgstr ""
 "さい。"
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "source のセットアップ"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1944,7 +1972,7 @@ msgstr ""
 "イ (ppp0 利用) に設定する簡単なサンプルです。"
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1990,13 +2018,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "target のインストール"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2022,13 +2050,13 @@ msgstr ""
 "</screen></informalexample> 以下は、インストール中の各段階で与える値です。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "インストーラコンポーネントを CD からロード"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2038,13 +2066,13 @@ msgstr ""
 "れにより、インストールするシステムで PLIP ドライバが使用可能になります。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "ネットワークハードウェアの検出"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2059,7 +2087,7 @@ msgstr ""
 "現れません。"
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2071,20 +2099,20 @@ msgstr ""
 "userinput> モジュールを選択してください。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "ネットワークの設定"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr ""
 "「DHCP でネットワークを自動的に設定していますか」には「いいえ」と答えます。"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2093,7 +2121,7 @@ msgstr ""
 "userinput> とします。"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2103,7 +2131,7 @@ msgstr ""
 "replaceable></userinput> とします。"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2113,13 +2141,13 @@ msgstr ""
 "す。(<filename>/etc/resolv.conf</filename> をご覧ください)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (PPPoE) を用いた &debian-gnu; のインストール"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2134,7 +2162,7 @@ msgstr ""
 "トしていませんが、非常に簡単に設定できます。この節ではその方法を説明します。"
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2145,7 +2173,7 @@ msgstr ""
 "ムを再起動した後でも有効になります (<xref linkend=\"boot-new\"/> 参照)。"
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2159,7 +2187,7 @@ msgstr ""
 "いません。"
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2169,7 +2197,7 @@ msgstr ""
 "するステップが異なるだけです。"
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2185,7 +2213,7 @@ msgstr ""
 "udeb</classname>) を確実に読み込み、自動的に起動します。"
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2205,7 +2233,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2215,7 +2243,7 @@ msgstr ""
 "クハードウェアを検出します。"
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2227,7 +2255,7 @@ msgstr ""
 "イーサネットインターフェースを調べます。"
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2243,7 +2271,7 @@ msgstr ""
 "connection</guimenuitem> を選択してください。"
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2253,7 +2281,7 @@ msgstr ""
 "入力してください。"
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2272,13 +2300,13 @@ msgstr ""
 "て、設定を再度行えます。"
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "グラフィカルインストーラ"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2291,7 +2319,7 @@ msgstr ""
 "は同じです。同じプログラムを異なるフロントエンドで使用しています。"
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2308,7 +2336,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2330,7 +2358,7 @@ msgstr ""
 "するブートプロンプトから、まだ使用できます。"
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2343,11 +2371,11 @@ msgstr ""
 "また、netboot を行えるグラフィカルインストーラもあり、さらに (主にテストに用"
 "いる) 特殊な <quote>ミニ</quote> ISO イメージ<footnote id=\"gtk-miniiso\"> "
 "<para> ミニ ISO イメージは、<xref linkend=\"downloading-files\"/> で説明する "
-"&debian; ミラーサイトからダウンロードできます。<filename>netboot/gtk/mini.iso</"
-"filename> を探してください。</para> </footnote>もあります。"
+"&debian; ミラーサイトからダウンロードできます。<filename>netboot/gtk/mini."
+"iso</filename> を探してください。</para> </footnote>もあります。"
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2359,13 +2387,13 @@ msgid ""
 msgstr ""
 "&arch-title; では、現在のところ実験版の <quote>ミニ</quote> ISO イメージが利"
 "用できます<footnote id=\"gtk-miniiso\"> <para> ミニ ISO イメージは、<xref "
-"linkend=\"downloading-files\"/> で説明する &debian; ミラーサイトからダウンロー"
-"ドできます。<filename>netboot/gtk/mini.iso</filename> を探してください。</"
-"para> </footnote>。ATI グラフィックカードがある、ほとんどすべての PowerPC シ"
-"ステムで動作するはずですが、その他のシステムでは動作しそうにありません。"
+"linkend=\"downloading-files\"/> で説明する &debian; ミラーサイトからダウン"
+"ロードできます。<filename>netboot/gtk/mini.iso</filename> を探してください。"
+"</para> </footnote>。ATI グラフィックカードがある、ほとんどすべての PowerPC "
+"システムで動作するはずですが、その他のシステムでは動作しそうにありません。"
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2375,7 +2403,7 @@ msgstr ""
 "メータを追加できます。"
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2388,7 +2416,7 @@ msgstr ""
 "の <quote>newt</quote> フロントエンドに自動的にフォールバックします。"
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2401,13 +2429,13 @@ msgstr ""
 "メモリが少ない場合は、通常のインストーラを利用するのをお勧めします。"
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "グラフィカルインストーラの使用法"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2419,7 +2447,7 @@ msgstr ""
 "に役に立ちます。"
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2438,7 +2466,7 @@ msgstr ""
 "選択が切り替わるだけで、&BTN-CONT; が有効にはなりません。"
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2450,7 +2478,7 @@ msgstr ""
 "アクセスできます。"
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index 6e0678a49..e38c2c9b6 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-26 10:13+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -36,10 +36,10 @@ msgid ""
 "given priorities, and the priority of questions to be asked is set when the "
 "installer is started."
 msgstr ""
-"&debian; Installer は各インストールタスクを実行するために、たくさんの特定用途コ"
-"ンポーネントから成ります。各コンポーネントは、必要ならユーザに質問をして、そ"
-"のタスクを実行します。この質問には優先度が設定されており、この優先度はインス"
-"トーラの起動時に設定することができます。"
+"&debian; Installer は各インストールタスクを実行するために、たくさんの特定用途"
+"コンポーネントから成ります。各コンポーネントは、必要ならユーザに質問をして、"
+"そのタスクを実行します。この質問には優先度が設定されており、この優先度はイン"
+"ストーラの起動時に設定することができます。"
 
 #. Tag: para
 #: using-d-i.xml:16
@@ -392,8 +392,8 @@ msgid ""
 "Presents a list of &debian; archive mirrors. The user may choose the source "
 "of his installation packages."
 msgstr ""
-"&debian; アーカイブミラーのリストを表示します。インストールするパッケージの取得"
-"元を選択できるでしょう。"
+"&debian; アーカイブミラーのリストを表示します。インストールするパッケージの取"
+"得元を選択できるでしょう。"
 
 #. Tag: term
 #: using-d-i.xml:219
@@ -448,11 +448,23 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "root パスワードの設定や、root 以外のユーザの追加を行います。"
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -460,25 +472,25 @@ msgid ""
 msgstr "システム時計を更新して、時計を UTC にあわせるかどうかを決定します。"
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "あらかじめ選択した場所を元に、タイムゾーンを選択します。"
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
@@ -488,17 +500,17 @@ msgid ""
 msgstr ""
 "システムの内蔵ディスクを分割し、選択したパーティションのファイルシステムを作"
 "成し、マウントポイントにそのファイルシステムをマウントすることができます。完"
-"全自動モードや LVM サポートといったさらに面白い機能があります。これは &debian; "
-"での好ましいパーティション分割ツールです。"
+"全自動モードや LVM サポートといったさらに面白い機能があります。これは "
+"&debian; での好ましいパーティション分割ツールです。"
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -508,13 +520,13 @@ msgstr ""
 "チャに最適な、パーティション分割プログラムが選ばれます。"
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -524,13 +536,13 @@ msgstr ""
 "ステムを作成します。"
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -540,13 +552,13 @@ msgstr ""
 "補助を行います。"
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -559,13 +571,13 @@ msgstr ""
 "す。"
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -575,18 +587,6 @@ msgstr ""
 "なパッケージセットをインストールします。"
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "root パスワードの設定や、root 以外のユーザの追加を行います。"
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -685,9 +685,9 @@ msgid ""
 "hard disk, or other media when trouble is encountered, in order to "
 "accurately report installer software problems to &debian; developers later."
 msgstr ""
-"後で &debian; 開発者へ、インストーラソフトウェアの障害を正確に報告するために、"
-"障害に遭遇した際の、フロッピーディスク、ネットワーク、ハードディスク、その他"
-"メディアに情報を記録する方法を提供します。"
+"後で &debian; 開発者へ、インストーラソフトウェアの障害を正確に報告するため"
+"に、障害に遭遇した際の、フロッピーディスク、ネットワーク、ハードディスク、そ"
+"の他メディアに情報を記録する方法を提供します。"
 
 #. Tag: title
 #: using-d-i.xml:399
@@ -732,11 +732,11 @@ msgid ""
 "selecting your preferred language, keyboard layout or desired network "
 "mirror)."
 msgstr ""
-"&debian; インストーラが起動して、最初の画面が表示されているとしましょう。このと"
-"き、&d-i; の機能はまだ制限されています。ハードウェア、希望する言語、実行する"
-"タスクなどに関しても、まだ知りません。しかし心配しないでください。&d-i; は非"
-"常に賢いので、ハードウェアの自動検出をしたり、コンポーネントの残りを見つけた"
-"り、高性能なインストールシステムに自分自身をアップグレードすることができま"
+"&debian; インストーラが起動して、最初の画面が表示されているとしましょう。この"
+"とき、&d-i; の機能はまだ制限されています。ハードウェア、希望する言語、実行す"
+"るタスクなどに関しても、まだ知りません。しかし心配しないでください。&d-i; は"
+"非常に賢いので、ハードウェアの自動検出をしたり、コンポーネントの残りを見つけ"
+"たり、高性能なインストールシステムに自分自身をアップグレードすることができま"
 "す。しかし、(希望する言語、キーボードレイアウト、使用するネットワークミラーの"
 "選択のように) いくつかのタスクでは自動で決められませんので、&d-i; を助けてあ"
 "げる必要があります。"
@@ -924,9 +924,9 @@ msgid ""
 "correct keyboard layout."
 msgstr ""
 "選択した地理的位置 (ほとんどの場合で国) は、インストールプロセスの後半で、デ"
-"フォルトのタイムゾーンの抽出と、その国に適切な &debian; ミラーサイトの抽出に使"
-"用します。言語と国は、ともにシステムのデフォルトロケールの決定や、正しいキー"
-"ボードレイアウトの選択を支援します。"
+"フォルトのタイムゾーンの抽出と、その国に適切な &debian; ミラーサイトの抽出に"
+"使用します。言語と国は、ともにシステムのデフォルトロケールの決定や、正しい"
+"キーボードレイアウトの選択を支援します。"
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -1058,15 +1058,15 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "キーボードは、しばしば言語で使用する文字に合わされています。使用しているキー"
 "ボードに一致するレイアウトを選択するか、希望のキーボードレイアウトが表示され"
 "なければ、近いものを選択してください。いったんシステムのインストールが完了す"
 "れば、もっと広い範囲からキーボードレイアウトを選ぶことができます (インストー"
-"ルが完了した後に、root で <command>dpkg-reconfigure keyboard-configuration</command> を 実行してくださ"
-"い)。"
+"ルが完了した後に、root で <command>dpkg-reconfigure keyboard-configuration</"
+"command> を 実行してください)。"
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1119,9 +1119,9 @@ msgid ""
 "<command>iso-scan</command> does exactly this."
 msgstr ""
 "<emphasis>hd-media</emphasis> でインストールを行う場合、インストールするファ"
-"イルの残りを得るために、&debian; Installer iso イメージを見つけてマウントする必"
-"要があるでしょう。<command>iso-scan</command> コンポーネントはその名の通り行"
-"います。"
+"イルの残りを得るために、&debian; Installer iso イメージを見つけてマウントする"
+"必要があるでしょう。<command>iso-scan</command> コンポーネントはその名の通り"
+"行います。"
 
 #. Tag: para
 #: using-d-i.xml:683
@@ -1149,9 +1149,9 @@ msgstr ""
 "replaceable>.iso</filename> を検出しますが、<filename>/data/tmp/"
 "<replaceable>whatever</replaceable>.iso</filename> は検出しないということで"
 "す)。iso イメージの検出後、<command>iso-scan</command> は、そのイメージが有効"
-"な &debian; iso イメージであるか否かを決定するため、その内容をチェックします。"
-"前者の場合は完了しますが、後者の場合 <command>iso-scan</command> は別のイメー"
-"ジを探します。"
+"な &debian; iso イメージであるか否かを決定するため、その内容をチェックしま"
+"す。前者の場合は完了しますが、後者の場合 <command>iso-scan</command> は別のイ"
+"メージを探します。"
 
 #. Tag: para
 #: using-d-i.xml:700
@@ -1388,11 +1388,143 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "ユーザとパスワードのセットアップ"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"基本システムのインストールが終わると、インストーラは <quote>root</quote> アカ"
+"ウントや、最初のユーザアカウントのセットアップを行います。その他のユーザアカ"
+"ウントは、インストール完了後に作成してください。"
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "root パスワードの設定"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"<emphasis>root</emphasis> アカウントは、ログインするとシステムのすべてのセ"
+"キュリティ保護をバイパスしてしまうので、<emphasis>スーパーユーザ</emphasis>と"
+"も呼ばれています。root アカウントはシステム管理のみに使用し、可能な限り短時間"
+"使用するのみにすべきです。"
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"作成するパスワードは、少なくとも 6 文字以上で、大文字小文字、カンマやピリオド"
+"を混ぜるべきです。root パスワードを設定するときには、強力なアカウント故に特別"
+"注意を払ってください。辞書にある単語や推測される個人情報を使用するのは避けて"
+"ください。"
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"誰であっても、root パスワードが必要だと言う人がいる場合には、殊更に用心してく"
+"ださい。他のシステム管理者と共に機械の管理をしているのでなければ、root パス"
+"ワードを教える必要は、通常決してありません。"
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "一般ユーザの作成"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"システムは、この時点で一般ユーザアカウントを作成するかどうか質問します。この"
+"アカウントは、個人でログインする時のメインとするべきです。root アカウントを日"
+"常的に使用したり、個人的な用途でログインするべきでは<emphasis>ありません</"
+"emphasis>。"
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"なぜいけないのでしょう? root 権限を使用しないようにする理由のひとつは、root "
+"により簡単に取り返しのつかない損害を与えられるということです。他には、だまさ"
+"れて<emphasis>トロイの木馬</emphasis> (あなたに隠れ、スーパーユーザ権限を利用"
+"してシステムに感染するプログラム) を動かしてしまうということもあり得ます。"
+"UNIX システム管理に関するいずれの良書でも、この件に関して詳細に扱っています。"
+"今までご存じなければ、ご一読ください。"
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"まず初めに、ユーザのフルネームの入力を求められます。次にユーザアカウントの名"
+"前を求められます。一般的にファーストネームか、必要充分な名前に似た何かがデ"
+"フォルトになります。最後にこのアカウントのパスワードを求められます。"
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"インストール後いつでも、別のアカウントを作成する場合は、<command>adduser</"
+"command> コマンドを使用してください。"
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "パーティションの分割とマウントポイントの選択"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1410,7 +1542,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1420,7 +1552,7 @@ msgstr ""
 "\"partitioning\"/> をご覧ください。"
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1442,7 +1574,7 @@ msgstr ""
 "できなくなることに注意してください。"
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1456,13 +1588,13 @@ msgstr ""
 "guimenuitem> を選んでください。"
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "サポートするパーティション分割オプション"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1474,7 +1606,7 @@ msgstr ""
 "て、たくさんの異なるパーティション構成を作成できます。"
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1494,7 +1626,7 @@ msgstr ""
 "きます。もっと高い優先度の場合は、実用的な値がデフォルトで使用されます。"
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1504,31 +1636,31 @@ msgstr ""
 "とんどの場合組み合わせて)、サポートします。"
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "論理ボリュームマネージメント"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "ソフトウェア RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "サポートしている RAID レベルは 0, 1, 4, 5, 6, 10 です。"
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "暗号化"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1536,7 +1668,7 @@ msgstr ""
 "<emphasis>シリアル ATA RAID</emphasis> (<classname>dmraid</classname> を利用)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1550,13 +1682,13 @@ msgstr ""
 "ます。"
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>マルチパス</emphasis> (試験的)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1568,13 +1700,13 @@ msgstr ""
 "きます。"
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "以下のファイルシステムをサポートしています。"
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1586,7 +1718,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1598,21 +1730,21 @@ msgstr ""
 "デフォルトには ext2 が選択されます。"
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr ""
 "<emphasis>jfs</emphasis> (全アーキテクチャで使用できるわけではありません)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr ""
 "<emphasis>xfs</emphasis> (全アーキテクチャで使用できるわけではありません)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
@@ -1621,7 +1753,7 @@ msgstr ""
 "はありません)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1635,13 +1767,13 @@ msgstr ""
 "します。"
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1651,13 +1783,13 @@ msgstr ""
 "ティションは作成できません。"
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1667,19 +1799,19 @@ msgstr ""
 "qnx4 パーティションは作成できません。"
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (読み込み専用)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1689,13 +1821,13 @@ msgstr ""
 "す。新しい NTFS パーティションは作成できません。"
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "ガイドパーティション分割"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1712,7 +1844,7 @@ msgstr ""
 "サポートを利用します。</para> </footnote> を利用する方法です。"
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1721,7 +1853,7 @@ msgstr ""
 "わけではありません。"
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1738,7 +1870,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1753,7 +1885,7 @@ msgstr ""
 "スクのサイズにより、時間がかかることがあります。"
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1770,7 +1902,7 @@ msgstr ""
 "に、インストーラは変更してよいか確認してきます。"
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1787,7 +1919,7 @@ msgstr ""
 "ます。ディスクサイズを確認の手がかりにしてください。"
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1802,7 +1934,7 @@ msgstr ""
 "せん。"
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1819,73 +1951,73 @@ msgstr ""
 "依存します) がなければ、ガイドパーティション分割は失敗してしまいます。"
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "パーティション分割方法"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "最低容量"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "作成するパーティション"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "All files in one partition"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Separate /home partition"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Separate /home, /usr, /var and /tmp partitions"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1895,7 +2027,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1909,7 +2041,7 @@ msgstr ""
 "します。"
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1923,7 +2055,7 @@ msgstr ""
 "セットアップするよう、フォーマットメニューに追加メニュー項目があります。"
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1935,7 +2067,7 @@ msgstr ""
 "いった情報が含まれています。"
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -1985,7 +2117,7 @@ msgstr ""
 "んが、手動パーティション分割で使用できる変化を示します。"
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2006,13 +2138,13 @@ msgstr ""
 "ティション分割で修正してください。"
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "手動パーティション分割"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
@@ -2023,11 +2155,11 @@ msgid ""
 msgstr ""
 "手動パーティション分割を選択すると、既存のパーティションテーブルがマウントポ"
 "イントなしで表示されるのを除き、前述と同様の画面が表示されます。パーティショ"
-"ンテーブルの手動セットアップの方法と、新しい &debian; システムでのパーティショ"
-"ンの使用法については、本節の残りで扱います。"
+"ンテーブルの手動セットアップの方法と、新しい &debian; システムでのパーティ"
+"ションの使用法については、本節の残りで扱います。"
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2041,7 +2173,7 @@ msgstr ""
 "SPACE</quote> (空き領域) という新しい行が現れます。"
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2079,7 +2211,7 @@ msgstr ""
 "イン画面に戻ってください。"
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2100,7 +2232,7 @@ msgstr ""
 "できます。"
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2116,7 +2248,7 @@ msgstr ""
 "に進みません。"
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2127,7 +2259,7 @@ msgstr ""
 "command> がそれを検出し、行うまで先に進むことができません。"
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2143,7 +2275,7 @@ msgstr ""
 "<filename>partman-lvm</filename>)"
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2157,13 +2289,13 @@ msgstr ""
 "成するかどうか確認することになります。"
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "マルチディスクデバイス (ソフトウェア RAID) の設定"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2182,7 +2314,7 @@ msgstr ""
 "firstterm> の方が有名) と呼びます。"
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2196,7 +2328,7 @@ msgstr ""
 "てられる等) と同様に使用できます。"
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2302,97 +2434,97 @@ msgstr ""
 "varlistentry> </variablelist> まとめると以下のようになります。"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "タイプ"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "デバイス最小構成数"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "予備デバイス"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "ディスク破損に耐えるか?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "利用可能領域"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>no</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "RAID にある最小パーティションのサイズ×デバイス数"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "任意"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>yes</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "RAID にある最小パーティションのサイズ"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2400,19 +2532,19 @@ msgid ""
 msgstr "RAID にある最小パーティションのサイズ×(デバイス数 - 1)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2420,13 +2552,13 @@ msgid ""
 msgstr "最小パーティションのサイズ×(RAID にあるデバイス数 - 2)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2434,7 +2566,7 @@ msgid ""
 msgstr "全パーティションサイズ÷チャンクのコピー数 (デフォルトは 2)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2444,7 +2576,7 @@ msgstr ""
 "raid-howto;\">Software RAID HOWTO</ulink> をご覧ください。"
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2459,7 +2591,7 @@ msgstr ""
 "ニューの <command>partman</command> で行えます)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2479,7 +2611,7 @@ msgstr ""
 "filename> に RAID1 を用いる例が選択したり得ます。"
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2496,7 +2628,7 @@ msgstr ""
 "して動作させることができるかも知れません。"
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2517,7 +2649,7 @@ msgstr ""
 "さい。その後は選択した MD デバイスに依存します。"
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2528,7 +2660,7 @@ msgstr ""
 "に MD にするパーティションを選択してください。"
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2547,7 +2679,7 @@ msgstr ""
 "せん。"
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2558,7 +2690,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2569,7 +2701,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2589,7 +2721,7 @@ msgstr ""
 "は、たくさんのアクティブデバイスがなければなりません。"
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2607,7 +2739,7 @@ msgstr ""
 "ション) で結合できます。"
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2621,13 +2753,13 @@ msgstr ""
 "設定してください。"
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "論理ボリュームマネージャ (LVM) の設定"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2643,7 +2775,7 @@ msgstr ""
 "とになります。"
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2662,7 +2794,7 @@ msgstr ""
 "リュームグループも)、複数の物理ディスクをまたがって定義できると言うことです。"
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2683,7 +2815,7 @@ msgstr ""
 "きです。"
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2700,7 +2832,7 @@ msgstr ""
 "</menuchoice> を選ぶことで行います。"
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2719,7 +2851,7 @@ msgstr ""
 "作は以下の通りです。"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2729,43 +2861,43 @@ msgstr ""
 "の名称やサイズなどを表示します"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "ボリュームグループの作成"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "論理ボリュームの作成"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "ボリュームグループの削除"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "論理ボリュームの削除"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "ボリュームグループの拡張"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "ボリュームグループの縮小"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2775,7 +2907,7 @@ msgstr ""
 "ります"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2785,7 +2917,7 @@ msgstr ""
 "のメニューのオプションを使用してください。"
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2796,13 +2928,13 @@ msgstr ""
 "常のボリュームと同じように表示されています (そして同じように扱えます)。"
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "暗号化ボリュームの設定"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2823,7 +2955,7 @@ msgstr ""
 "ないと、ハードディスクのデータはランダムな文字列にしか見えません。"
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2849,7 +2981,7 @@ msgstr ""
 "ションからカーネルを起動する方法がないからです。"
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2863,7 +2995,7 @@ msgstr ""
 "けます。"
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2883,7 +3015,7 @@ msgstr ""
 "ティションを暗号化するオプションが追加されます。"
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2900,7 +3032,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2913,13 +3045,13 @@ msgstr ""
 "デフォルト値を指定してください。セキュリティを念頭に置いて選択されています。"
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Encryption: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2943,13 +3075,13 @@ msgstr ""
 "り、21 世紀の機密情報を保護する標準暗号化アルゴリズムとして採用されました。"
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Key size: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2962,13 +3094,13 @@ msgstr ""
 "影響を与えます。利用できる暗号化キーのサイズは暗号方式に依存します。"
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2985,7 +3117,7 @@ msgstr ""
 "を推測できないようにします。"
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2998,25 +3130,25 @@ msgstr ""
 "ない、以前インストールしたシステムと互換をとる場合のみ使用してください。"
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Encryption key: <userinput>Passphrase</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "ここでは、このパーティションの暗号化キーのタイプを選択できます。"
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3029,13 +3161,13 @@ msgstr ""
 "\">LUKS</ulink> を使用して設定するという意味です。</para></footnote>します。"
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Random key"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3052,7 +3184,7 @@ msgstr ""
 "解読されないでしょう)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3071,13 +3203,13 @@ msgstr ""
 "なってしまうのです。"
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Erase data: <userinput>yes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3097,7 +3229,7 @@ msgstr ""
 "データを復元できると信じられています。</para></footnote>。"
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3109,13 +3241,13 @@ msgstr ""
 "ンを提供するように変わります。"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Encryption: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3127,25 +3259,25 @@ msgstr ""
 "ださい。"
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "ここでは、このパーティションの暗号化キーのタイプを選択できます。"
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Keyfile (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3158,19 +3290,19 @@ msgstr ""
 "は、適切なパスフレーズを入力する必要があります (後のプロセスで要求されます)。"
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "前述の Random key の節をご覧ください。"
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "前節の Erase data の節をご覧ください。"
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3188,7 +3320,7 @@ msgstr ""
 "かかるでしょう。"
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3203,7 +3335,7 @@ msgstr ""
 "前など) でないものです。"
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3226,7 +3358,7 @@ msgstr ""
 "トが有効でなかったのかもしれません。"
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3247,7 +3379,7 @@ msgstr ""
 "ます。暗号化するパーティションの数だけ繰り返します。"
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3280,7 +3412,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3297,7 +3429,7 @@ msgstr ""
 "<xref linkend=\"mount-encrypted-volumes\"/> で扱います。"
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3305,13 +3437,13 @@ msgid ""
 msgstr "パーティション分割の内容に納得いったら、インストールに進んでください。"
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "基本システムのインストール"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3324,7 +3456,7 @@ msgstr ""
 "接続しかなければ、ある程度時間がかかるかもしれません。"
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3340,7 +3472,7 @@ msgstr ""
 "keycap><keycap>F1</keycap></keycombo> を押してください。"
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3352,7 +3484,7 @@ msgstr ""
 "ます。"
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3365,7 +3497,7 @@ msgstr ""
 "り低い優先度モードでは、利用可能なカーネルのリストから選ぶことができます。"
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3382,7 +3514,7 @@ msgstr ""
 "同時に入っているべきパッケージです。"
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3395,133 +3527,6 @@ msgstr ""
 "中のこの時点以降でのみ効力を発揮します。"
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "ユーザとパスワードのセットアップ"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"基本システムのインストールが終わると、インストーラは <quote>root</quote> アカ"
-"ウントや、最初のユーザアカウントのセットアップを行います。その他のユーザアカ"
-"ウントは、インストール完了後に作成してください。"
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "root パスワードの設定"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"<emphasis>root</emphasis> アカウントは、ログインするとシステムのすべてのセ"
-"キュリティ保護をバイパスしてしまうので、<emphasis>スーパーユーザ</emphasis>と"
-"も呼ばれています。root アカウントはシステム管理のみに使用し、可能な限り短時間"
-"使用するのみにすべきです。"
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"作成するパスワードは、少なくとも 6 文字以上で、大文字小文字、カンマやピリオド"
-"を混ぜるべきです。root パスワードを設定するときには、強力なアカウント故に特別"
-"注意を払ってください。辞書にある単語や推測される個人情報を使用するのは避けて"
-"ください。"
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"誰であっても、root パスワードが必要だと言う人がいる場合には、殊更に用心してく"
-"ださい。他のシステム管理者と共に機械の管理をしているのでなければ、root パス"
-"ワードを教える必要は、通常決してありません。"
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "一般ユーザの作成"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"システムは、この時点で一般ユーザアカウントを作成するかどうか質問します。この"
-"アカウントは、個人でログインする時のメインとするべきです。root アカウントを日"
-"常的に使用したり、個人的な用途でログインするべきでは<emphasis>ありません</"
-"emphasis>。"
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"なぜいけないのでしょう? root 権限を使用しないようにする理由のひとつは、root "
-"により簡単に取り返しのつかない損害を与えられるということです。他には、だまさ"
-"れて<emphasis>トロイの木馬</emphasis> (あなたに隠れ、スーパーユーザ権限を利用"
-"してシステムに感染するプログラム) を動かしてしまうということもあり得ます。"
-"UNIX システム管理に関するいずれの良書でも、この件に関して詳細に扱っています。"
-"今までご存じなければ、ご一読ください。"
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"まず初めに、ユーザのフルネームの入力を求められます。次にユーザアカウントの名"
-"前を求められます。一般的にファーストネームか、必要充分な名前に似た何かがデ"
-"フォルトになります。最後にこのアカウントのパスワードを求められます。"
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"インストール後いつでも、別のアカウントを作成する場合は、<command>adduser</"
-"command> コマンドを使用してください。"
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4148,8 +4153,8 @@ msgid ""
 msgstr ""
 "ブートローダがインストールされる前に、インストーラは既にインストールされてい"
 "る他の OS の検出を試します。サポートする OS を見つけると、ブートローダインス"
-"トールステップの間にそれを通知します。また、&debian; に加えて他の OS をブートで"
-"きるように、このコンピュータを設定します。"
+"トールステップの間にそれを通知します。また、&debian; に加えて他の OS をブート"
+"できるように、このコンピュータを設定します。"
 
 #. Tag: para
 #: using-d-i.xml:2603
@@ -4313,8 +4318,8 @@ msgid ""
 "will serve as a secondary boot loader."
 msgstr ""
 "ブートマネージャに他のものを使用したい場合は、これを選んでください。"
-"<command>LILO</command> は、新しい &debian; パーティションの先頭に自分自身をイ"
-"ンストールし、第 2 のブートローダとして動作します。"
+"<command>LILO</command> は、新しい &debian; パーティションの先頭に自分自身を"
+"インストールし、第 2 のブートローダとして動作します。"
 
 #. Tag: term
 #: using-d-i.xml:2713
@@ -4351,8 +4356,8 @@ msgstr ""
 "このステップの後に Windows 9x (または DOS) を起動できなくなっていれば、"
 "Windows 9x (MS-DOS) のブートディスクを使用し、<userinput>fdisk /mbr</"
 "userinput> コマンドで、MS-DOS マスターブートレコードを再インストールする必要"
-"があります。&mdash; しかしこれは、&debian; に戻すには他の方法を使う必要がある、"
-"ということを意味します!"
+"があります。&mdash; しかしこれは、&debian; に戻すには他の方法を使う必要があ"
+"る、ということを意味します!"
 
 #. Tag: title
 #: using-d-i.xml:2739
@@ -4413,14 +4418,21 @@ msgstr "正しいパーティションを選択してください!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "パーティションを選択する基準は、<emphasis>boot</emphasis> フラグがセットされ"
 "ている FAT フォーマットファイルシステムであるということです。&d-i; は、他のシ"
@@ -4499,8 +4511,8 @@ msgid ""
 "command menu."
 msgstr ""
 "システム起動時に <quote>EFI Boot Manager</quote> が実行するブートローダプログ"
-"ラム。<quote>EFI Boot Manager</quote> コマンドメニューの <guimenuitem>&debian; "
-"GNU/Linux</guimenuitem> を選択するとこれが起動します。"
+"ラム。<quote>EFI Boot Manager</quote> コマンドメニューの "
+"<guimenuitem>&debian; GNU/Linux</guimenuitem> を選択するとこれが起動します。"
 
 #. Tag: filename
 #: using-d-i.xml:2831
@@ -4556,9 +4568,9 @@ msgid ""
 "by the symbolic link <filename>/vmlinuz</filename>."
 msgstr ""
 "圧縮したカーネルそのもの。<filename>/etc/elilo.conf</filename> で参照されてい"
-"るファイルのコピーです。標準的な &debian; のインストールでは、シンボリックリン"
-"ク <filename>/vmlinuz</filename> で指し示す <filename>/boot</filename> にある"
-"ファイルです。"
+"るファイルのコピーです。標準的な &debian; のインストールでは、シンボリックリ"
+"ンク <filename>/vmlinuz</filename> で指し示す <filename>/boot</filename> にあ"
+"るファイルです。"
 
 #. Tag: title
 #: using-d-i.xml:2876
@@ -4832,8 +4844,8 @@ msgid ""
 "installer will do any last minute tasks. It mostly consists of tidying up "
 "after the &d-i;."
 msgstr ""
-"これからインストーラが行ういくつかのタスクが、&debian; のインストール過程での最"
-"終段階です。ほとんどが &d-i; の後片付けです。"
+"これからインストーラが行ういくつかのタスクが、&debian; のインストール過程での"
+"最終段階です。ほとんどが &d-i; の後片付けです。"
 
 #. Tag: title
 #: using-d-i.xml:3066
@@ -4945,8 +4957,8 @@ msgid ""
 "installer/</filename> on your new &debian; system."
 msgstr ""
 "インストールが成功したら、インストールプロセス中のログファイルが、新しい "
-"&debian; システムの <filename>/var/log/installer/</filename> に自動的に作成され"
-"ています。"
+"&debian; システムの <filename>/var/log/installer/</filename> に自動的に作成さ"
+"れています。"
 
 #. Tag: para
 #: using-d-i.xml:3145
diff --git a/po/ko/administrivia.po b/po/ko/administrivia.po
index d4cf4c5f0..e768f198d 100644
--- a/po/ko/administrivia.po
+++ b/po/ko/administrivia.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: administrivia.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2008-01-06 12:28+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -41,7 +41,7 @@ msgstr "문서 정보"
 #| "released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -206,7 +206,7 @@ msgstr ""
 #| "Kuře has documented a lot of the new functionality in Sarge's debian-"
 #| "installer."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/ko/bookinfo.po b/po/ko/bookinfo.po
index d9713fbb9..2bd3cf640 100644
--- a/po/ko/bookinfo.po
+++ b/po/ko/bookinfo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2008-01-06 12:29+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -61,14 +61,14 @@ msgstr ""
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "이 설치 안내서는 예전의 데비안 설치 시스템(<quote>boot-floppies</quote>)용으"
 "로 쓰여진 예전 설명서를 기반으로 새로운 데비안 설치 프로그램에 관한 내용을 추"
diff --git a/po/ko/hardware.po b/po/ko/hardware.po
index 2fa5c60ce..868e7666a 100644
--- a/po/ko/hardware.po
+++ b/po/ko/hardware.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2009-08-28 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -850,14 +850,14 @@ msgstr "입출력 버스"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "시스템 버스는 메인보드에서 CPU와 다른 주변 장치 (저장 장치 등) 사이의 통신을 "
-"담당하는 부분입니다. ISA, EISA, PCI, PCIe, PCI-X, VESA 로컬 버스 (VLB, VL 버스라고"
-"도 합니다) 중에 하나를 사용해야 합니다. 최근 몇년 사이에 유통된 개인용 컴퓨터"
-"는 모두 이 버스 중에 하나를 사용합니다."
+"담당하는 부분입니다. ISA, EISA, PCI, PCIe, PCI-X, VESA 로컬 버스 (VLB, VL 버"
+"스라고도 합니다) 중에 하나를 사용해야 합니다. 최근 몇년 사이에 유통된 개인용 "
+"컴퓨터는 모두 이 버스 중에 하나를 사용합니다."
 
 #. Tag: para
 #: hardware.xml:484
@@ -1633,31 +1633,25 @@ msgstr "S/390 및 zSeries 컴퓨터 종류"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
 msgstr ""
-"지원하는 S/390과 zSeries 컴퓨터에 대한 완전한 정보는 IBM의 레드북에서 2.1장"
-"의 <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf"
-"\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> 혹은 "
-"<ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/index.html"
-"\">developerWorks zSeries 페이지</ulink>에 있습니다. 요약하면, G5, "
-"Multiprise 3000, G6와 모든 zSeries를 완전히 지원합니다. Multiprise 2000, G3"
-"와 G4 컴퓨터는 IEEE 부동소수점을 에뮬레이션해서 지원하므로 효율이 떨어집니다."
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU와 메인 보드"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1671,13 +1665,13 @@ msgstr ""
 "지 설명합니다."
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1690,7 +1684,7 @@ msgstr ""
 "\">위키백과 SPARCstation 페이지</ulink>를 참고하십시오."
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The last Debian release to support sparc32 was Etch, but even then only "
@@ -1705,13 +1699,13 @@ msgstr ""
 "원합니다. 기타 32비트 서브아키텍처 지원은 그 전부터 중단된 상태였습니다."
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1728,13 +1722,13 @@ msgstr ""
 "sparc64 커널, SMP에서는 sparc64-smp 커널을 사용하십시오."
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1747,7 +1741,7 @@ msgstr ""
 "smp 커널을 사용하십시오."
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1757,13 +1751,13 @@ msgstr ""
 "다. 이 CPU는 리눅스 커널에서 지원하지 않습니다."
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "노트북"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1779,13 +1773,13 @@ msgstr ""
 "를 참고하십시오."
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "다중 프로세서"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1809,7 +1803,7 @@ msgstr ""
 "저하는 알아볼 수 없을 정도입니다."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1833,7 +1827,7 @@ msgstr ""
 "config-option;</quote> 옵션을 끄면 됩니다.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1857,7 +1851,7 @@ msgstr ""
 "기능을 사용하지 않습니다."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The 486 flavour of the Debian kernel image packages for &arch-title; is "
@@ -1870,7 +1864,7 @@ msgstr ""
 "들어 있지 않습니다."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1893,7 +1887,7 @@ msgstr ""
 "부팅합니다."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order to take advantage of multiple processors, you'll have to replace "
@@ -1917,7 +1911,7 @@ msgstr ""
 "config-option;</quote> 옵션을 켜면 됩니다.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1942,7 +1936,7 @@ msgstr ""
 "부팅하므로 설치에는 문제가 없습니다."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1953,7 +1947,7 @@ msgstr ""
 "십시오."
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can also build your own customized kernel to support SMP. <phrase "
@@ -1976,20 +1970,27 @@ msgstr ""
 "config-option;</quote> 옵션을 선택하면 됩니다.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "그래픽 카드 지원"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "콘솔 터미널에 사용할 VGA 호환 디스플레이 인터페이스를 사용해야 합니다. 요즘 "
 "거의 모든 디스플레이 카드는 VGA와 호환됩니다. 아주 옛날에 쓰였던 CGA, MDA, "
@@ -1997,35 +1998,35 @@ msgstr ""
 "에서는 X11이 필요없습니다."
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Debian's support for graphical interfaces is determined by the underlying "
-#| "support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards "
-#| "work under X.Org. Details on supported graphics buses, cards, monitors, "
-#| "and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-#| "Debian &release; ships with X.Org version &x11ver;."
+#| "support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+#| "cards work under X.Org. Details on supported graphics buses, cards, "
+#| "monitors, and pointing devices can be found at <ulink url=\"&url-xorg;"
+#| "\"></ulink>. Debian &release; ships with X.Org version &x11ver;."
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "데비안의 그래픽 인터페이스 지원 여부는 X.Org의 X11 시스템이 지원하느냐의 여부"
-"에 따라 결정됩니다. 대부분의 AGP, PCI, PCIe 및 PCI-X 비디오 카드를 X.Org에서 지원합"
-"니다. 지원하는 그래픽 버스, 카드, 모니터, 포인팅 장치에 대한 정보는 <ulink "
-"url=\"&url-xorg;\"></ulink>에 있습니다. 데비안 &release; 릴리스에는 X.Org "
-"&x11ver; 버전이 들어 있습니다."
+"에 따라 결정됩니다. 대부분의 AGP, PCI, PCIe 및 PCI-X 비디오 카드를 X.Org에서 "
+"지원합니다. 지원하는 그래픽 버스, 카드, 모니터, 포인팅 장치에 대한 정보는 "
+"<ulink url=\"&url-xorg;\"></ulink>에 있습니다. 데비안 &release; 릴리스에는 X."
+"Org &x11ver; 버전이 들어 있습니다."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org X 윈도우 시스템은 SGI Indy 및 O2에서만 지원합니다."
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2045,7 +2046,7 @@ msgstr ""
 "어 보십시오."
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2071,13 +2072,13 @@ msgstr ""
 "이 자동으로 활성화됩니다."
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "네트워크 연결 하드웨어"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Almost any network interface card (NIC) supported by the Linux kernel "
@@ -2098,7 +2099,7 @@ msgstr ""
 "\"i386\">오래된 ISA 카드도 지원됩니다.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2109,65 +2110,65 @@ msgstr ""
 
 # 네트워크 카드 이름
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 # 네트워크 카드 이름
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 # 네트워크 카드 이름
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 # 네트워크 카드 이름
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 # 네트워크 카드 이름
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "지원하는 네트워크 장치 목록은:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) 및 ESCON 연결 (실제 혹은 에뮬레이션)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet 및 OSA-Express Fast Ethernet (QDIO 아님)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express (QDIO 모드), HiperSockets, Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2186,19 +2187,19 @@ msgstr ""
 "서 받을 수 있습니다."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN을 지원합니다. 하지만 설치할 때 사용할 수는 없습니다."
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "무선 네트워크 카드"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Wireless networking is in general supported as well and a growing number "
@@ -2220,7 +2221,7 @@ msgstr ""
 "gnu;에서 동작하도록 만들 수 있지만, 설치할 때는 지원하지 않습니다."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Wireless networking is in general supported as well and a growing number "
@@ -2239,7 +2240,7 @@ msgstr ""
 "gnu;에서 동작하도록 만들 수 있지만, 설치할 때는 지원하지 않습니다."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2248,7 +2249,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The use of wireless networking during installation is still under "
@@ -2277,7 +2278,7 @@ msgstr ""
 "동으로 설치할 수 있습니다."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In some cases the driver you need may not be available as a Debian "
@@ -2302,13 +2303,13 @@ msgstr ""
 "이버를 사용할 수 있습니다.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "&arch-title; 아키텍처의 알려진 문제점"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2316,13 +2317,13 @@ msgid ""
 msgstr "특정 네트워크 카드와 관련한 문제를 몇 가지 설명합니다."
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip과 dfme 드라이버의 충돌"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2340,7 +2341,7 @@ msgstr ""
 "워크 카드가 동작하지 않거나 오동작합니다."
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2354,7 +2355,7 @@ msgstr ""
 "린 드라이버 모듈 사용을 막으면 이 문제를 해결할 수 있습니다."
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2374,13 +2375,13 @@ msgstr ""
 "단 시스템을 다시 시작하면 잘못된 다시 모듈이 올라올 수 있습니다."
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2390,13 +2391,13 @@ msgstr ""
 "하지 않습니다."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "점자 디스플레이"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2414,13 +2415,13 @@ msgstr ""
 "classname> &brlttyver; 버전이 들어 있습니다."
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "하드웨어 음성 합성 장치"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2441,13 +2442,13 @@ msgstr ""
 "다."
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "주변 장치 및 기타 하드웨어"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Linux supports a large variety of hardware devices such as mice, "
@@ -2463,7 +2464,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2473,7 +2474,7 @@ msgstr ""
 "(<xref linkend=\"hardware-issues\"/> 참고)"
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2484,7 +2485,7 @@ msgstr ""
 "우투</ulink>를 참고해 하드웨어를 리눅스에서 지원하는 지 확인하십시오."
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2496,7 +2497,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2505,13 +2506,13 @@ msgstr ""
 "Cobalt RaQ에는 장치를 추가할 수 없지만 Qube에는 PCI 슬롯이 하나가 있습니다."
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "펌웨어가 필요한 장치"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2528,7 +2529,7 @@ msgstr ""
 "펌웨어가 필요하기도 합니다."
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2544,7 +2545,7 @@ msgstr ""
 "경우, 아카이브의 non-free 섹션에 별도 패키지로 들어 있기도 합니다."
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2561,14 +2562,14 @@ msgstr ""
 "\"/> 부분을 참고하십시오."
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, fuzzy, no-c-format
 #| msgid "Purchasing Hardware Specifically for GNU/Linux"
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "GNU/리눅스 용도의 하드웨어 구입하기"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, fuzzy, no-c-format
 #| msgid ""
 #| "There are several vendors, who ship systems with Debian or other "
@@ -2589,7 +2590,7 @@ msgstr ""
 "실하기 때문입니다."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2604,7 +2605,7 @@ msgstr ""
 "이트를 참고하십시오."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Whether or not you are purchasing a system with Linux bundled, or even a "
@@ -2627,13 +2628,13 @@ msgstr ""
 "고 알려 주십시오. 리눅스와 친한 하드웨어 업체를 지원해 주십시오."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "독점적이거나 폐쇄된 하드웨어 피하기"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2651,7 +2652,7 @@ msgstr ""
 "볼 수 없어서 리눅스 소스 코드를 공개할 수 없기도 합니다."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Since we haven't been granted access to the documentation on these "
@@ -2672,13 +2673,13 @@ msgstr ""
 "한 시장이라는 걸 깨닫게 될 겁니다."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "윈도우즈 전용 하드웨어"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2703,7 +2704,7 @@ msgstr ""
 "도 합니다."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2756,7 +2757,7 @@ msgstr ""
 "웨어가 처리할 부담을 CPU에 옮겨 놓았기 때문에, 효율이 떨어질 수밖에 없습니다."
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can help improve this situation by encouraging these manufacturers to "
@@ -2778,13 +2779,13 @@ msgstr ""
 "고 나올 때까지는 이런 종류의 하드웨어 사용을 피하는 것입니다."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "설치 미디어"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will help you determine which different media types you can "
@@ -2808,13 +2809,13 @@ msgstr ""
 "다. 그 부분을 보시고 다시 이 페이지로 돌아오면 됩니다."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "플로피"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2825,19 +2826,19 @@ msgstr ""
 "(high-density, 1440킬로바이트) 3.5인치 플로피 드라이브가 있어야 합니다."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "CHRP에서는, 현재 플로피 지원이 동작하지 않는 상태입니다."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2851,7 +2852,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2870,7 +2871,7 @@ msgstr ""
 "하십시오."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2882,7 +2883,7 @@ msgstr ""
 "히 설명되어 있습니다."
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2892,13 +2893,13 @@ msgstr ""
 "FireWire 장치도 지원합니다."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "IDE/ATAPI CD-ROM은 모든 ARM 컴퓨터에서 지원합니다."
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2917,13 +2918,13 @@ msgstr ""
 "<quote>System installation</quote> 항목을 선택하면 됩니다."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "하드디스크"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2935,7 +2936,7 @@ msgstr ""
 "운영 체제가 있어야 합니다."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2945,13 +2946,13 @@ msgstr ""
 "파티션(UFS 슬라이스)에서부터 설치할 수는 있습니다."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB 메모리"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Many Debian boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2974,13 +2975,13 @@ msgstr ""
 "요한 드라이브를 부착할 공간이 부족한 작은 시스템에서도 좋습니다."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "네트워크"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2998,7 +2999,7 @@ msgstr ""
 "다.) 설치를 마친 다음에는 ISDN이나 PPP를 사용하도록 설정할 수 있습니다."
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -3010,7 +3011,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -3020,13 +3021,13 @@ msgstr ""
 "NFS 마운트에서 부팅할 수도 있습니다."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "유닉스 계열 혹은 GNU 시스템"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -3042,13 +3043,13 @@ msgstr ""
 "upgrade\"/> 부분으로 넘어가십시오."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "지원하는 저장 장치"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The Debian boot disks contain a kernel which is built to maximize the "
@@ -3074,7 +3075,7 @@ msgstr ""
 "치를 지원해야 데비안을 여러가지 하드웨어에 설치할 수 있습니다."
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Generally, the Debian installation system includes support for floppies, "
@@ -3092,7 +3093,7 @@ msgstr ""
 "원하는 파일 시스템은 FAT, Win-32 FAT 확장 기능 (VFAT), NTFS 등을 지원합니다."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -3107,7 +3108,7 @@ msgstr ""
 "howto;\">리눅스 하드웨어 호환성 하우투</ulink>를 참고하십시오."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3130,7 +3131,7 @@ msgstr ""
 "SPARC Processors FAQ</ulink>를 참고하십시오."
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3141,7 +3142,7 @@ msgstr ""
 "커널은 CHRP 시스템의 플로피 드라이브를 전혀 지원하지 않으니 주의하십시오."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3152,7 +3153,7 @@ msgstr ""
 "은 플로피 드라이브를 전혀 지원하지 않으니 주의하십시오."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3160,7 +3161,7 @@ msgid ""
 msgstr "리눅스 커널에서 지원하는 저장 장치는 부팅 시스템에서도 지원합니다."
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3172,13 +3173,13 @@ msgstr ""
 "(cdl) 방식을 모두 지원합니다."
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "메모리 및 디스크 공간 요구 사항"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3192,7 +3193,7 @@ msgstr ""
 "linkend=\"minimum-hardware-reqts\"/> 부분을 참고하십시오."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -3210,6 +3211,26 @@ msgstr ""
 "는 일반 설치 프로그램을 고르십시오. </para> </footnote> 빈 디스크 공간이 작"
 "은 시스템에 설치할 수도 있지만 전문적인 사용자만 하기를 권장합니다."
 
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "지원하는 S/390과 zSeries 컴퓨터에 대한 완전한 정보는 IBM의 레드북에서 2.1"
+#~ "장의 <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264."
+#~ "pdf\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> 혹"
+#~ "은 <ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/"
+#~ "index.html\">developerWorks zSeries 페이지</ulink>에 있습니다. 요약하면, "
+#~ "G5, Multiprise 3000, G6와 모든 zSeries를 완전히 지원합니다. Multiprise "
+#~ "2000, G3와 G4 컴퓨터는 IEEE 부동소수점을 에뮬레이션해서 지원하므로 효율이 "
+#~ "떨어집니다."
+
 #~ msgid "DEC Alpha"
 #~ msgstr "DEC Alpha"
 
diff --git a/po/ko/install-methods.po b/po/ko/install-methods.po
index a4d818375..aadb7ffcc 100644
--- a/po/ko/install-methods.po
+++ b/po/ko/install-methods.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2009-08-28 02:35+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1637,7 +1637,7 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "데비안 아카이브의 다음 파일을 하드 드라이브의 편리한 위치로 복사하십시오. 예"
diff --git a/po/ko/preparing.po b/po/ko/preparing.po
index 1d952695f..fd661cc39 100644
--- a/po/ko/preparing.po
+++ b/po/ko/preparing.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2008-10-12 10:26+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -486,20 +486,18 @@ msgstr "&arch-title; 하드웨어 참고서"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"커널 2.4를 사용한 리눅스 설치 방법 및 장치 드라이버 (DASD, XPRAM, 콘솔, 테이"
-"프, z90 crypto, chandev, 네트워크)"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "장치 드라이버 및 설치 명령어"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -509,13 +507,13 @@ msgstr ""
 "설명합니다."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "&arch-title;용 리눅스"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, fuzzy, no-c-format
 #| msgid ""
 #| "IBM Redbook describing the Linux distributions available for the "
@@ -532,19 +530,19 @@ msgstr ""
 
 # IBM Redbook 이름
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "하드웨어 정보가 있는 곳 찾기"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -555,19 +553,19 @@ msgstr ""
 "하려면, 설치하기 전에 하드웨어에 대해 잘 알아 두는 게 좋습니다."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "하드웨어 정보는 다음에서 알아낼 수 있습니다:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "하드웨어에 같이 들어 있는 설명서."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -578,19 +576,19 @@ msgstr ""
 "화면을 볼 수 있습니다. 보통 <keycap>Delete</keycap> 키입니다."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "하드웨어의 케이스 및 포장."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "윈도우즈 제어판의 시스템 창."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -601,7 +599,7 @@ msgstr ""
 "도구. 특히 RAM과 하드 드라이브에 대한 정보를 알아내는 데 유용합니다."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -611,175 +609,175 @@ msgstr ""
 "관련된 사항을 알 수 있습니다."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "설치하는 데 필요한 하드웨어 정보"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "하드웨어"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "필요할 수 있는 정보"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "하드 드라이브"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "용량이 얼마나 되는 지."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "시스템에 붙어 있는 순서."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "IDE (PATA), SATA, SCSI 중 한 가지."
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "사용 가능한 빈 공간."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "파티션."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "다른 운영 체제를 설치한 파티션."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "모니터"
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "모델 및 제조사."
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "지원하는 해상도."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "가로 출력 주파수."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "세로 출력 주파수."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "지원하는 색상수."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "화면 크기."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "마우스"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "종류: 시리얼, PS/2, 혹은 USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "포트."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "제조사."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "단추 개수."
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "네트워크"
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "어댑터 종류."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "프린터"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "지원하는 인쇄 해상도."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "비디오 카드"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "비디오 RAM 크기."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -787,37 +785,37 @@ msgid ""
 msgstr "지원하는 해상도 및 색상수 (모니터에서도 지원하는 지 확인해야 합니다)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "장치 번호."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "장치 번호."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "OSA 카드의 상대 어댑터 번호."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "하드웨어 호환성"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Many brand name products work without trouble on Linux. Moreover, "
@@ -834,7 +832,7 @@ msgstr ""
 "큼 다양한 종류의 하드웨어에서 동작하지는 못합니다."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In particular, Linux usually cannot run hardware that requires a running "
@@ -846,7 +844,7 @@ msgstr ""
 "특히 윈도우즈가 있어야 동작하는 하드웨어는 리눅스에서 이용하지 못합니다."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -860,7 +858,7 @@ msgstr ""
 "용할 수 없게 됩니다."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -870,19 +868,19 @@ msgstr ""
 "윈도우즈 전용이 있습니다."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "다음 방법으로 하드웨어 호환성을 알아볼 수 있습니다:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "제조사의 웹사이트에서 새 드라이버 확인하기."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -892,7 +890,7 @@ msgstr ""
 "품이 더 많이 알려진 제품의 드라이버와 설정을 그대로 사용하기도 합니다."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Checking hardware compatibility lists for Linux on web sites dedicated to "
@@ -903,19 +901,19 @@ msgid ""
 msgstr "해당 아키텍처에 관한 웹사이트에서 리눅스 하드웨어 호환성 목록 확인."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "인터넷에서 다른 사용자의 사용담 검색해 보기."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "네트워크 설정"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -927,31 +925,31 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "호스트 이름 (직접 정할 수도 있습니다)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "도메인 이름."
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "컴퓨터의 IP 주소."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "네트워크에 사용할 네트마스크."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -961,7 +959,7 @@ msgstr ""
 "는 경우</emphasis>)."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -969,7 +967,7 @@ msgid ""
 msgstr "네트워크에서 DNS (Domain Name Service) 서버로 사용할 시스템."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -982,31 +980,31 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "무선 네트워크를 사용한다면, 다음도 알아봐야 합니다:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "무선 네트워크의 ESSID."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEP 보안 키 (보안 키를 사용하는 경우)."
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "최소 하드웨어 요구 사항 맞추기"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -1017,7 +1015,7 @@ msgstr ""
 "서 설치할 수 있는 지 확인하십시오."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -1029,119 +1027,124 @@ msgstr ""
 "짜증나는 문제를 겪게 됩니다."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "데스크탑 시스템 용도로 최소 펜티엄 4 1GHz 시스템을 추천합니다."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
 "모든 올드월드 혹은 뉴월드 PowerPC는 데스크탑 시스템으로 쓸 수 있습니다."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "추천하는 최소 시스템 요구사항"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "설치 종류"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "램 (최소)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "램 (추천)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "하드 드라이브"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "데스크탑 없음"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64메가바이트"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256메가바이트"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1기가바이트"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "데스크탑 포함"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512메가바이트"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512메가바이트"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5기가바이트"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The actual minimum memory requirements are a lot less then the numbers "
 #| "listed in this table. Depending on the architecture, it is possible to "
-#| "install Debian with as little as 20MB (for s390) to 60MB (for "
-#| "amd64). The same goes for the disk space requirements, especially if you "
-#| "pick and choose which applications to install; see <xref linkend="
-#| "\"tasksel-size-list\"/> for additional information on disk space "
-#| "requirements."
+#| "install Debian with as little as 20MB (for s390) to 60MB (for amd64). The "
+#| "same goes for the disk space requirements, especially if you pick and "
+#| "choose which applications to install; see <xref linkend=\"tasksel-size-"
+#| "list\"/> for additional information on disk space requirements."
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "실제로 최소한 필요한 메모리는 이 표에 나와 있는 숫자보다 훨씬 적습니다. 아키"
-"텍쳐에 따라서는 20MB (s390의 경우) 혹은 60MB (amd64의 경우) 메모리에 "
-"데비안을 설치할 수 있습니다. 필요한 디스크 공간도 마찬가지입니다. 특히 설치"
-"할 프로그램을 직접 선택하는 경우에는 더 적은 공간에 설치할 수 있습니다. 필요"
-"한 디스크 공간에 대해서는 <xref linkend=\"tasksel-size-list\"/> 부분을 참고하"
-"십시오."
+"텍쳐에 따라서는 20MB (s390의 경우) 혹은 60MB (amd64의 경우) 메모리에 데비안"
+"을 설치할 수 있습니다. 필요한 디스크 공간도 마찬가지입니다. 특히 설치할 프로"
+"그램을 직접 선택하는 경우에는 더 적은 공간에 설치할 수 있습니다. 필요한 디스"
+"크 공간에 대해서는 <xref linkend=\"tasksel-size-list\"/> 부분을 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1158,7 +1161,7 @@ msgstr ""
 "가 있습니다."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1169,7 +1172,7 @@ msgstr ""
 "다. 그 서버가 어떤 용도로 사용하느냐에 따라 많이 달라지기 때문입니다."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1181,7 +1184,7 @@ msgstr ""
 "게 잡는 게 좋습니다."
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1213,13 +1216,13 @@ msgstr ""
 "보해 놓아야 합니다. 그리고 그래픽 데스크탑 환경을 사용한다면 더 필요합니다."
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "멀티 부팅 시스템에서 미리 파티션하기"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1232,7 +1235,7 @@ msgstr ""
 "떤 방에 가구를 놓는다고 해서 다른 방에 영향을 끼치지 않습니다."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1244,39 +1247,40 @@ msgstr ""
 "VM guest를 말합니다."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Linux on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Linux systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
+#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> and want to stick Linux on the same disk, you "
+#| "will need to repartition the disk. Debian requires its own hard disk "
+#| "partitions. It cannot be installed on Windows or MacOS partitions. It may "
+#| "be able to share some partitions with other Linux systems, but that's not "
+#| "covered here. At the very least you will need a dedicated partition for "
+#| "the Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "시스템에 이미 다른 운영 체제가 들어 있고 <phrase arch=\"x86\"> (윈도우즈 9x, "
-"윈도우즈 NT/2000/XP/2003/Vista/7, OS/2, 맥오에스, Solaris, FreeBSD, &hellip;) </phrase> "
-"<phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> 같은 디스크에 "
-"리눅스도 설치하려면 디스크를 다시 파티션해야 합니다. 데비안은 데비안만 사용하"
-"는 디스크 파티션이 따로 있어야 합니다. 데비안은 윈도우즈나 맥오에스 파티션에 "
-"설치할 수 없습니다. 다른 리눅스 시스템과는 일부 파티션을 공유할 수도 있지만, "
-"여기서는 그 방법에 대해 다루지 않습니다. 최소한 데비안 루트에 사용할 전용 파"
-"티션이 하나 있어야 합니다."
+"윈도우즈 NT/2000/XP/2003/Vista/7, OS/2, 맥오에스, Solaris, FreeBSD, "
+"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
+"phrase> 같은 디스크에 리눅스도 설치하려면 디스크를 다시 파티션해야 합니다. 데"
+"비안은 데비안만 사용하는 디스크 파티션이 따로 있어야 합니다. 데비안은 윈도우"
+"즈나 맥오에스 파티션에 설치할 수 없습니다. 다른 리눅스 시스템과는 일부 파티션"
+"을 공유할 수도 있지만, 여기서는 그 방법에 대해 다루지 않습니다. 최소한 데비"
+"안 루트에 사용할 전용 파티션이 하나 있어야 합니다."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can find information about your current partition setup by using a "
@@ -1300,7 +1304,7 @@ msgstr ""
 "지 않고도 현재 파티션을 보기만 할 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1315,13 +1319,13 @@ msgstr ""
 "아야 가구가 망가지지 않을 겁니다."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your computer has more than one hard disk, you may want to dedicate "
@@ -1341,7 +1345,7 @@ msgstr ""
 
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1367,7 +1371,7 @@ msgstr ""
 "지고 있는 게 좋습니다."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your machine already has multiple partitions, and enough space can be "
@@ -1390,7 +1394,7 @@ msgstr ""
 "파티션에서 기존 파티션의 순서때문에 설치 전에 파티션해야 할 수도 있습니다."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1406,7 +1410,7 @@ msgstr ""
 "니다."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If none of the above apply, you'll need to partition your hard disk "
@@ -1435,7 +1439,7 @@ msgstr ""
 "어야 합니다."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are going to install more than one operating system on the same "
@@ -1456,7 +1460,7 @@ msgstr ""
 "션이 아닌 파티션을 다시 포맷하라고 할 수도 있습니다."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1467,7 +1471,7 @@ msgstr ""
 
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
@@ -1496,7 +1500,7 @@ msgstr ""
 "티션 도구를 이용해 그 위치에 리눅스 파티션을 만들 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you currently have one hard disk with one partition (a common setup "
@@ -1511,13 +1515,13 @@ msgstr ""
 "체제와 데비안을 멀티 부팅하는 경우, 다음과 같이 해야 합니다:"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "컴퓨터에 들어 있는 내용을 전부 백업하십시오."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1531,7 +1535,7 @@ msgstr ""
 
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1542,13 +1546,13 @@ msgstr ""
 "십시오."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "새 파티션에 원래 운영 체제를 설치하십시오."
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Boot back into the native system to verify everything's OK, and to "
@@ -1561,20 +1565,20 @@ msgstr ""
 "팅 파일을 다운로드하십시오."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, fuzzy, no-c-format
 #| msgid "Boot the Debian installer to continue installing Debian."
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "데비안 설치 프로그램으로 부팅해 데비안 설치를 계속하십시오."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "DOS나 윈도우즈에서 파티션하기"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are manipulating existing FAT or NTFS partitions, it is "
@@ -1592,7 +1596,7 @@ msgstr ""
 "파티션할 필요는 없습니다. 보통 리눅스 파티션 도구가 더 좋습니다."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, fuzzy, no-c-format
 #| msgid ""
 #| "But if you have a large IDE disk, and are not using LBA addressing, "
@@ -1619,47 +1623,47 @@ msgstr ""
 "다). 이렇게 하려면 기존 FAT나 NTFS 파티션을 옮겨야 할 수도 있습니다."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "DOS, Win-32, OS/2의 데이터 손실없이 다시 파티션하기"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, fuzzy, no-c-format
 #| msgid ""
 #| "One of the most common installations is onto a system that already "
 #| "contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, "
-#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian onto the same "
-#| "disk without destroying the previous system. Note that the installer "
-#| "supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
-#| "Simply start the installer and when you get to the partitioning step, "
-#| "select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </"
-#| "menuchoice> partitioning, select the partition to resize, and specify its "
-#| "new size. So in most cases you should not need to use the method "
-#| "described below."
+#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian "
+#| "onto the same disk without destroying the previous system. Note that the "
+#| "installer supports resizing of FAT and NTFS filesystems as used by DOS "
+#| "and Windows. Simply start the installer and when you get to the "
+#| "partitioning step, select the option for <menuchoice> "
+#| "<guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, select the "
+#| "partition to resize, and specify its new size. So in most cases you "
+#| "should not need to use the method described below."
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "설치할 때 가장 흔한 경우가 이미 DOS (윈도우즈 3.1 포함), Win32 (윈도우즈 95, "
-"98, Me, NT, 2000, XP, 2003, Vista, 7), 혹은 OS/2와 같은 시스템이 들어 있고, 이전의 시스템을 "
-"망가뜨리지 않고 같은 디스크에 데비안을 설치하려는 경우입니다. DOS나 윈도우즈"
-"에서 사용하는 FAT와 NTFS 파일 시스템의 크기를 조정하는 기능이 설치 프로그램"
-"에 들어 있습니다. 설치 프로그램에서 파티션하기 단계에 들어가면 <menuchoice> "
-"<guimenuitem>수동으로</guimenuitem> </menuchoice> 파티션하기 옵션을 선택하고 "
-"크기를 조정하려는 파티션을 선택하고 새로운 크기를 지정하십시오. 이렇게 하면 "
-"대부분 아래에 설명한 방법을 쓰지 않아도 됩니다."
+"98, Me, NT, 2000, XP, 2003, Vista, 7), 혹은 OS/2와 같은 시스템이 들어 있고, "
+"이전의 시스템을 망가뜨리지 않고 같은 디스크에 데비안을 설치하려는 경우입니"
+"다. DOS나 윈도우즈에서 사용하는 FAT와 NTFS 파일 시스템의 크기를 조정하는 기능"
+"이 설치 프로그램에 들어 있습니다. 설치 프로그램에서 파티션하기 단계에 들어가"
+"면 <menuchoice> <guimenuitem>수동으로</guimenuitem> </menuchoice> 파티션하기 "
+"옵션을 선택하고 크기를 조정하려는 파티션을 선택하고 새로운 크기를 지정하십시"
+"오. 이렇게 하면 대부분 아래에 설명한 방법을 쓰지 않아도 됩니다."
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Before going any further, you should have decided how you will be "
@@ -1683,7 +1687,7 @@ msgstr ""
 "니다."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1700,7 +1704,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: preparing.xml:984
+#: preparing.xml:983
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The first thing needed is a copy of <command>fips</command> which is "
@@ -1714,16 +1718,14 @@ msgstr ""
 #| "compression driver or a disk manager. Create the disk and read the "
 #| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "먼저 필요한 건 데비안 미러 사이트에서 <filename>tools/</filename> 디렉토리에 "
 "있는 <command>fips</command> 프로그램입니다. 압축 파일을 풀고 "
@@ -1736,7 +1738,7 @@ msgstr ""
 "고 문서를 읽어 보십시오."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1755,7 +1757,7 @@ msgstr ""
 "는 VFAT를 인식하지 못합니다."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1767,7 +1769,7 @@ msgstr ""
 "시오. <filename>a:\\fips</filename>를 실행해 안내에 따르십시오."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1777,13 +1779,13 @@ msgstr ""
 "자가 많이 있습니다."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "DOS용 파티션하기"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1805,7 +1807,7 @@ msgstr ""
 "생했습니다."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1823,19 +1825,19 @@ msgstr ""
 "기 전에 리눅스에서 다음 명령어를 실행하십시오:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "SunOS에서 파티션하기"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, fuzzy, no-c-format
 #| msgid ""
 #| "It's perfectly fine to partition from SunOS; in fact, if you intend to "
@@ -1859,13 +1861,13 @@ msgstr ""
 "스와 SunOS 부팅을 지원합니다."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "리눅스 및 그 밖의 OS에서 파티션하기"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1887,7 +1889,7 @@ msgstr ""
 "을 만들어야 하고, 아니면 디스크 크기에 관련한 오류가 발생할 것입니다."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1900,13 +1902,13 @@ msgstr ""
 "격한 제한이 있습니다. <xref linkend=\"partitioning\"/> 부분을 참고하십시오."
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "맥오에스/맥오에스X 파티션하기"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1921,7 +1923,7 @@ msgstr ""
 "이버 파티션은 <application>Drive Setup</application>에 나타나지 않습니다."
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1934,7 +1936,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1959,7 +1961,7 @@ msgstr ""
 "과 OS X 파티션은 OS 9과 OS X 모두에서 접근할 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1978,13 +1980,13 @@ msgstr ""
 "다."
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "설치하기 전에 할 하드웨어 및 운영 체제 설정"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -2010,13 +2012,13 @@ msgstr ""
 "의 &debian-gnu; 안정성과 관련된 하드웨어 문제도 다룹니다."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOS 설정 메뉴 들어가기"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -2040,7 +2042,7 @@ msgstr ""
 "할 수도 있습니다."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -2054,26 +2056,26 @@ msgstr ""
 "를 만든 회사에 따라 다릅니다:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr ""
 "POST (power on self test, 최초 테스트) 도중에 <keycap>Delete</keycap> 키 "
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2083,25 +2085,25 @@ msgstr ""
 "keycap> </keycombo>, 아니면 <keycap>Delete</keycap> 키"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "POST 도중에 <keycap>Esc</keycap> 키"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -2113,13 +2115,13 @@ msgstr ""
 "keycap><keycap>Insert</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2131,7 +2133,7 @@ msgstr ""
 "keycap><keycap>S</keycap> </keycombo> 아니면 <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2141,7 +2143,7 @@ msgstr ""
 "\"></ulink>에 있습니다."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2156,13 +2158,13 @@ msgstr ""
 "simtel;\"></ulink> 사이트를 살펴 보십시오."
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "부팅 장치 선택"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Many BIOS setup menus allow you to select the devices that will be used "
@@ -2190,7 +2192,7 @@ msgstr ""
 "비안을 부팅할 때 이 둘 중의 하나에서 부팅합니다."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2202,7 +2204,7 @@ msgstr ""
 "을 켜는 일 뿐입니다."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2217,7 +2219,7 @@ msgstr ""
 "quote> 혹은 <quote>USB-ZIP</quote>에서 부팅하도록 BIOS를 설정합니다."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Here are some details about how to set the boot order. Remember to reset "
@@ -2233,13 +2235,13 @@ msgstr ""
 "팅할 수 있습니다."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "IDE 컴퓨터의 부팅 순서 바꾸기"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2251,7 +2253,7 @@ msgstr ""
 "서를 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2261,19 +2263,19 @@ msgstr ""
 "만, 드라이브 여러 개를 늘어 놓은 필드를 찾으면 됩니다."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "IDE 컴퓨터에서는 보통 C, A, cdrom이거나 A, C, cdrom입니다."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C는 하드 드라이브이고, A는 플로피 드라이브입니다."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2285,7 +2287,7 @@ msgstr ""
 "나를 선택합니다."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2293,20 +2295,20 @@ msgid ""
 msgstr "바꾼 내용을 저장하십시오. 설정 화면의 안내에 따라 저장하십시오."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "SCSI 컴퓨터에서 부팅 순서 바꾸기"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr "컴퓨터가 시작하면, SCSI 설정 유틸리티로 들어가는 키를 누르십시오."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2316,7 +2318,7 @@ msgstr ""
 "다음, SCSI 설정 유틸리티로 들어갈 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2328,13 +2330,13 @@ msgstr ""
 "키 조합은 하드웨어 문서를 보십시오."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "부팅 순서를 바꾸는 유틸리티 찾기."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2342,7 +2344,7 @@ msgstr ""
 "CD 드라이브의 SCSI ID가 목록의 첫번째가 되도록 유틸리티를 설정하십시오."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2352,19 +2354,19 @@ msgstr ""
 "오. 보통 <keycap>F10</keycap>을 눌러야 합니다."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "기타 BIOS 설정"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "CD-ROM 설정"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2377,13 +2379,13 @@ msgstr ""
 "userinput> 오류 메세지가 나오게 된다면 이 문제 때문일 수도 있습니다."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Extended와 Expanded Memory"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2402,13 +2404,13 @@ msgstr ""
 "를 사용할 수 없습니다."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Virus Protection"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2444,13 +2446,13 @@ msgstr ""
 "footnote>."
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Shadow RAM"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2486,13 +2488,13 @@ msgstr ""
 "에 접근할 때 문제가 발생할 수 있습니다."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Memory Hole"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2508,7 +2510,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2528,13 +2530,13 @@ msgstr ""
 "quote>로 설정하면 동작하고 아니면 동작하지 않는 것 밖에 알지 못합니다.)"
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Advanced Power Management"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your motherboard provides Advanced Power Management (APM), configure "
@@ -2555,13 +2557,13 @@ msgstr ""
 "드에 대한 컨트롤을 할 수 있고, BIOS보다 더 전원 관리를 잘 합니다."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "OpenFirmware 실행"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2576,7 +2578,7 @@ msgstr ""
 "셔야 합니다."
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2594,7 +2596,7 @@ msgstr ""
 "하십시오."
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2617,7 +2619,7 @@ msgstr ""
 "를 쓸 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2638,13 +2640,13 @@ msgstr ""
 "를 눌러 펌웨어 패치를 nvram에 설치하십시오."
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "OpenBoot 실행"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2659,7 +2661,7 @@ msgstr ""
 "지 일을 할 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2679,7 +2681,7 @@ msgstr ""
 "가 나옵니다."
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2693,7 +2695,7 @@ msgstr ""
 "미널 에뮬레이터의 문서를 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2712,7 +2714,7 @@ msgstr ""
 "Reference</ulink>에서 볼 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2753,7 +2755,7 @@ msgstr ""
 "openboot;\">Sun OpenBoot Reference</ulink>를 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2782,20 +2784,20 @@ msgstr ""
 "</screen></informalexample> 그리고 Solaris에서는:"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 설정"
 
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2816,7 +2818,7 @@ msgstr ""
 "서 3215/3270 콘솔은 문자 단위가 아니라 라인 단위입니다."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2835,7 +2837,7 @@ msgstr ""
 "있는 경우.)"
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Before you actually perform an installation, you have to go over some "
@@ -2870,13 +2872,13 @@ msgstr ""
 "로 돌아와서 데비안에 관련된 설치 단계를 진행하십시오."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "네이티브 및 LPAR 설치"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2892,13 +2894,13 @@ msgstr ""
 "드북의 3.2장을 참고하십시오."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "VM guest로 설치"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2914,13 +2916,21 @@ msgstr ""
 "Distributions</ulink> 레드북의 3.1장을 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "<filename>generic</filename> 서브 디렉토리에서 CMS 디스크로 모든 파일을 복사"
 "해 놓아야 합니다. <filename>kernel.debian</filename> 및 <filename>initrd."
@@ -2928,13 +2938,13 @@ msgstr ""
 "로 가져오십시오."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "설치 서버 준비하기"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2947,7 +2957,7 @@ msgstr ""
 "들어 있고 그 패키지를 NFS나 HTTP나 FTP로 외부에서 접근할 수 있게 합니다."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2960,25 +2970,25 @@ msgstr ""
 "설치 CD의 내용만 복사해 올 수도 있습니다."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "주의해야 할 하드웨어 문제"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS 지원 및 키보드"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2997,13 +3007,13 @@ msgstr ""
 "emulation</quote>이나 <quote>USB keyboard support</quote> 옵션을 찾으십시오."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "올드월드 파워맥에서 화면이 안 보이는 문제"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -3023,6 +3033,16 @@ msgstr ""
 "우, 맥오에스에서 디스플레이 설정을 <quote>thousands</quote>나 "
 "<quote>millions</quote> 대신에 256색으로 맞추십시오."
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "커널 2.4를 사용한 리눅스 설치 방법 및 장치 드라이버 (DASD, XPRAM, 콘솔, 테"
+#~ "이프, z90 crypto, chandev, 네트워크)"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "장치 드라이버 및 설치 명령어"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha FAQ"
 
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index 6aeaa9295..344c63638 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2009-08-28 03:14+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -1997,13 +1997,35 @@ msgstr "RAID를 사용해 파티션하기"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
+msgstr ""
+"소프트웨어 RAID를 설정할 때 미리 설정을 할 수 있습니다. RAID 레벨 0, 1, 5, "
+"6, 10을 지원하고, 비상용 어레이 및 예비 장치를 지정합니다. RAID 1을 사용한다"
+"면 GRUB을 미리 설정해서 어레이 안의 모든 장치에 GRUB을 설치할 수 있습니다. "
+"<xref linkend=\"preseed-bootloader\"/> 부분을 참고하십시오."
+
+#. Tag: para
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
 msgstr ""
 "소프트웨어 RAID를 설정할 때 미리 설정을 할 수 있습니다. RAID 레벨 0, 1, 5, "
 "6, 10을 지원하고, 비상용 어레이 및 예비 장치를 지정합니다. RAID 1을 사용한다"
@@ -2011,7 +2033,7 @@ msgstr ""
 "<xref linkend=\"preseed-bootloader\"/> 부분을 참고하십시오."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2026,7 +2048,7 @@ msgstr ""
 "var/log/syslog</filename> 파일을 확인하십시오."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# NOTE: this option is of beta release quality and should be used "
@@ -2174,13 +2196,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "파티션 마운트 방법 조정하기"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2196,7 +2218,7 @@ msgstr ""
 "따라 마운트할 경우, 레이블이 없는 파일 시스템은 UUID를 사용해 마운트합니다."
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2206,7 +2228,7 @@ msgstr ""
 "용합니다."
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2221,7 +2243,7 @@ msgstr ""
 "있고 그 경우 시스템이 어떻게 동작할지 확신할 수 없습니다."
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2237,13 +2259,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "기본 시스템  설치"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2254,7 +2276,7 @@ msgstr ""
 "쓸 부분은 커널 설치에 관한 질문입니다."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -2289,13 +2311,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "계정 설정"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2307,7 +2329,7 @@ msgstr ""
 "값</emphasis>을 쓸 수도 있습니다."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2322,7 +2344,7 @@ msgstr ""
 "안이라고 할 수 없습니다."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2380,7 +2402,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2400,26 +2422,26 @@ msgstr ""
 "법)"
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "암호에 대한 MD5 해시를 만드려면 다음 명령을 사용할 수 있습니다:"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "APT 설정"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2432,7 +2454,7 @@ msgstr ""
 "른 저장소를 지정할 수 있습니다."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2490,13 +2512,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "패키지 선택"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2506,73 +2528,73 @@ msgstr ""
 "수 있는 태스크는 다음과 같습니다:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "표준 시스템"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "데스크탑"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "웹 서버"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "인쇄 서버"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "DNS 서버"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "파일 서버"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "메일 서버"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "SQL 데이터베이스"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "노트북 컴퓨터"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2583,7 +2605,7 @@ msgstr ""
 "<userinput>표준 시스템</userinput> 태스크는 항상 포함하시길 권장합니다."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2597,7 +2619,7 @@ msgstr ""
 "백으로 구분할 수 있으므로, 커널 명령행에서도 쉽게 사용할 수 있습니다."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, fuzzy, no-c-format
 #| msgid ""
 #| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2664,13 +2686,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "부트로더 설치"
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1087
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2744,6 +2766,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2791,7 +2815,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2803,13 +2827,13 @@ msgstr ""
 "\"preseed-account\"/> 부분의 예제 명령을 사용해서 만들어 낼 수 있습니다."
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "설치 마치기"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2848,13 +2872,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "기타 패키지 미리 설정"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2873,19 +2897,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "고급 옵션"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "설치할 때 임의의 명령어 실행하기"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2895,7 +2919,7 @@ msgstr ""
 "크립트를 실행하는 기능입니다."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2946,13 +2970,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "미리 설정을 이용해 기본값 바꾸기"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2978,7 +3002,7 @@ msgstr ""
 "버깅하는 데도 좋습니다."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2992,7 +3016,7 @@ msgstr ""
 "주를 보십시오."
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -3013,13 +3037,13 @@ msgstr ""
 "replaceable>?=<replaceable>값</replaceable></userinput>) 합니다."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "미리 설정 파일을 분리해서 사용하기"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -3034,7 +3058,7 @@ msgstr ""
 "다른 파일에 집어 넣는 식으로 활용이 가능합니다."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -3084,7 +3108,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po
index 94f66e9fe..bea9cec84 100644
--- a/po/ko/random-bits.po
+++ b/po/ko/random-bits.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2009-08-28 03:15+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -817,8 +817,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS 서버"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -832,13 +860,13 @@ msgstr ""
 "까지의 공간이 있어야 합니다."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "유닉스/리눅스 시스템에서 &debian-gnu; 설치하기"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section explains how to install &debian-gnu; from an existing Unix "
@@ -869,7 +897,7 @@ msgstr ""
 "비안 chroot에서 입력하는 명령어를 말합니다."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Once you've got the new Debian system configured to your preference, you "
@@ -890,7 +918,7 @@ msgstr ""
 "어가 동작하지 않는 하드웨어에서 좋은 설치 방법입니다."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, fuzzy, no-c-format
 #| msgid ""
 #| "As this is a mostly manual procedure, you should bear in mind that you "
@@ -919,13 +947,13 @@ msgstr ""
 "도 있습니다."
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "시작하기"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -940,7 +968,7 @@ msgstr ""
 "크탑 환경을 설치한다면 이보다 더) 필요합니다."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -958,7 +986,7 @@ msgstr ""
 "j</userinput> 옵션을 빼십시오."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Initialize and activate swap (substitute the partition number for your "
@@ -991,7 +1019,7 @@ msgstr ""
 "운트 위치 이름은 마음대로 정한 것이고, 아래에서 계속 사용합니다."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -1001,7 +1029,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -1012,13 +1040,13 @@ msgstr ""
 "로 넘어가기 전에 그 디렉토리를 수동으로 만들어서 마운트해야 합니다."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "<command>debootstrap</command> 설치"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The utility used by the Debian installer, and recognized as the official "
@@ -1053,7 +1081,7 @@ msgstr ""
 "고 <command>debootstrap</command>을 다운로드하고 설치하십시오."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Or, you can use the following procedure to install it manually. Make a "
@@ -1090,7 +1118,7 @@ msgstr ""
 "다."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1102,13 +1130,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "<command>debootstrap</command> 실행"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, fuzzy, no-c-format
 #| msgid ""
 #| "<command>debootstrap</command> can download the needed files directly "
@@ -1130,7 +1158,7 @@ msgstr ""
 "org/mirror/list\"></ulink>에 있습니다."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1142,7 +1170,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1162,7 +1190,7 @@ msgstr ""
 "<userinput>s390</userinput>, <userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1172,13 +1200,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "베이스 시스템 설정"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Now you've got a real Debian system, though rather lean, on disk. "
@@ -1202,19 +1230,19 @@ msgstr ""
 "스 시스템과 맞게 맞춰야 할 것입니다. 예를 들어:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "장치 파일 만들기"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1233,19 +1261,19 @@ msgstr ""
 "고정 장치 파일을 사용할 지에 따라 달라집니다."
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "사용할 수 있는 옵션 몇 가지를 설명하면:"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr "다음 명령으로 기본적인 고정 장치 파일을 만듭니다"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1255,7 +1283,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1264,7 +1292,7 @@ msgstr ""
 "다"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1276,13 +1304,13 @@ msgstr ""
 "이 옵션은 주의해서 사용해야 합니다."
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "파티션 마운트하기"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You need to create <filename>/etc/fstab</filename>. "
@@ -1406,13 +1434,13 @@ msgstr ""
 "오."
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1424,19 +1452,19 @@ msgstr ""
 "있습니다:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "시간대 설정하기"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1449,7 +1477,7 @@ msgstr ""
 "로 이 부분을 설정하고, 해당 지역의 시간대를 설정합니다."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1459,13 +1487,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "네트워크 설정하기"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To configure networking, edit <filename>/etc/network/interfaces</"
@@ -1647,13 +1675,13 @@ msgstr ""
 "니다."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "APT 설정하기"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1679,13 +1707,13 @@ msgstr ""
 "음에 꼭 <userinput>aptitude update</userinput>를 실행하십시오."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "로캘 및 키보드 설정하기"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1704,7 +1732,7 @@ msgstr ""
 "</screen></informalexample> 키보드를 설정하려면 (키보드 설정이 필요한 경우):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1714,7 +1742,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1724,13 +1752,13 @@ msgstr ""
 "정합니다."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "커널 설치"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you intend to boot this system, you probably want a Linux kernel and a "
@@ -1743,19 +1771,19 @@ msgstr ""
 "어져 있는 커널은 다음 명령으로 찾아 보십시오:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1763,13 +1791,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "부트로더 설정하기"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To make your &debian-gnu; system bootable, set up your boot loader to "
@@ -1788,7 +1816,7 @@ msgstr ""
 "command>을 데비안 chroot 안에서 사용하면 부트로더를 설치할 수 있습니다."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1820,7 +1848,7 @@ msgstr ""
 "인 <filename>lilo.conf</filename> 파일을 사용하게 됩니다.)"
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1843,7 +1871,7 @@ msgstr ""
 "바르게 동작하는 <filename>/boot/grub/menu.lst</filename> 파일을 만듭니다."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1855,13 +1883,13 @@ msgstr ""
 "벗어나는 내용입니다."
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "다음은 기초적인 <filename>/etc/lilo.conf</filename> 예제입니다:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1883,7 +1911,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
@@ -1909,7 +1937,7 @@ msgstr ""
 "<filename>yaboot.conf</filename> 파일을 사용하게 됩니다.)"
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1939,13 +1967,13 @@ msgstr ""
 "아니라 <userinput>ide0:</userinput>을 써야 할 수도 있습니다."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "마지막 처리"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1964,7 +1992,7 @@ msgstr ""
 "를 하나하나 선택해서 설치할 수도 있습니다."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1976,20 +2004,20 @@ msgstr ""
 "할 수 있습니다:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "패러렐 라인 IP를 (PLIP) 이용해 &debian-gnu; 설치하기"
 
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section explains how to install &debian-gnu; on a computer without "
@@ -2010,7 +2038,7 @@ msgstr ""
 "를 들어 인터넷에) 연결되어 있어야 합니다."
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -2025,7 +2053,7 @@ msgstr ""
 "에서 이 IP 주소는 사용하지 말아야 합니다.)"
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -2036,7 +2064,7 @@ msgstr ""
 "있습니다. (<xref linkend=\"boot-new\"/> 참고.)"
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -2049,13 +2077,13 @@ msgstr ""
 "<literal>io=0x378</literal>, <literal>irq=7</literal>입니다."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "요구 사항"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, fuzzy, no-c-format
 #| msgid ""
 #| "A target computer, called <emphasis>target</emphasis>, where Debian will "
@@ -2066,13 +2094,13 @@ msgid ""
 msgstr "데비안을 설치할 <emphasis>타겟</emphasis>이라고 하는 대상 컴퓨터."
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "시스템 설치 미디어. <xref linkend=\"installation-media\"/> 참고."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -2082,7 +2110,7 @@ msgstr ""
 "합니다."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -2094,13 +2122,13 @@ msgstr ""
 "시오."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "소스 설정하기"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -2110,7 +2138,7 @@ msgstr ""
 "는 예제입니다."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -2153,13 +2181,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "타겟 설치"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2184,13 +2212,13 @@ msgstr ""
 "</screen></informalexample> 아래는 설치 단계에서 입력해야 할 사항들입니다."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "CD에서 설치 프로그램 컴포넌트 읽어들이기"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2200,13 +2228,13 @@ msgstr ""
 "치 시스템에서 PLIP 드라이버를 사용할 수 있습니다."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "네트워크 하드웨어 검색"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2220,7 +2248,7 @@ msgstr ""
 "은 표시하지 않습니다."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2232,26 +2260,26 @@ msgstr ""
 "십시오."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "네트워크 설정"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "DHCP로 네트워크 자동 설정: 아니오"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 msgstr "IP 주소: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2261,7 +2289,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2271,13 +2299,13 @@ msgstr ""
 "resolv.conf</filename> 파일 참고.)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "PPP 오버 이더넷을 (PPPoE) 이용해 &debian-gnu; 설치하기"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2292,7 +2320,7 @@ msgstr ""
 "서 그 방법을 설명합니다."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2303,7 +2331,7 @@ msgstr ""
 "있습니다. (<xref linkend=\"boot-new\"/> 참고.)"
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2317,7 +2345,7 @@ msgstr ""
 "지원하지 않습니다.)"
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2327,7 +2355,7 @@ msgstr ""
 "니다."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2343,7 +2371,7 @@ msgstr ""
 "classname>) 읽어들여서 실행합니다."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2362,7 +2390,7 @@ msgstr ""
 "classname>을 선택할 수 있습니다. </para> </footnote>.)"
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2372,7 +2400,7 @@ msgstr ""
 "를 찾습니다."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2384,7 +2412,7 @@ msgstr ""
 "아 봅니다."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2400,7 +2428,7 @@ msgstr ""
 "</guimenuitem>을 선택하십시오."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2410,7 +2438,7 @@ msgstr ""
 "게 물어봅니다."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2428,13 +2456,13 @@ msgstr ""
 "결 설정 및 시작</guimenuitem>을 선택하면 다시 설정을 할 수 있습니다."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "그래픽 설치 프로그램"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2447,7 +2475,7 @@ msgstr ""
 "일하고 (거의 같은 프로그램을 이용합니다) 프론트엔드만 다릅니다."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2465,7 +2493,7 @@ msgstr ""
 
 # 주의: Advanced options, Help는 한글로 나오지 않는다
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2486,7 +2514,7 @@ msgstr ""
 "팅 프롬프트에서 입력하면 사용할 수 있습니다."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, fuzzy, no-c-format
 #| msgid ""
 #| "There is also a graphical installer image that can be netbooted. And "
@@ -2510,7 +2538,7 @@ msgstr ""
 "오. </para> </footnote>도 있어서 테스트할 때 특히 유용하게 쓸 수 있습니다."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, fuzzy, no-c-format
 #| msgid ""
 #| "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2536,7 +2564,7 @@ msgstr ""
 "시스템에서는 동작하지 않을 것입니다."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2544,7 +2572,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2557,7 +2585,7 @@ msgstr ""
 "<quote>newt</quote> 프론트엔드로 실행합니다."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2570,13 +2598,13 @@ msgstr ""
 "스템의 경우 일반 설치 프로그램 사용을 권장합니다."
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "그래픽 설치 프로그램 사용하기"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2587,7 +2615,7 @@ msgstr ""
 "작합니다. 그러므로 이 안내서를 그대로 이용해 설치를 마칠 수 있습니다."
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2606,7 +2634,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2615,7 +2643,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/ko/using-d-i.po b/po/ko/using-d-i.po
index e37fdbed7..5a3b993cd 100644
--- a/po/ko/using-d-i.po
+++ b/po/ko/using-d-i.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2009-08-28 03:36+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -458,11 +458,23 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "루트 암호를 설정하고 루트가 아닌 사용자를 추가합니다."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -470,25 +482,25 @@ msgid ""
 msgstr "시스템 시계를 맞추고 시계를 UTC에 맞출 지 여부를 지정합니다."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "앞에서 설정한 지역 정보에 따라 시간대를 설정합니다."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Allows the user to partition disks attached to the system, create file "
@@ -506,13 +518,13 @@ msgstr ""
 "있는 기능도 들어 있습니다. 데비안의 기본 파티션 도구입니다."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -522,13 +534,13 @@ msgstr ""
 "티션 프로그램을 이용합니다."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -538,13 +550,13 @@ msgstr ""
 "니다."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -553,13 +565,13 @@ msgstr ""
 "여기서 <firstterm>LVM</firstterm>(Logical Volume Manager)을 설정합니다."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -571,13 +583,13 @@ msgstr ""
 "IDE RAID (가짜 하드웨어 RAID) 컨트롤러보다는 대체로 우수합니다."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Installs the most basic set of packages which would allow the computer to "
@@ -590,18 +602,6 @@ msgstr ""
 "다."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "루트 암호를 설정하고 루트가 아닌 사용자를 추가합니다."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -1091,14 +1091,14 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "어떤 키보드는 특정 언어에서 사용하는 문자에 맞게 만들어져 있습니다. 사용하고 "
 "있는 키보드에 맞는 키보드 배치를 고르시고, 해당 키보드 배치가 여기 없으면 어"
 "느정도 비슷한 키보드 배치를 고르십시오. 시스템 설치를 모두 마치면 더 많은 종"
-"류의 키보드 배치 중에서 하나를 고를 수 있게 됩니다. (<command>dpkg-reconfigure keyboard-configuration</"
-"command>를 실행하십시오.)"
+"류의 키보드 배치 중에서 하나를 고를 수 있게 됩니다. (<command>dpkg-"
+"reconfigure keyboard-configuration</command>를 실행하십시오.)"
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1441,11 +1441,141 @@ msgstr "자동 설치에서는 시간대를 다음과 같이 미리 설정할 �
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "사용자 및 암호 설정"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"베이스 시스템을 설치하면, <quote>루트</quote> 계정과 첫번째 일반 사용자 계정"
+"을 설정합니다. 설치가 끝난 다음에 다른 사용자 계정도 만들 수 있습니다."
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "루트 암호 설정"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"<emphasis>루트(root)</emphasis> 계정은 <emphasis>수퍼유저</emphasis>라고도 합"
+"니다. 이 계정은 시스템의 모든 보안 장벽을 그냥 통과할 수 있습니다. 루트 계정"
+"은 시스템 관리를 할 경우에만 사용해야 하고, 가능한 한 짧은 시간만 사용해야 합"
+"니다."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"암호를 만들 때 적어도 6자 이상이고, 대문자와 소문자와 특수 문자를 모두 포함해"
+"야 좋습니다. 루트 암호를 설정할 때 좀 더 주의를 기울여 주십시오. 루트 계정은 "
+"권한이 막강합니다. 사전에 나와있는 단어나 추측할 수 있는 개인 정보는 암호에 "
+"사용하지 마십시오."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"누가 루트 암호를 말해 달라고 하면 조심하시기 바랍니다. 한 시스템의 관리자가 "
+"여러 명인 경우가 아니라면, 루트 암호는 다른 사람에게 알려주면 안 됩니다."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "일반 사용자 만들기"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"여기에서 일반 사용자 계정을 만들 것인지를 물어봅니다. 이 계정은 주로 사용하"
+"는 개인 로그인 계정입니다. 일상적인 용도나 개인 로그인에 루트 계정을 사용하"
+"면 <emphasis>안 됩니다</emphasis>."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"루트 권한의 사용을 피하는 이유 중 하나는 루트 계정으로는 아주 쉽게 복구하기 "
+"힘든 손상을 입힐 수 있기 때문입니다. 다른 이유로는 수퍼유저의 권한을 이용해 "
+"숨어서 시스템의 보안을 침해하는 프로그램인, <emphasis>트로이 목마</emphasis> "
+"프로그램을 실행하도록 속을 수도 있기 때문입니다. 유닉스 시스템 관리에 대한 왠"
+"만한 책에서는 모두 이 주제에 대해 좀 더 자세하게 설명하고 있습니다. 처음 접한"
+"다면 보안 문제에 대한 책을 한 권 정도 읽어 보십시오."
+
+# first name은 성이 아니라 이름이다
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"먼저 전체 이름을 입력하고 사용자 계정으로 사용할 이름을 입력합니다. 사용자 계"
+"정은 이름같은 걸 사용하면 충분하고, 실제로 이름이 기본 값입니다. 마지막으로 "
+"이 계정의 암호를 입력하십시오."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"설치가 끝난 다음에 언제든지 또 계정을 만드려면, <command>adduser</command> 명"
+"령을 사용하십시오."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "파티션하기 및 마운트 위치 선택"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1462,7 +1592,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1472,7 +1602,7 @@ msgstr ""
 "\"/> 부분을 참고하십시오."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1494,7 +1624,7 @@ msgstr ""
 "터를 잃어버립니다."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1507,14 +1637,14 @@ msgstr ""
 "지 않으려면, 메뉴에서 <guimenuitem>수동으로</guimenuitem>를 선택하십시오."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, fuzzy, no-c-format
 #| msgid "Created partitions"
 msgid "Supported partitioning options"
 msgstr "만들 파티션"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1523,7 +1653,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1536,7 +1666,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1544,39 +1674,39 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, fuzzy, no-c-format
 #| msgid "Configuring the Logical Volume Manager (LVM)"
 msgid "Logical Volume Management (LVM)"
 msgstr "LVM (논리 볼륨 관리자) 설정하기"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1586,13 +1716,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1601,13 +1731,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1616,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1625,7 +1755,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
@@ -1635,7 +1765,7 @@ msgstr ""
 "아키텍처에 따라 (암호화한) LVM을 사용하는 옵션을 사용하지 못할 수도 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
@@ -1645,14 +1775,14 @@ msgstr ""
 "아키텍처에 따라 (암호화한) LVM을 사용하는 옵션을 사용하지 못할 수도 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1662,13 +1792,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1676,13 +1806,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1690,19 +1820,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1710,13 +1840,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "자동 파티션하기"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1733,7 +1863,7 @@ msgstr ""
 "footnote> 사용하는 것입니다."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1741,7 +1871,7 @@ msgstr ""
 "아키텍처에 따라 (암호화한) LVM을 사용하는 옵션을 사용하지 못할 수도 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1757,7 +1887,7 @@ msgstr ""
 "안전합니다."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1772,7 +1902,7 @@ msgstr ""
 "입니다), 디스크 크기에 따라 시간이 오래 걸릴 수도 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1788,7 +1918,7 @@ msgstr ""
 "에 쓰기 전에 계속해도 좋을 지 확인 질문을 합니다."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1805,7 +1935,7 @@ msgstr ""
 "니다. 디스크 용량으로도 어떤 디스크인지 확인할 수 있을 것입니다."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1820,7 +1950,7 @@ msgstr ""
 "는 경우에는 취소가 불가능합니다."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1837,76 +1967,76 @@ msgstr ""
 "용량은 다릅니다) 자동 파티션은 실패합니다."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "파티션 방식"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "최소 공간"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "만들 파티션"
 
 # 주의: 메시지 번역과 통일
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "모두 한 파티션에 설치"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, 스왑"
 
 # 주의: 메시지 번역과 통일
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "/home 파티션 분리"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, 스왑"
 
 # 주의: 메시지 번역과 통일
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "/home, /usr/, /var, /tmp 파티션 분리"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1916,7 +2046,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, 스왑"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1929,7 +2059,7 @@ msgstr ""
 "포함) LVM 파티션 안에 만듭니다."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1942,7 +2072,7 @@ msgstr ""
 "팅 파티션으로 만드는 항목이 하나 더 생깁니다."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1954,7 +2084,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2004,7 +2134,7 @@ msgstr ""
 "것 뿐입니다."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2023,13 +2153,13 @@ msgstr ""
 "준 파티션을 아래에서 설명하는 것처럼 수동으로 바꿀 수도 있습니다."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "수동 파티션하기"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, fuzzy, no-c-format
 #| msgid ""
 #| "A similar screen to the one shown just above will be displayed if you "
@@ -2050,7 +2180,7 @@ msgstr ""
 "사용할 지에 대해 다룹니다."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2063,7 +2193,7 @@ msgstr ""
 "공간</quote>이라는 줄이 해당 디스크 이름 아래에 나타납니다."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2100,7 +2230,7 @@ msgstr ""
 "<command>partman</command>의 주 화면으로 돌아갑니다."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2120,7 +2250,7 @@ msgstr ""
 "메뉴에서 파티션을 지워 버릴 수도 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2135,7 +2265,7 @@ msgstr ""
 "기 전에는 다음으로 진행하지 없습니다."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2147,7 +2277,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2162,7 +2292,7 @@ msgstr ""
 "<filename>partman-xfs</filename>, 아니면 <filename>partman-lvm</filename>)"
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2175,13 +2305,13 @@ msgstr ""
 "한 요약이 나타나고 이대로 파일 시스템을 만들지 확인합니다."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "멀티디스크 장치 설정하기 (소프트웨어 RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2200,7 +2330,7 @@ msgstr ""
 "(더 자주 쓰이는 다른 말로 <firstterm>RAID</firstterm>라고 합니다.)"
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2214,7 +2344,7 @@ msgstr ""
 "포맷하고 마운트 위치를 지정하고 따위를 할 수 있습니다.)"
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2313,97 +2443,97 @@ msgstr ""
 "varlistentry> </variablelist> 요약하면:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "종류"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "장치 최소 개수"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "예비 장치"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "디스크가 망가져도 버티는지?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "사용 가능 공간"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>아니오</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "RAID에서 가장 작은 파티션의 크기 x 장치 개수"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "옵션"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>예</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "RAID에서 가장 작은 파티션의 크기"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2411,19 +2541,19 @@ msgid ""
 msgstr "가장 작은 파티션의 크기 x (RAID의 장치 개수 - 1)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2431,13 +2561,13 @@ msgid ""
 msgstr "가장 작은 파티션의 크기 x (RAID의 장치 개수 - 2)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2445,7 +2575,7 @@ msgid ""
 msgstr "전체 파티션 나누기 단위 복사물의 개수 (기본값 2)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2455,7 +2585,7 @@ msgstr ""
 "\">Software RAID HOWTO</ulink>를 읽어 보십시오."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2470,7 +2600,7 @@ msgstr ""
 "guimenuitem> </menuchoice>을 선택하십시오."
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2489,7 +2619,7 @@ msgstr ""
 "filename>에 RAID1을 사용하는 것도 한 가지 방법입니다."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2506,7 +2636,7 @@ msgstr ""
 "피해갈 수 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2527,7 +2657,7 @@ msgstr ""
 "했냐에 따라 달라집니다."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2538,7 +2668,7 @@ msgstr ""
 "할 파티션을 선택하기만 하면 됩니다."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2556,7 +2686,7 @@ msgstr ""
 "다고 해도, 개수가 맞아야 &d-i;가 다음으로 진행합니다."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2566,7 +2696,7 @@ msgstr ""
 "파티션을 사용해야 한다는 점이 다릅니다."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2576,7 +2706,7 @@ msgstr ""
 "파티션을 사용해야 한다는 점이 다릅니다."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2596,7 +2726,7 @@ msgstr ""
 "래야 모든 카피가 다른 디스크에 분배됩니다."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2614,7 +2744,7 @@ msgstr ""
 "니다."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2628,13 +2758,13 @@ msgstr ""
 "같은 속성을 부여할 수 있습니다."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "LVM (논리 볼륨 관리자) 설정하기"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2649,7 +2779,7 @@ msgstr ""
 "해야 했던 경험이 있을 것입니다."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2668,7 +2798,7 @@ msgstr ""
 "개의 물리 파티션에 걸쳐 있을 수 있다는 점입니다."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2687,7 +2817,7 @@ msgstr ""
 "HOWTO</ulink>를 참고하십시오."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2702,7 +2832,7 @@ msgstr ""
 "<guimenuitem>LVM의 물리 볼륨</guimenuitem>을 선택합니다."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2720,7 +2850,7 @@ msgstr ""
 "용할 수 있는 동작만 표시합니다. 가능한 동작은:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2730,43 +2860,43 @@ msgstr ""
 "크기 등을 표시합니다"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "볼륨 그룹 만들기"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "논리 볼륨 만들기"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "볼륨 그룹 삭제"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "논리 볼륨 삭제"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "볼륨 그룹 늘이기"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "볼륨 그룹 줄이기"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2776,7 +2906,7 @@ msgstr ""
 "아갑니다"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2785,7 +2915,7 @@ msgstr ""
 "메뉴에서 이 옵션을 이용해 볼륨 그룹을 만들고 그 안에 논리 볼륨을 만드십시오."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2797,13 +2927,13 @@ msgstr ""
 "면 됩니다.)"
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "암호화 볼륨 설정하기"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2823,7 +2953,7 @@ msgstr ""
 "암호를 모르면 하드 드라이브의 데이터는 임의의 문자로 보입니다."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2848,7 +2978,7 @@ msgstr ""
 "가능합니다."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2861,7 +2991,7 @@ msgstr ""
 "도, 암호화 방법 및 키 길이에 달려 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2880,7 +3010,7 @@ msgstr ""
 "티션에 대한 몇 가지 암호화 옵션이 나오도록 바뀝니다."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2896,7 +3026,7 @@ msgstr ""
 "본값을 사용하길 권합니다."
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2909,13 +3039,13 @@ msgstr ""
 "미 보안을 염두에 두고 기본값이 들어 있습니다."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "암호화: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2939,13 +3069,13 @@ msgstr ""
 "으로 <emphasis>AES</emphasis>를 선택했습니다."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "키 크기: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2958,13 +3088,13 @@ msgstr ""
 "있는 키의 크기는 싸이퍼에 따라 다릅니다."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV 알고리즘: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2981,7 +3111,7 @@ msgstr ""
 "이 암호화된 데이터에 반복된 패턴을 통해 정보를 알아내지 못하게 됩니다."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2995,25 +3125,25 @@ msgstr ""
 "우에만 사용하십시오."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "암호화 키: <userinput>암호</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "여기서 이 파티션의 암호화 키 종류를 선택합니다."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "암호"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3026,13 +3156,13 @@ msgstr ""
 "ulink>로 설정한다는 뜻입니다. </para></footnote>."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "무작위 키"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3049,7 +3179,7 @@ msgstr ""
 "게 무작정 추측하는 건 평생 해도 다 못 합니다.)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3067,13 +3197,13 @@ msgstr ""
 "왑 파티션에 저장된 데이터를 복구할 방법이 없기 때문입니다."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "데이터 지우기: <userinput>예</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3093,7 +3223,7 @@ msgstr ""
 "있다고 합니다. </para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3104,13 +3234,13 @@ msgstr ""
 "을 선택하면, 메뉴가 다음 옵션이 나오도록 바뀝니다:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "암호화: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3122,25 +3252,25 @@ msgstr ""
 "참고하십시오."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "암호화 키: <userinput>키파일 (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "여기서 이 파티션의 암호화 키 종류를 선택할 수 있습니다."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "암호화키 파일 (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3153,19 +3283,19 @@ msgstr ""
 "바른 암호를 입력해야 합니다. (이 과정의 뒤부분에서 암호를 물어봅니다.)"
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "위의 무작위 키에 대한 부분을 참고하십시오."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "위의 데이터 지우기에 대한 부분을 참고하십시오."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3182,7 +3312,7 @@ msgstr ""
 "릴 수 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3197,7 +3327,7 @@ msgstr ""
 "면 (생일, 취미, 애완동물 이름, 가족이나 친척 이름 등) 안 됩니다."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3219,7 +3349,7 @@ msgstr ""
 "치를 설정하지 못한 상태일 경우에 이런 일이 일어날 수 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3240,7 +3370,7 @@ msgstr ""
 "이 과정을 암호화할 모든 파티션에 대해서 반복합니다."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3271,7 +3401,7 @@ msgstr ""
 "(기본값이 마음에 들지 않으면) 파일 시스템 종류를 설정하십시오."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3288,7 +3418,7 @@ msgstr ""
 "뒤의 <xref linkend=\"mount-encrypted-volumes\"/>에서 설명합니다."
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3296,13 +3426,13 @@ msgid ""
 msgstr "파티션 방법이 마음에 들면, 설치를 계속하십시오."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "베이스 시스템 설치하기"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3316,7 +3446,7 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3332,7 +3462,7 @@ msgstr ""
 "keycap><keycap>F1</keycap></keycombo>을 누르십시오."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3344,7 +3474,7 @@ msgstr ""
 "니다."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, fuzzy, no-c-format
 #| msgid ""
 #| "As part of the installation, a Linux kernel will be installed. At the "
@@ -3362,7 +3492,7 @@ msgstr ""
 "지 커널 중에서 하나를 선택할 수 있습니다."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3374,7 +3504,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3384,131 +3514,6 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "사용자 및 암호 설정"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"베이스 시스템을 설치하면, <quote>루트</quote> 계정과 첫번째 일반 사용자 계정"
-"을 설정합니다. 설치가 끝난 다음에 다른 사용자 계정도 만들 수 있습니다."
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "루트 암호 설정"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"<emphasis>루트(root)</emphasis> 계정은 <emphasis>수퍼유저</emphasis>라고도 합"
-"니다. 이 계정은 시스템의 모든 보안 장벽을 그냥 통과할 수 있습니다. 루트 계정"
-"은 시스템 관리를 할 경우에만 사용해야 하고, 가능한 한 짧은 시간만 사용해야 합"
-"니다."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"암호를 만들 때 적어도 6자 이상이고, 대문자와 소문자와 특수 문자를 모두 포함해"
-"야 좋습니다. 루트 암호를 설정할 때 좀 더 주의를 기울여 주십시오. 루트 계정은 "
-"권한이 막강합니다. 사전에 나와있는 단어나 추측할 수 있는 개인 정보는 암호에 "
-"사용하지 마십시오."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"누가 루트 암호를 말해 달라고 하면 조심하시기 바랍니다. 한 시스템의 관리자가 "
-"여러 명인 경우가 아니라면, 루트 암호는 다른 사람에게 알려주면 안 됩니다."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "일반 사용자 만들기"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"여기에서 일반 사용자 계정을 만들 것인지를 물어봅니다. 이 계정은 주로 사용하"
-"는 개인 로그인 계정입니다. 일상적인 용도나 개인 로그인에 루트 계정을 사용하"
-"면 <emphasis>안 됩니다</emphasis>."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"루트 권한의 사용을 피하는 이유 중 하나는 루트 계정으로는 아주 쉽게 복구하기 "
-"힘든 손상을 입힐 수 있기 때문입니다. 다른 이유로는 수퍼유저의 권한을 이용해 "
-"숨어서 시스템의 보안을 침해하는 프로그램인, <emphasis>트로이 목마</emphasis> "
-"프로그램을 실행하도록 속을 수도 있기 때문입니다. 유닉스 시스템 관리에 대한 왠"
-"만한 책에서는 모두 이 주제에 대해 좀 더 자세하게 설명하고 있습니다. 처음 접한"
-"다면 보안 문제에 대한 책을 한 권 정도 읽어 보십시오."
-
-# first name은 성이 아니라 이름이다
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"먼저 전체 이름을 입력하고 사용자 계정으로 사용할 이름을 입력합니다. 사용자 계"
-"정은 이름같은 걸 사용하면 충분하고, 실제로 이름이 기본 값입니다. 마지막으로 "
-"이 계정의 암호를 입력하십시오."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"설치가 끝난 다음에 언제든지 또 계정을 만드려면, <command>adduser</command> 명"
-"령을 사용하십시오."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4389,14 +4394,21 @@ msgstr "올바른 파티션을 고르십시오!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "파티션을 고르는 기준은 <emphasis>부팅</emphasis> 플래그가 있는 FAT 포맷된 파"
 "일 시스템입니다. &d-i;에서 시스템의 모든 디스크를 검사했을 때 찾은 파티션에 "
diff --git a/po/nn/bookinfo.po b/po/nn/bookinfo.po
index ae2042b4c..a1ceebb5d 100644
--- a/po/nn/bookinfo.po
+++ b/po/nn/bookinfo.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2008-05-04 21:44+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -40,17 +40,28 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Denne installasjonsmanualen er basert på ein tidlegare manual skrive for det "
 "gamle installasjonssystemet til Debian (<quote>oppstartsdiskettane</quote>), "
diff --git a/po/pot/administrivia.pot b/po/pot/administrivia.pot
index 5e7309da1..37757aaeb 100644
--- a/po/pot/administrivia.pot
+++ b/po/pot/administrivia.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #. Tag: para
 #: administrivia.xml:11
 #, no-c-format
-msgid "This manual was created for Sarge's debian-installer, based on the Woody installation manual for boot-floppies, which was based on earlier &debian; installation manuals, and on the Progeny distribution manual which was released under GPL in 2003."
+msgid "This manual was created for Sarge's debian-installer, based on the Woody installation manual for boot-floppies, which was based on earlier Debian installation manuals, and on the Progeny distribution manual which was released under GPL in 2003."
 msgstr ""
 
 #. Tag: para
@@ -95,7 +95,7 @@ msgstr ""
 #. Tag: para
 #: administrivia.xml:113
 #, no-c-format
-msgid "Many, many &debian; users and developers contributed to this document. Particular note must be made of Michael Schmitz (m68k support), Frank Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins (SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous edits and text. We have to thank Pascal Le Bail for useful information about booting from USB memory sticks."
+msgid "Many, many Debian users and developers contributed to this document. Particular note must be made of Michael Schmitz (m68k support), Frank Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins (SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous edits and text. We have to thank Pascal Le Bail for useful information about booting from USB memory sticks."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pot/bookinfo.pot b/po/pot/bookinfo.pot
index 42fa1ff25..f9255b9e2 100644
--- a/po/pot/bookinfo.pot
+++ b/po/pot/bookinfo.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #. Tag: para
 #: bookinfo.xml:17
 #, no-c-format
-msgid "This installation guide is based on an earlier manual written for the old &debian; installation system (the <quote>boot-floppies</quote>), and has been updated to document the new &debian; installer. However, for &architecture;, the manual has not been fully updated and fact checked for the new installer. There may remain parts of the manual that are incomplete or outdated or that still document the boot-floppies installer. A newer version of this manual, possibly better documenting this architecture, may be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You may also be able to find additional translations there."
+msgid "This installation guide is based on an earlier manual written for the old Debian installation system (the <quote>boot-floppies</quote>), and has been updated to document the new Debian installer. However, for &architecture;, the manual has not been fully updated and fact checked for the new installer. There may remain parts of the manual that are incomplete or outdated or that still document the boot-floppies installer. A newer version of this manual, possibly better documenting this architecture, may be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You may also be able to find additional translations there."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pot/hardware.pot b/po/pot/hardware.pot
index 1ead18a4f..f4c5dd767 100644
--- a/po/pot/hardware.pot
+++ b/po/pot/hardware.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -581,7 +581,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:460
 #, no-c-format
-msgid "The system bus is the part of the motherboard which allows the CPU to communicate with peripherals such as storage devices. Your computer must use the ISA, EISA, PCI, PCIe, or VESA Local Bus (VLB, sometimes called the VL bus). Essentially all personal computers sold in recent years use one of these."
+msgid "The system bus is the part of the motherboard which allows the CPU to communicate with peripherals such as storage devices. Your computer must use the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL bus). Essentially all personal computers sold in recent years use one of these."
 msgstr ""
 
 #. Tag: para
@@ -1127,701 +1127,701 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1025
 #, no-c-format
-msgid "Complete information regarding supported S/390 and zSeries machines can be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries are fully supported; Multiprise 2000, G3 and G4 machines are supported with IEEE floating point emulation and thus degraded performance."
+msgid "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. Your machine needs to support for at least the z/Architecture, Architecture Level Set 2. The userland is still compiled for ESA/390, though. All zSeries hardware is fully supported. &arch-title; support software is included from the kernel 2.6.32 development stream. The most current information about IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/developerworks/linux/linux390/development_technical.html\"> Linux on <trademark class=\"registered\">System z</trademark> page on developerWorks</ulink>."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid "Sparc-based hardware is divided into a number of different subarchitectures, identified by one of the following names: sun4, sun4c, sun4d, sun4m, sun4u or sun4v. The following list describes what machines they include and what level of support may be expected for each of them."
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a complete list of machines belonging to these subarchitectures, please consult the <ulink url=\"http://en.wikipedia.org/wiki/SPARCstation\">Wikipedia SPARCstation page</ulink>."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid "The last &debian; release to support sparc32 was Etch, but even then only for sun4m systems. Support for the other 32-bits subarchitectures had already been discontinued after earlier releases."
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid "This subarchitecture includes all 64-bit machines (sparc64) based on the UltraSparc processor and its clones. Most of the machines are well supported, even though for some you may experience problems booting from CD due to firmware or bootloader bugs (this problem may be worked around by using netbooting). Use the sparc64 or sparc64-smp kernel in UP and SMP configurations respectively."
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid "This is the newest addition to the Sparc family, which includes machines based on the Niagara multi-core CPUs. At the moment such CPUs are only available in T1000 and T2000 servers by Sun, and are well supported. Use the sparc64-smp kernel."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are not supported due to lack of support in the Linux kernel."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid "Laptops are also supported and nowadays most laptops work out of the box. In case a laptop contains specialized or proprietary hardware, some specific functions may not be supported. To see if your particular laptop works well with GNU/Linux, see for example the <ulink url=\"&url-x86-laptop;\">Linux Laptop pages</ulink>."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
 msgid "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote> or SMP &mdash; is available for this architecture. The standard &debian; &release; kernel image has been compiled with SMP support. The standard kernel is also usable on non-SMP systems, but has a slight overhead which will cause a small reduction in performance. For normal system use this will hardly be noticable."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
 msgid "In order to optimize the kernel for single CPU systems, you'll have to replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At this time (kernel version &kernelversion;) the way you disable SMP is to deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote> section of the kernel config.</phrase>"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
 msgid "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote> or SMP &mdash; is available for this architecture. The standard &debian; &release; kernel image has been compiled with <firstterm>SMP-alternatives</firstterm> support. This means that the kernel will detect the number of processors (or processor cores) and will automatically deactivate SMP on uniprocessor systems."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid "The 486 flavour of the &debian; kernel image packages for &arch-title; is not compiled with SMP support."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
 msgid "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote> or SMP &mdash; is available for this architecture. However, the standard &debian; &release; kernel image does not support SMP. This should not prevent installation, since the standard, non-SMP kernel should boot on SMP systems; the kernel will simply use the first CPU."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
 msgid "In order to take advantage of multiple processors, you'll have to replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At this time (kernel version &kernelversion;) the way you enable SMP is to select <quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote> section of the kernel config.</phrase>"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
 msgid "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote> or SMP &mdash; is available for this architecture, and is supported by a precompiled &debian; kernel image. Depending on your install media, this SMP-capable kernel may or may not be installed by default. This should not prevent installation, since the standard, non-SMP kernel should boot on SMP systems; the kernel will simply use the first CPU."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid "In order to take advantage of multiple processors, you should check to see if a kernel package that supports SMP is installed, and if not, choose an appropriate kernel package."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, no-c-format
 msgid "You can also build your own customized kernel to support SMP.<phrase arch=\"linux-any\"> You can find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At this time (kernel version &kernelversion;) the way you enable SMP is to select <quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote> section of the kernel config.</phrase>"
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1223
+#: hardware.xml:1224
 #, no-c-format
-msgid "You should be using a VGA-compatible display interface for the console terminal. Nearly every modern display card is compatible with VGA. Ancient standards such CGA, MDA, or HGA should also work, assuming you do not require X11 support. Note that X11 is not used during the installation process described in this document."
+msgid "You should be using a VGA-compatible display interface for the console terminal. Nearly every modern display card is compatible with VGA. Ancient standards such CGA, MDA, or HGA should also work, assuming you do not require X11 support. Note that X11 is not used during the installation process described in this document unless the graphical installer was explicitly selected."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
-msgid "&debian;'s support for graphical interfaces is determined by the underlying support found in X.Org's X11 system. Most AGP, PCI and PCIe video cards work under X.Org. Details on supported graphics buses, cards, monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. &debian; &release; ships with X.Org version &x11ver;."
+msgid "&debian;'s support for graphical interfaces is determined by the underlying support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work under X.Org. Details on supported graphics buses, cards, monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid "Most graphics options commonly found on Sparc-based machines are supported. X.org graphics drivers are available for sunbw2, suncg14, suncg3, suncg6, sunleo and suntcx framebuffers, Creator3D and Elite3D cards (sunffb driver), PGX24/PGX64 ATI-based video cards (ati driver), and PermediaII-based cards (glint driver). To use an Elite3D card with X.org you additionally need to install the <classname>afbinit</classname> package, and read the documentation included with it on how to activate the card."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid "It is not uncommon for a Sparc machine to have two graphics cards in a default configuration. In such a case there is a possibility that the Linux kernel will not direct its output to the card initially used by the firmware. The lack of output on the graphical console may then be mistaken for a hang (usually the last message seen on console is 'Booting Linux...'). One possible solution is to physically remove one of the video cards; another option is to disable one of the cards using a kernel boot parameter. Also, if graphical output is not required or desired, serial console may be used as an alternative. On some systems use of serial console can be activated automatically by disconnecting the keyboard before booting the system."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid "Almost any network interface card (NIC) supported by the &arch-kernel; kernel should also be supported by the installation system; modular drivers should normally be loaded automatically. <phrase arch=\"x86\">This includes most PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards are supported as well.</phrase>"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid "This includes a lot of generic PCI cards (for systems that have PCI) and the following NICs from Sun:"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid "On &arch-title;, most built-in Ethernet devices are supported and modules for additional PCI and USB devices are provided. The major exception is the IXP4xx platform (featuring devices such as the Linksys NSLU2) which needs a proprietary microcode for the operation of its built-in Ethernet device. Unofficial images for Linksys NSLU2 with this proprietary microcode can be obtained from the <ulink url=\"&url-slug-firmware;\">Slug-Firmware site</ulink>."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid "Wireless networking is in general supported as well and a growing number of wireless adapters are supported by the official &arch-kernel; kernel, although many of them do require firmware to be loaded. If firmware is needed, the installer will prompt you to load firmware. See <xref linkend=\"loading-firmware\"/> for detailed information on how to load firmware during the installation."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid "Wireless NICs that are not supported by the official &arch-kernel; kernel can generally be made to work under &debian-gnu;, but are not supported during the installation."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid "Support for encrypted wireless during installation is currently limited to WEP. If your access point uses stronger encryption, it cannot be used during the installation process."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid "If there is a problem with wireless and there is no other NIC you can use during the installation, it is still possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the option to not configure a network and install using only the packages available from the CD/DVD. You can then install the driver and firmware you need after the installation is completed (after the reboot) and configure your network manually."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid "In some cases the driver you need may not be available as a &debian; package. You will then have to look if there is source code available in the internet and compile the driver yourself. How to do this is outside the scope of this manual. <phrase arch=\"x86\">If no Linux driver is available, your last resort is to use the <classname>ndiswrapper</classname> package, which allows you to use a Windows driver.</phrase>"
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid "There are a couple of issues with specific network cards that are worth mentioning here."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid "There are various PCI network cards that have the same PCI identification, but are supported by related, but different drivers. Some cards work with the <literal>tulip</literal> driver, others with the <literal>dfme</literal> driver. Because they have the same identification, the kernel cannot distinguish between them and it is not certain which driver will be loaded. If this happens to be the wrong one, the NIC may not work, or work badly."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid "This is a common problem on Netra systems with a Davicom (DEC-Tulip compatible) NIC. In that case the <literal>tulip</literal> driver is probably the correct one. You can prevent this issue by blacklisting the wrong driver module as described in <xref linkend=\"module-blacklist\"/>."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid "An alternative solution during the installation is to switch to a shell and unload the wrong driver module using <userinput>modprobe -r <replaceable>module</replaceable></userinput> (or both, if they are both loaded). After that you can load the correct module using <userinput>modprobe <replaceable>module</replaceable></userinput>. Note that the wrong module may then still be loaded when the system is rebooted."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid "The <literal>cassini</literal> network driver does not work with Sun B100 blade systems."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid "Support for braille displays is determined by the underlying support found in <classname>brltty</classname>. Most displays work under <classname>brltty</classname>, connected via either a serial port, USB or bluetooth. Details on supported braille devices can be found on the <ulink url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; &release; ships with <classname>brltty</classname> version &brlttyver;."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid "Support for hardware speech synthesis devices is determined by the underlying support found in <classname>speakup</classname>. <classname>speakup</classname> only supports integrated boards and external devices connected to a serial port (no USB or serial-to-USB adapters are supported). Details on supported hardware speech synthesis devices can be found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> website</ulink>. &debian-gnu; &release; ships with <classname>speakup</classname> version &speakupver;."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid "&arch-kernel; supports a large variety of hardware devices such as mice, printers, scanners, PCMCIA and USB devices. However, most of these devices are not required while installing the system."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid "USB hardware generally works fine, only some USB keyboards may require additional configuration (see <xref linkend=\"hardware-issues\"/>)."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink> to determine whether your specific hardware is supported by Linux."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid "Package installations from XPRAM and tape are not supported by this system. All packages that you want to install need to be available on a DASD or over the network using NFS, HTTP or FTP."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid "The Cobalt RaQ has no support for additional devices but the Qube has one PCI slot."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid "Besides the availability of a device driver, some hardware also requires so-called <firstterm>firmware</firstterm> or <firstterm>microcode</firstterm> to be loaded into the device before it can become operational. This is most common for network interface cards (especially wireless NICs), but for example some USB devices and even some hard disk controllers also require firmware."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid "In most cases firmware is non-free according to the criteria used by the &debian-gnu; project and thus cannot be included in the main distribution or in the installation system. If the device driver itself is included in the distribution and if &debian-gnu; legally can distribute the firmware, it will often be available as a separate package from the non-free section of the archive."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid "However, this does not mean that such hardware cannot be used during an installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware files or packages containing firmware from a removable medium, such as a floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for detailed information on how to load firmware files or packages during the installation."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
 msgid "There are several vendors, who ship systems with &debian; or other distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-installed</ulink>. You might pay more for the privilege, but it does buy a level of peace of mind, since you can be sure that the hardware is well-supported by GNU/Linux."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid "If you do have to buy a machine with Windows bundled, carefully read the software license that comes with Windows; you may be able to reject the license and obtain a rebate from your vendor. Searching the Internet for <quote>windows refund</quote> may get you some useful information to help with that."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid "Whether or not you are purchasing a system with &arch-kernel; bundled, or even a used system, it is still important to check that your hardware is supported by the &arch-kernel; kernel. Check if your hardware is listed in the references found above. Let your salesperson (if any) know that you're shopping for a &arch-kernel; system. Support &arch-kernel;-friendly hardware vendors."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid "Some hardware manufacturers simply won't tell us how to write drivers for their hardware. Others won't allow us access to the documentation without a non-disclosure agreement that would prevent us from releasing the &arch-kernel; source code."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid "Since we haven't been granted access to the documentation on these devices, they simply won't work under &arch-kernel;. You can help by asking the manufacturers of such hardware to release the documentation. If enough people ask, they will realize that the free software community is an important market."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid "A disturbing trend is the proliferation of Windows-specific modems and printers. In some cases these are specially designed to be operated by the Microsoft Windows operating system and bear the legend <quote>WinModem</quote> or <quote>Made especially for Windows-based computers</quote>. This is generally done by removing the embedded processors of the hardware and shifting the work they do over to a Windows driver that is run by your computer's main CPU. This strategy makes the hardware less expensive, but the savings are often <emphasis>not</emphasis> passed on to the user and this hardware may even be more expensive than equivalent devices that retain their embedded intelligence."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid "You should avoid Windows-specific hardware for two reasons. The first is that the manufacturers do not generally make the resources available to write a &arch-kernel; driver. Generally, the hardware and software interface to the device is proprietary, and documentation is not available without a non-disclosure agreement, if it is available at all. This precludes it being used for free software, since free software writers disclose the source code of their programs. The second reason is that when devices like these have had their embedded processors removed, the operating system must perform the work of the embedded processors, often at <emphasis>real-time</emphasis> priority, and thus the CPU is not available to run your programs while it is driving these devices. Since the typical Windows user does not multi-process as intensively as a &arch-kernel; user, the manufacturers hope that the Windows user simply won't notice the burden this hardware places on their CPU. However, any multi-processing operating system, even Windows 2000 or XP, suffers from degraded performance when peripheral manufacturers skimp on the embedded processing power of their hardware."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, no-c-format
 msgid "You can help improve this situation by encouraging these manufacturers to release the documentation and other resources necessary for us to program their hardware, but the best strategy is simply to avoid this sort of hardware<phrase arch=\"linux-any\"> until it is listed as working in the <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink></phrase>."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
 msgid "This section will help you determine which different media types you can use to install &debian;. For example, if you have a floppy disk drive on your machine, it can be used to install &debian;. There is a whole chapter devoted to media, <xref linkend=\"install-methods\"/>, which lists the advantages and disadvantages of each media type. You may want to refer back to this page once you reach that section."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid "In some cases, you'll have to do your first boot from floppy disks. Generally, all you will need is a high-density (1440 kilobytes) 3.5 inch floppy drive."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-ROMs and DVD-ROMs, because both technologies are really the same from the operating system's point of view, except for some very old nonstandard CD-ROM drives which are neither SCSI nor IDE/ATAPI."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid "CD-ROM based installation is supported for some architectures. On machines which support bootable CD-ROMs, you should be able to do a completely <phrase arch=\"not-s390\">floppy-less</phrase> <phrase arch=\"s390\">tape-less</phrase> installation. Even if your system doesn't support booting from a CD-ROM, you can use the CD-ROM in conjunction with the other techniques to install your system, once you've booted up by other means; see <xref linkend=\"boot-installer\"/>."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-howto;\">Linux CD-ROM HOWTO</ulink> contains in-depth information on using CD-ROMs with Linux."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid "USB CD-ROM drives are also supported, as are FireWire devices that are supported by the ohci1394 and sbp2 drivers."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM drives sold on the PC market do not have this capability. If your CD-ROM drive has a jumper labeled <quote>Unix/PC</quote> or <quote>512/2048</quote>, place it in the <quote>Unix</quote> or <quote>512</quote> position. To start the install, simply choose the <quote>System installation</quote> entry in the firmware."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid "Booting the installation system directly from a hard disk is another option for many architectures. This will require some other operating system to load the installer onto the hard disk."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid "Although the &arch-title; does not allow booting from SunOS (Solaris), you can install from a SunOS partition (UFS slices)."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
 msgid "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting up the system and for rescue purposes. If you operate some servers, you will probably already have thought about omitting those drives and using an USB memory stick for installing and (when necessary) for recovering the system. This is also useful for small systems which have no room for unnecessary drives."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid "The network can be used during the installation to retrieve files needed for the installation. Whether the network is used or not depends on the installation method you choose and your answers to certain questions that will be asked during the installation. The installation system supports most types of network connections (including PPPoE, but not ISDN or PPP), via either HTTP or FTP. After the installation is completed, you can also configure your system to use ISDN and PPP."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid "You can also <emphasis>boot</emphasis> the installation system over the network. <phrase arch=\"mips;mipsel\">This is the preferred installation technique for &arch-title;.</phrase>"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid "Diskless installation, using network booting from a local area network and NFS-mounting of all local filesystems, is another option."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid "If you are running another Unix-like system, you could use it to install &debian-gnu; without using the &d-i; described in the rest of this manual. This kind of install may be useful for users with otherwise unsupported hardware or on hosts which can't afford downtime. If you are interested in this technique, skip to the <xref linkend=\"linux-upgrade\"/>."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
 msgid "The &debian; boot disks contain a kernel which is built to maximize the number of systems it runs on. Unfortunately, this makes for a larger kernel, which includes many drivers that won't be used for your machine<phrase arch=\"linux-any\"> (see <xref linkend=\"kernel-baking\"/> to learn how to build your own kernel)</phrase>. Support for the widest possible range of devices is desirable in general, to ensure that &debian; can be installed on the widest array of hardware."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
 msgid "Generally, the &debian; installation system includes support for floppies, IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, SATA and SCSI controllers and drives, USB, and FireWire. The supported file systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid "Disk interfaces that emulate the <quote>AT</quote> hard disk interface &mdash; often called MFM, RLL, IDE, or PATA &mdash; are supported. SATA and SCSI disk controllers from many different manufacturers are supported. See the <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink> for more details."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid "Any storage system supported by the Linux kernel is also supported by the boot system. The following SCSI drivers are supported in the default kernel: <itemizedlist> <listitem><para> Sparc ESP </para></listitem> <listitem><para> PTI Qlogic,ISP </para></listitem> <listitem><para> Adaptec AIC7xxx </para></listitem> <listitem><para> NCR and Symbios 53C8XX </para></listitem> </itemizedlist> IDE systems (such as the UltraSPARC 5) are also supported. See <ulink url=\"&url-sparc-linux-faq;\">Linux for SPARC Processors FAQ</ulink> for more information on SPARC hardware supported by the Linux kernel."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid "Any storage system supported by the Linux kernel is also supported by the boot system. Note that the current Linux kernel does not support floppies on CHRP systems at all."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid "Any storage system supported by the Linux kernel is also supported by the boot system. Note that the current Linux kernel does not support the floppy drive."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid "Any storage system supported by the Linux kernel is also supported by the boot system."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid "Any storage system supported by the Linux kernel is also supported by the boot system. This means that FBA and ECKD DASDs are supported with the old Linux disk layout (ldl) and the new common S/390 disk layout (cdl)."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid "You must have at least &minimum-memory; of memory and &minimum-fs-size; of hard disk space to perform a normal installation. Note that these are fairly minimal numbers. For more realistic figures, see <xref linkend=\"minimum-hardware-reqts\"/>."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid "Installation on systems with less memory<footnote condition=\"gtk\"> <para> Installation images that support the graphical installer require more memory than images that support only the textual installer and should not be used on systems with less than &minimum-memory; of memory. If there is a choice between booting the regular and the graphical installer, the former should be selected. </para> </footnote> or disk space available may be possible but is only advised for experienced users."
 msgstr ""
diff --git a/po/pot/install-methods.pot b/po/pot/install-methods.pot
index bba47dd40..4624aa9ba 100644
--- a/po/pot/install-methods.pot
+++ b/po/pot/install-methods.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -745,7 +745,7 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:996
 #, no-c-format
-msgid "Copy the following files from a &debian; CD image to <filename>c:\\</filename>."
+msgid "Copy the following directories from a &debian; CD image to <filename>c:\\</filename>."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pot/preparing.pot b/po/pot/preparing.pot
index c7ad59933..61897b903 100644
--- a/po/pot/preparing.pot
+++ b/po/pot/preparing.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -281,1157 +281,1163 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:307
 #, no-c-format
-msgid "Installation instructions and device drivers (DASD, XPRAM, Console, tape, z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+msgid "Documentation of &arch-title;-specific boot sequence, commands and device drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid "IBM Redbook describing how Linux can be combined with z/VM on zSeries and &arch-title; hardware."
 msgstr ""
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
 msgid "IBM Redbook describing the Linux distributions available for the mainframe. It has no chapter about &debian; but the basic installation concepts are the same across all &arch-title; distributions."
 msgstr ""
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid "In many cases, the installer will be able to automatically detect your hardware. But to be prepared, we do recommend familiarizing yourself with your hardware before the install."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid "The BIOS setup screens of your computer. You can view these screens when you start your computer by pressing a combination of keys. Check your manual for the combination. Often, it is the <keycap>Delete</keycap> key."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid "System commands or tools in another operating system, including file manager displays. This source is especially useful for information about RAM and hard drive memory."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid "Your system administrator or Internet Service Provider. These sources can tell you the settings you need to set up your networking and e-mail."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid "Resolutions and color depths supported (these should be checked against your monitor's capabilities)."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid "Many brand name products work without trouble on &arch-kernel;. Moreover, hardware support in &arch-kernel; is improving daily. However, &arch-kernel; still does not run as many different types of hardware as some operating systems."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid "In particular, &arch-kernel; usually cannot run hardware that requires a running version of Windows to work."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid "Although some Windows-specific hardware can be made to run on Linux, doing so usually requires extra effort. In addition, Linux drivers for Windows-specific hardware are usually specific to one Linux kernel. Therefore, they can quickly become obsolete."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid "So called win-modems are the most common type of this hardware. However, printers and other equipment may also be Windows-specific."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid "Looking at web sites or manuals for information about emulation. Lesser known brands can sometimes use the drivers or settings for better-known ones."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid "Checking hardware compatibility lists for &arch-kernel; on web sites dedicated to your architecture."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid "If your computer is connected to a network 24 hours a day (i.e., an Ethernet or equivalent connection &mdash; not a PPP connection), you should ask your network's system administrator for this information."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid "The IP address of the default gateway system you should route to, if your network <emphasis>has</emphasis> a gateway."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid "The system on your network that you should use as a DNS (Domain Name Service) server."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid "On the other hand, if your administrator tells you that a DHCP server is available and is recommended, then you don't need this information because the DHCP server will provide it directly to your computer during the installation process."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid "Once you have gathered information about your computer's hardware, check that your hardware will let you do the type of installation that you want to do."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid "Depending on your needs, you might manage with less than some of the recommended hardware listed in the table below. However, most users risk being frustrated if they ignore these suggestions."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, no-c-format
+msgid "128 megabytes"
+msgstr ""
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid "The actual minimum memory requirements are a lot less then the numbers listed in this table. Depending on the architecture, it is possible to install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The same goes for the disk space requirements, especially if you pick and choose which applications to install; see <xref linkend=\"tasksel-size-list\"/> for additional information on disk space requirements."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid "It is possible to run a graphical desktop environment on older or low-end systems, but in that case it is recommended to install a window manager that is less resource-hungry than those of the GNOME or KDE desktop environments; alternatives include <classname>xfce4</classname>, <classname>icewm</classname> and <classname>wmaker</classname>, but there are others to choose from."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid "It is practically impossible to give general memory or disk space requirements for server installations as those very much depend on what the server is to be used for."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid "Remember that these sizes don't include all the other materials which are usually to be found, such as user files, mail, and data. It is always best to be generous when considering the space for your own files and data."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
 msgid "Disk space required for the smooth operation of the &debian-gnu; system itself is taken into account in these recommended system requirements. Notably, the <filename>/var</filename> partition contains a lot of state information specific to &debian; in addition to its regular contents, like logfiles. The <command>dpkg</command> files (with information on all installed packages) can easily consume 40MB. Also, <command>apt-get</command> puts downloaded packages here before they are installed. You should usually allocate at least 200MB for <filename>/var</filename>, and a lot more if you install a graphical desktop environment."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid "Partitioning your disk simply refers to the act of breaking up your disk into sections. Each section is then independent of the others. It's roughly equivalent to putting up walls inside a house; if you add furniture to one room it doesn't affect any other room."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid "Whenever this section talks about <quote>disks</quote> you should translate this into a DASD or VM minidisk in the &arch-title; world. Also a machine means an LPAR or VM guest in this case."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, no-c-format
-msgid "If you already have an operating system on your system <phrase arch=\"any-x86\"> (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> and want to stick &debian; on the same disk, you will need to repartition the disk. &debian; requires its own hard disk partitions. It cannot be installed on Windows or MacOS partitions. It may be able to share some partitions with other Unix systems, but that's not covered here. At the very least you will need a dedicated partition for the &debian; root."
+msgid "If you already have an operating system on your system <phrase arch=\"any-x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> and want to stick &debian; on the same disk, you will need to repartition the disk. &debian; requires its own hard disk partitions. It cannot be installed on Windows or MacOS partitions. It may be able to share some partitions with other Unix systems, but that's not covered here. At the very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, no-c-format
 msgid "You can find information about your current partition setup by using a partitioning tool for your current operating system<phrase arch=\"any-x86\">, such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. Partitioning tools always provide a way to show existing partitions without making changes."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid "In general, changing a partition with a file system already on it will destroy any information there. Thus you should always make backups before doing any repartitioning. Using the analogy of the house, you would probably want to move all the furniture out of the way before moving a wall or you risk destroying it."
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
 msgid "If your computer has more than one hard disk, you may want to dedicate one of the hard disks completely to &debian;. If so, you don't need to partition that disk before booting the installation system; the installer's included partitioning program can handle the job nicely."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid "If your machine has only one hard disk, and you would like to completely replace the current operating system with &debian-gnu;, you also can wait to partition as part of the installation process (<xref linkend=\"di-partition\"/>), after you have booted the installation system. However this only works if you plan to boot the installer system from tapes, CD-ROM or files on a connected machine. Consider: if you boot from files placed on the hard disk, and then partition that same hard disk within the installation system, thus erasing the boot files, you'd better hope the installation is successful the first time around. At the least in this case, you should have some alternate means of reviving your machine like the original system's installation tapes or CDs."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
 msgid "If your machine already has multiple partitions, and enough space can be provided by deleting and replacing one or more of them, then you too can wait and use the &debian; installer's partitioning program. You should still read through the material below, because there may be special circumstances like the order of the existing partitions within the partition map, that force you to partition before installing anyway."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
 msgid "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, you can wait and use &debian; installer's partitioning program to resize the filesystem."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
 msgid "If none of the above apply, you'll need to partition your hard disk before starting the installation to create partitionable space for &debian;. If some of the partitions will be owned by other operating systems, you should create those partitions using native operating system partitioning programs. We recommend that you do <emphasis>not</emphasis> attempt to create partitions for &debian-gnu; using another operating system's tools. Instead, you should just create the native operating system's partitions you will want to retain."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
 msgid "If you are going to install more than one operating system on the same machine, you should install all other system(s) before proceeding with &debian; installation. Windows and other OS installations may destroy your ability to start &debian;, or encourage you to reformat non-native partitions."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid "You can recover from these actions or avoid them, but installing the native system first saves you trouble."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, no-c-format
 msgid "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; partitions should appear before all other partitions on the disk, especially MacOS boot partitions. This should be kept in mind when pre-partitioning; you should create a &arch-parttype; placeholder partition to come <emphasis>before</emphasis> the other bootable partitions on the disk. (The small partitions dedicated to Apple disk drivers are not bootable.) You can delete the placeholder with the &debian; partition tools later during the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
 msgid "If you currently have one hard disk with one partition (a common setup for desktop computers), and you want to multi-boot the native operating system and &debian;, you will need to:"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid "Boot from the native operating system installer media such as CD-ROM or tapes. <phrase arch=\"powerpc\">When booting from a MacOS CD, hold the <keycap>c</keycap> key while booting to force the CD to become the active MacOS system.</phrase>"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid "Use the native partitioning tools to create native system partition(s). Leave either a place holder partition or free space for &debian-gnu;."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
 msgid "Boot back into the native system to verify everything's OK, and to download the &debian; installer boot files."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
 msgid "If you are manipulating existing FAT or NTFS partitions, it is recommended that you either use the scheme below or native Windows or DOS tools. Otherwise, it is not really necessary to partition from DOS or Windows; the &debian; partitioning tools will generally do a better job."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
 msgid "But if you have a large IDE disk, and are not using LBA addressing, overlay drivers (sometimes provided by hard disk manufacturers), or a new (post 1998) BIOS that supports large disk access extensions, then you must locate your &debian; boot partition carefully. In this case, you will have to put the boot partition into the first 1024 cylinders of your hard disk (usually around 524 megabytes, without BIOS translation). This may require that you move an existing FAT or NTFS partition."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
-msgid "One of the most common installations is onto a system that already contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, XP), or OS/2, and it is desired to put &debian; onto the same disk without destroying the previous system. Note that the installer supports resizing of FAT and NTFS filesystems as used by DOS and Windows. Simply start the installer and when you get to the partitioning step, select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, select the partition to resize, and specify its new size. So in most cases you should not need to use the method described below."
+msgid "One of the most common installations is onto a system that already contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without destroying the previous system. Note that the installer supports resizing of FAT and NTFS filesystems as used by DOS and Windows. Simply start the installer and when you get to the partitioning step, select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, select the partition to resize, and specify its new size. So in most cases you should not need to use the method described below."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
 msgid "Before going any further, you should have decided how you will be dividing up the disk. The method in this section will only split a partition into two pieces. One will contain the original OS and the other will be used for &debian;. During the installation of &debian;, you will be given the opportunity to use the &debian; portion of the disk as you see fit, i.e., as swap or as a file system."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid "The idea is to move all the data on the partition to the beginning, before changing the partition information, so that nothing will be lost. It is important that you do as little as possible between the data movement and repartitioning to minimize the chance of a file being written near the end of the partition as this will decrease the amount of space you can take from the partition."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:984
+#: preparing.xml:983
 #, no-c-format
-msgid "The first thing needed is a copy of <command>fips</command> which is available in the <filename>tools/</filename> directory on your nearest &debian; mirror. Unzip the archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A bootable floppy can be created using the command <filename>sys a:</filename> under DOS. <command>fips</command> comes with very good documentation which you may want to read. You will definitely need to read the documentation if you use a disk compression driver or a disk manager. Create the disk and read the documentation <emphasis>before</emphasis> you defragment the disk."
+msgid "The first thing needed is a copy of <command>fips</command>. Unzip the archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A bootable floppy can be created using the command <filename>sys a:</filename> under DOS. <command>fips</command> comes with very good documentation which you may want to read. You will definitely need to read the documentation if you use a disk compression driver or a disk manager. Create the disk and read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid "The next thing needed is to move all the data to the beginning of the partition. <command>defrag</command>, which comes standard with DOS 6.0 and later, can easily do the job. See the <command>fips</command> documentation for a list of other software that may do the trick. Note that if you have Windows 9x, you must run <command>defrag</command> from there, since DOS doesn't understand VFAT, which is used to support for long filenames, used in Windows 95 and higher."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid "After running the defragmenter (which can take a while on a large disk), reboot with the <command>fips</command> disk you created in the floppy drive. Simply type <filename>a:\\fips</filename> and follow the directions."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid "Note that there are many other partition managers out there, in case <command>fips</command> doesn't do the trick for you."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
 msgid "If you are partitioning for DOS drives, or changing the size of DOS partitions, using &debian; tools, many people experience problems working with the resulting FAT partitions. For instance, some have reported slow performance, consistent problems with <command>scandisk</command>, or other weird errors in DOS or Windows."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
 msgid "Apparently, whenever you create or resize a partition for DOS use, it's a good idea to fill the first few sectors with zeros. You should do this prior to running DOS's <command>format</command> command by executing the following command from &debian;:"
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
 msgid "It's perfectly fine to partition from SunOS; in fact, if you intend to run both SunOS and &debian; on the same machine, it is recommended that you partition using SunOS prior to installing &debian;. The Linux kernel understands Sun disk labels, so there are no problems there. SILO supports booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), romfs or iso9660 (CDROM) partitions."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid "Whatever system you are using to partition, make sure you create a <quote>Sun disk label</quote> on your boot disk. This is the only kind of partition scheme that the OpenBoot PROM understands, and so it's the only scheme from which you can boot. In <command>fdisk</command>, the <keycap>s</keycap> key is used to create Sun disk labels. You only need to do this on drives that do not already have a Sun disk label. If you are using a drive that was previously formatted using a PC (or other architecture) you must create a new disk label, or problems with the disk geometry will most likely occur."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid "You will probably be using <command>SILO</command> as your boot loader (the small program which runs the operating system kernel). <command>SILO</command> has certain requirements for partition sizes and location; see <xref linkend=\"partitioning\"/>."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid "The <application>Apple Drive Setup</application> application can be found in the <filename>Utilities</filename> folder on the MacOS CD. It will not adjust existing partitions; it is limited to partitioning the entire disk at once. The disk driver partitions don't show up in <application>Drive Setup</application>."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid "Remember to create a placeholder partition for GNU/Linux, preferably positioned first in the disk layout. it doesn't matter what type it is, it will be deleted and replaced later inside the &debian-gnu; installer."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid "If you are planning to install both MacOS 9 and OS X, it is best to create separate partitions for OS 9 and OS X. If they are installed on the same partition, <application>Startup Disk</application> (and reboot) must be used to select between the two; the choice between the two systems can't be made at boot time. With separate partitions, separate options for OS 9 and OS X will appear when holding the <keycap>option</keycap> key at boot time, and separate options can be installed in the <application>yaboot</application> boot menu as well. Also, Startup Disk will de-bless all other mountable partitions, which can affect GNU/Linux booting. Both OS 9 and OS X partitions will be accessible from either OS 9 or OS X."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid "GNU/Linux is unable to access information on UFS partitions, but does support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS Standard) or HFS+. To share information between the MacOS and GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT partitions are supported by both MacOS and Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
 msgid "This section will walk you through pre-installation hardware setup, if any, that you will need to do prior to installing &debian;. Generally, this involves checking and possibly changing firmware settings for your system. The <quote>firmware</quote> is the core software used by the hardware; it is most critically invoked during the bootstrap process (after power-up). Known hardware issues affecting the reliability of &debian-gnu; on your system are also highlighted."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
 msgid "BIOS provides the basic functions needed to boot your machine to allow your operating system to access your hardware. Your system probably provides a BIOS setup menu, which is used to configure the BIOS. Before installing, you <emphasis>must</emphasis> ensure that your BIOS is set up correctly; not doing so can lead to intermittent crashes or an inability to install &debian;."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></ulink>, answering the question, <quote>How do I enter the CMOS configuration menu?</quote>. How you access the BIOS (or <quote>CMOS</quote>) configuration menu depends on who wrote your BIOS software:"
 msgstr ""
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr ""
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </keycombo>, or <keycap>Delete</keycap> key during the POST"
 msgstr ""
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr ""
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> </keycombo> after <keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
 msgstr ""
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </keycombo> or <keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>S</keycap> </keycombo> or <keycap>F1</keycap>"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid "Information on invoking other BIOS routines can be found in <ulink url=\"&url-invoking-bios-info;\"></ulink>."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. They require a software CMOS setup program. If you don't have the Installation and/or Diagnostics diskette for your machine, you can try using a shareware/freeware program. Try looking in <ulink url=\"&url-simtel;\"></ulink>."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
 msgid "Many BIOS setup menus allow you to select the devices that will be used to bootstrap the system. Set this to look for a bootable operating system on <filename>A:</filename> (the first floppy disk), then optionally the first CD-ROM device (possibly appearing as <filename>D:</filename> or <filename>E:</filename>), and then from <filename>C:</filename> (the first hard disk). This setting enables you to boot from either a floppy disk or a CD-ROM, which are the two most common boot devices used to install &debian;."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid "If you have a newer SCSI controller and you have a CD-ROM device attached to it, you are usually able to boot from the CD-ROM. All you have to do is enable booting from a CD-ROM in the SCSI-BIOS of your controller."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid "Another popular option is to boot from a USB storage device (also called a USB memory stick or USB key). Some BIOSes can boot directly from a USB storage device, but some cannot. You may need to configure your BIOS to boot from a <quote>Removable drive</quote> or even from <quote>USB-ZIP</quote> to get it to boot from the USB device."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid "Here are some details about how to set the boot order. Remember to reset the boot order after &arch-kernel; is installed, so that you restart your machine from the hard drive."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid "As your computer starts, press the keys to enter the BIOS utility. Often, it is the <keycap>Delete</keycap> key. However, consult the hardware documentation for the exact keystrokes."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid "Find the boot sequence in the setup utility. Its location depends on your BIOS, but you are looking for a field that lists drives."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid "Change the boot sequence setting so that the CD-ROM or the floppy is first. Usually, the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> keys cycle through the possible choices."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid "Save your changes. Instructions on the screen tell you how to save the changes on your computer."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid "As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid "You can start the SCSI setup utility after the memory check and the message about how to start the BIOS utility displays when you start your computer."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid "The keystrokes you need depend on the utility. Often, it is <keycombo><keycap>Ctrl</keycap><keycap>F2</keycap></keycombo>. However, consult your hardware documentation for the exact keystrokes."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid "Set the utility so that the SCSI ID of the CD drive is first on the list."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid "Save your changes. Instructions on the screen tell you how to save the changes on your computer. Often, you must press <keycap>F10</keycap>."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD speed. You should avoid that, and instead set it to, say, the lowest speed. If you get <userinput>seek failed</userinput> error messages, this may be your problem."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid "If your system provides both ex<emphasis>ten</emphasis>ded and ex<emphasis>pan</emphasis>ded memory, set it so that there is as much extended and as little expanded memory as possible. &arch-kernel; requires extended memory and cannot use expanded memory."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid "Disable any virus-warning features your BIOS may provide. If you have a virus-protection board or other special hardware, make sure it is disabled or physically removed while running GNU/&arch-kernel;. These aren't compatible with GNU/&arch-kernel;; moreover, due to the file system permissions and protected memory of the &arch-kernel; kernel, viruses are almost unheard of<footnote> <para> After installation you can enable Boot Sector protection if you want. This offers no additional security in &arch-kernel; but if you also run Windows it may prevent a catastrophe. There is no need to tamper with the Master Boot Record (MBR) after the boot manager has been set up. </para> </footnote>."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS caching. You may see settings for <quote>Video BIOS Shadow</quote>, <quote>C800-CBFF Shadow</quote>, etc. <emphasis>Disable</emphasis> all shadow RAM. Shadow RAM is used to accelerate access to the ROMs on your motherboard and on some of the controller cards. &arch-kernel; does not use these ROMs once it has booted because it provides its own faster 32-bit software in place of the 16-bit programs in the ROMs. Disabling the shadow RAM may make some of it available for programs to use as normal memory. Leaving the shadow RAM enabled may interfere with &arch-kernel; access to hardware devices."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</quote>, please disable that. &arch-kernel; expects to find memory there if you have that much RAM."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid "We have a report of an Intel Endeavor motherboard on which there is an option called <quote>LFB</quote> or <quote>Linear Frame Buffer</quote>. This had two settings: <quote>Disabled</quote> and <quote>1 Megabyte</quote>. Set it to <quote>1 Megabyte</quote>. When disabled, the installation floppy was not read correctly, and the system eventually crashed. At this writing we don't understand what's going on with this particular device &mdash; it just worked with that setting and not without it."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid "If your motherboard provides Advanced Power Management (APM), configure it so that power management is controlled by APM. Disable the doze, standby, suspend, nap, and sleep modes, and disable the hard disk's power-down timer. &arch-kernel; can take over control of these modes, and can do a better job of power-management than the BIOS."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-title; systems. PReP and CHRP are equipped with OpenFirmware, but unfortunately, the means you use to invoke it vary from manufacturer to manufacturer. You'll have to consult the hardware documentation which came with your machine."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid "On &arch-title; Macintoshes, you invoke OpenFirmware with <keycombo><keycap>Command (cloverleaf/Apple)</keycap><keycap>Option</keycap><keycap>o</keycap><keycap>f</keycap></keycombo> while booting. Generally it will check for these keystrokes after the chime, but the exact timing varies from model to model. See <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> for more hints."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
       "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1441,43 +1447,43 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, is broken. These machines will most likely not be able to boot from the hard drive unless the firmware is patched. A firmware patch is included in the <application>System Disk 2.3.1</application> utility, available from Apple at <ulink url=\"ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin\"></ulink>. After unpacking the utility in MacOS, and launching it, select the <guibutton>Save</guibutton> button to have the firmware patches installed to nvram."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid "OpenBoot provides the basic functions needed to boot the &arch-title; architecture. This is rather similar in function to the BIOS in the x86 architecture, although much nicer. The Sun boot PROMs have a built-in forth interpreter which lets you do quite a number of things with your machine, such as diagnostics and simple scripts."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> key (on older type 4 keyboards, use the <keycap>L1</keycap> key, if you have a PC keyboard adapter, use the <keycap>Break</keycap> key) and press the <keycap>A</keycap> key. The boot PROM will give you a prompt, either <userinput>ok</userinput> or <userinput>&gt;</userinput>. It is preferred to have the <userinput>ok</userinput> prompt. So if you get the old style prompt, hit the <keycap>n</keycap> key to get the new style prompt."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid "If you are using a serial console, send a break to the machine. With Minicom, use <keycap>Ctrl-A F</keycap>, with cu, hit <keycap>Enter</keycap>, then type <userinput>%~break</userinput>. Consult the documentation of your terminal emulator if you are using a different program."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid "You can use OpenBoot to boot from specific devices, and also to change your default boot device. However, you need to know some details about how OpenBoot names devices; it's considerably different from Linux device naming, described in <xref linkend=\"device-names\"/>. Also, the command will vary a bit, depending on what version of OpenBoot you have. More information about OpenBoot can be found in the <ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
       "Typically, with newer revisions, you can use OpenBoot devices such as <quote>floppy</quote>, <quote>cdrom</quote>, <quote>net</quote>, <quote>disk</quote>, or <quote>disk2</quote>. These have the obvious meanings; the <quote>net</quote> device is for booting from the network. Additionally, the device name can specify a particular partition of a disk, such as <quote>disk2:a</quote> to boot disk2, first partition. Full OpenBoot device names have the form: <informalexample> <screen>\n"
@@ -1488,7 +1494,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
       "To boot from a specific device, use the command <userinput>boot <replaceable>device</replaceable></userinput>. You can set this behavior as the default using the <userinput>setenv</userinput> command. However, the name of the variable to set changed between OpenBoot revisions. In OpenBoot 1.x, use the command <userinput>setenv boot-from <replaceable>device</replaceable></userinput>. In later revisions of OpenBoot, use the command <userinput>setenv boot-device <replaceable>device</replaceable></userinput>. Note, this is also configurable using the <command>eeprom</command> command on Solaris, or modifying the appropriate files in <filename>/proc/openprom/options/</filename>, for example under Linux: <informalexample><screen>\n"
@@ -1497,115 +1503,115 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid "In order to install &debian-gnu; on a &arch-title; or zSeries machine you have first boot a kernel into the system. The boot mechanism of this platform is inherently different to other ones, especially from PC-like systems: there are no floppy devices available at all. You will notice another big difference while you work with this platform: most (if not all) of the time you will work remote, with the help of some client session software like telnet, or a browser. This is due to that special system architecture where the 3215/3270 console is line-based instead of character-based."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid "Linux on this platform runs either natively on the bare machine, in a so-called LPAR (Logical Partition) or in a virtual machine supplied by the VM system. You can use a boot tape on all of those systems; you may use some other boot media, too, but those may not be generally available. For example, you can use the virtual card reader of a virtual machine, or boot from the HMC (Hardware Management Console) of an LPAR if the HMC and this option is available for you."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
 msgid "Before you actually perform an installation, you have to go over some design and preparation steps. IBM has made documentation available about the whole process, e.g. how to prepare an installation medium and how actually to boot from that medium. Duplicating that information here is neither possible nor necessary. However, we will describe here which kind of &debian;-specific data is needed and where to find it. Using both sources of information, you have to prepare your machine and the installation medium before you can perform a boot from it. When you see the welcome message in your client session, return to this document to go through the &debian;-specific installation steps."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg244987.pdf\"> Linux for &arch-title;</ulink> Redbook and chapter 3.2 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and &arch-title;: Distributions</ulink> Redbook on how to set up an LPAR for Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg244987.pdf\"> Linux for &arch-title;</ulink> Redbook and chapter 3.1 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and &arch-title;: Distributions</ulink> Redbook on how to set up a VM guest for running Linux."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1712
+#: preparing.xml:1710
 #, no-c-format
-msgid "You need to copy all the files from the <filename>generic</filename> sub-directory to your CMS disk. Be sure to transfer <filename>kernel.debian</filename> and <filename>initrd.debian</filename> in binary mode with a fixed record length of 80 characters."
+msgid "You need to copy all the files from the <filename>generic</filename> sub-directory to your CMS disk. Be sure to transfer <filename>kernel.debian</filename> and <filename>initrd.debian</filename> in binary mode with a fixed record length of 80 characters. <filename>parmfile.debian</filename> can be in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> script, which will punch the files in the proper order, is included with the images."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid "If you don't have a connection to the Internet (either directly or via a web proxy) you need to create a local installation server that can be accessed from your S/390. This server keeps all the packages you want to install and must make them available using NFS, HTTP or FTP."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid "The installation server needs to copy the exact directory structure from any &debian-gnu; mirror, but only the s390 and architecture-independent files are required. You can also copy the contents of all installation CDs into such a directory tree."
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid "If you have no AT-style keyboard and only a USB model, you may need to enable legacy AT keyboard emulation in your BIOS setup. Only do this if the installation system fails to use your keyboard in USB mode. Conversely, for some systems (especially laptops) you may need to disable legacy USB support if your keyboard does not respond. Consult your main board manual and look in the BIOS for <quote>Legacy keyboard emulation</quote> or <quote>USB keyboard support</quote> options."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid "Some OldWorld Powermacs, most notably those with the <quote>control</quote> display driver, may not reliably produce a colormap under Linux when the display is configured for more than 256 colors. If you are experiencing such issues with your display after rebooting (you can sometimes see data on the monitor, but on other occasions cannot see anything) or, if the screen turns black after booting the installer instead of showing you the user interface, try changing your display settings under MacOS to use 256 colors instead of <quote>thousands</quote> or <quote>millions</quote>."
 msgstr ""
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index 115733f48..fb6d378f4 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1079,17 +1079,23 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:892
 #, no-c-format
-msgid "You can also use preseeding to set up partitions on software RAID arrays. Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and specifying spare devices. If you are using RAID 1, you can preseed grub to install to all devices used in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgid "You can also use preseeding to set up partitions on software RAID arrays. Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and specifying spare devices."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:898
+#, no-c-format
+msgid "If you are using RAID 1, you can preseed grub to install to all devices used in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgstr ""
+
+#. Tag: para
+#: preseed.xml:905
 #, no-c-format
 msgid "This type of automated partitioning is easy to get wrong. It is also functionality that receives relatively little testing from the developers of &d-i;. The responsibility to get the various recipes right (so they make sense and don't conflict) lies with the user. Check <filename>/var/log/syslog</filename> if you run into problems."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
       "# The method should be set to \"raid\".\n"
@@ -1143,31 +1149,31 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid "Normally, filesystems are mounted using a universally unique identifier (UUID) as a key; this allows them to be mounted properly even if their device name changes. UUIDs are long and difficult to read, so, if you prefer, the installer can mount filesystems based on the traditional device names, or based on a label you assign. If you ask the installer to mount by label, any filesystems without a label will be mounted using a UUID instead."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid "Devices with stable names, such as LVM logical volumes, will continue to use their traditional names rather than UUIDs."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid "Traditional device names may change based on the order in which the kernel discovers devices at boot, which may cause the wrong filesystem to be mounted. Similarly, labels are likely to clash if you plug in a new disk or a USB drive, and if that happens your system's behaviour when started will be random."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
       "# The default is to mount by UUID, but you can also choose \"traditional\" to\n"
@@ -1177,19 +1183,19 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid "There is actually not very much that can be preseeded for this stage of the installation. The only questions asked concern the installation of the kernel."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
       "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -1206,25 +1212,25 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid "The password for the root account and name and password for a first regular user's account can be preseeded. For the passwords you can use either clear text values or MD5 <emphasis>hashes</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid "Be aware that preseeding passwords is not completely secure as everyone with access to the preconfiguration file will have the knowledge of these passwords. Using MD5 hashes is considered slightly better in terms of security but it might also give a false sense of security as access to a MD5 hash allows for brute force attacks."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
       "# Skip creation of a root account (normal user account will be able to\n"
@@ -1256,37 +1262,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid "The <classname>passwd/root-password-crypted</classname> and <classname>passwd/user-password-crypted</classname> variables can also be preseeded with <quote>!</quote> as their value. In that case, the corresponding account is disabled. This may be convenient for the root account, provided of course that an alternative method is set up to allow administrative activities or root login (for instance by using SSH key authentication or <command>sudo</command>)."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid "The following command can be used to generate an MD5 hash for a password:"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid "Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration options is fully automated based on your installation method and answers to earlier questions. You can optionally add other (local) repositories."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
       "# You can choose to install non-free and contrib software.\n"
@@ -1318,97 +1324,97 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid "You can choose to install any combination of tasks that are available. Available tasks as of this writing include:"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid "You can also choose to install no tasks, and force the installation of a set of packages in some other way. We recommend always including the <userinput>standard</userinput> task."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid "If you want to install some individual packages in addition to packages installed by tasks, you can use the parameter <classname>pkgsel/include</classname>. The value of this parameter can be a list of packages separated by either commas or spaces, which allows it to be used easily on the kernel command line as well."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
       "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -1430,13 +1436,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1087
 #, no-c-format
 msgid ""
       "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -1468,6 +1474,8 @@ msgid ""
       "#d-i grub-installer/bootdev  string (hd0,0)\n"
       "# To install grub to multiple disks:\n"
       "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+      "# To install to a particular device:\n"
+      "#d-i grub-installer/bootdev  string /dev/sda\n"
       "\n"
       "# Optional password for grub, either in clear text\n"
       "#d-i grub-installer/password password r00tme\n"
@@ -1482,19 +1490,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid "An MD5 hash for a password for <classname>grub</classname> can be generated using <command>grub-md5-crypt</command>, or using the command from the example in <xref linkend=\"preseed-account\"/>."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
       "# During installations from serial console, the regular virtual consoles\n"
@@ -1517,13 +1525,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
       "# Depending on what software you choose to install, or if things go wrong\n"
@@ -1536,25 +1544,25 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid "A very powerful and flexible option offered by the preconfiguration tools is the ability to run commands or scripts at certain points in the installation."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
       "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1580,13 +1588,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
       "It is possible to use preseeding to change the default answer for a question, but still have the question asked. To do this the <firstterm>seen</firstterm> flag must be reset to <quote>false</quote> after setting the value for a question. <informalexample><screen>\n"
@@ -1596,31 +1604,31 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid "Note that the <quote>d-i</quote> owner should only be used for variables used in the installer itself. For variables belonging to packages installed on the target system, you should use the name of that package instead. See the footnote to <xref linkend=\"preseed-bootparms\"/>."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid "If you are preseeding using boot parameters, you can make the installer ask the corresponding question by using the <quote>?=</quote> operator, i.e. <userinput><replaceable>foo</replaceable>/<replaceable>bar</replaceable>?=<replaceable>value</replaceable></userinput> (or <userinput><replaceable>owner</replaceable>:<replaceable>foo/bar</replaceable>?=<replaceable>value</replaceable></userinput>). This will of course only have effect for parameters that correspond to questions that are actually displayed during an installation and not for <quote>internal</quote> parameters."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid "It is possible to include other preconfiguration files from a preconfiguration file. Any settings in those files will override pre-existing settings from files loaded earlier. This makes it possible to put, for example, general networking settings for your location in one file and more specific settings for certain configurations in other files."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
       "# More than one file can be listed, separated by spaces; all will be\n"
@@ -1648,7 +1656,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid "It is also possible to chainload from the initrd or file preseeding phase, into network preseeding by setting preseed/url in the earlier files. This will cause network preseeding to be performed when the network comes up. You need to be careful when doing this, since there will be two distinct runs at preseeding, meaning for example that you get another chance to run the preseed/early command, the second one happening after the network comes up."
 msgstr ""
diff --git a/po/pot/random-bits.pot b/po/pot/random-bits.pot
index aeb77b883..8e4b78492 100644
--- a/po/pot/random-bits.pot
+++ b/po/pot/random-bits.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -688,50 +688,74 @@ msgstr ""
 msgid "&task-sql-tot;"
 msgstr ""
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, no-c-format
+msgid "SSH server"
+msgstr ""
+
+#. Tag: entry
+#: random-bits.xml:342
+#, no-c-format
+msgid "&task-ssh-inst;"
+msgstr ""
+
+#. Tag: entry
 #: random-bits.xml:343
 #, no-c-format
+msgid "&task-ssh-dl;"
+msgstr ""
+
+#. Tag: entry
+#: random-bits.xml:344
+#, no-c-format
+msgid "&task-ssh-tot;"
+msgstr ""
+
+#. Tag: para
+#: random-bits.xml:350
+#, no-c-format
 msgid "If you install in a language other than English, <command>tasksel</command> may automatically install a <firstterm>localization task</firstterm>, if one is available for your language. Space requirements differ per language; you should allow up to 350MB in total for download and installation."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
 msgid "This section explains how to install &debian-gnu; from an existing Unix or Linux system, without using the menu-driven installer as explained in the rest of the manual. This <quote>cross-install</quote> HOWTO has been requested by users switching to &debian-gnu; from Red Hat, Mandriva, and SUSE. In this section some familiarity with entering *nix commands and navigating the file system is assumed. In this section, <prompt>$</prompt> symbolizes a command to be entered in the user's current system, while <prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
 msgid "Once you've got the new &debian; system configured to your preference, you can migrate your existing user data (if any) to it, and keep on rolling. This is therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a clever way for dealing with hardware that otherwise doesn't play friendly with various boot or installation media."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
 msgid "As this is a mostly manual procedure, you should bear in mind that you will need to do a lot of basic configuration of the system yourself, which will also require more knowledge of &debian; and of &arch-kernel; in general than performing a regular installation. You cannot expect this procedure to result in a system that is identical to a system from a regular installation. You should also keep in mind that this procedure only gives the basic steps to set up a system. Additional installation and/or configuration steps may be needed."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid "With your current *nix partitioning tools, repartition the hard drive as needed, creating at least one filesystem plus swap. You need around 350MB of space available for a console only install, or about 1GB if you plan to install X (more if you intend to install desktop environments like GNOME or KDE)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
       "Next, create file systems on the partitions. For example, to create an ext3 file system on partition <filename>/dev/hda6</filename> (that's our example root partition): <informalexample><screen>\n"
@@ -740,7 +764,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
       "Initialize and activate swap (substitute the partition number for your intended &debian; swap partition): <informalexample><screen>\n"
@@ -751,7 +775,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
       "# mkdir /mnt/debinst\n"
@@ -759,25 +783,25 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid "If you want to have parts of the filesystem (e.g. /usr) mounted on separate partitions, you will need to create and mount these directories manually before proceding with the next stage."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
 msgid "The utility used by the &debian; installer, and recognized as the official way to install a &debian; base system, is <command>debootstrap</command>. It uses <command>wget</command> and <command>ar</command>, but otherwise depends only on <classname>/bin/sh</classname> and basic Unix/Linux tools<footnote> <para> These include the GNU core utilities and commands like <command>sed</command>, <command>grep</command>, <command>tar</command> and <command>gzip</command>. </para> </footnote>. Install <command>wget</command> and <command>ar</command> if they aren't already on your current system, then download and install <command>debootstrap</command>."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
 msgid ""
       "Or, you can use the following procedure to install it manually. Make a work folder for extracting the .deb into: <informalexample><screen>\n"
@@ -787,7 +811,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
       "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -796,31 +820,31 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
 msgid "<command>debootstrap</command> can download the needed files directly from the archive when you run it. You can substitute any &debian; archive mirror for <userinput>&archive-mirror;/debian</userinput> in the command example below, preferably a mirror close to you network-wise. Mirrors are listed at <ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</filename>, you could substitute a file URL instead of the http URL: <userinput>file:/cdrom/debian/</userinput>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid "Substitute one of the following for <replaceable>ARCH</replaceable> in the <command>debootstrap</command> command: <userinput>alpha</userinput>, <userinput>amd64</userinput>, <userinput>arm</userinput>, <userinput>armel</userinput>, <userinput>hppa</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, or <userinput>sparc</userinput>."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
       "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -828,13 +852,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
       "Now you've got a real &debian; system, though rather lean, on disk. <command>chroot</command> into it: <informalexample><screen>\n"
@@ -843,37 +867,37 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid "At this point <filename>/dev/</filename> only contains very basic device files. For the next steps of the installation additional device files may be needed. There are different ways to go about this and which method you should use depends on the host system you are using for the installation, on whether you intend to use a modular kernel or not, and on whether you intend to use dynamic (e.g. using <classname>udev</classname>) or static device files for the new system."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
       "# cd /dev\n"
@@ -881,25 +905,25 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid "bind mount /dev from your host system on top of /dev in the target system; note that the postinst scripts of some packages may try to create device files, so this option should only be used with care"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, no-c-format
 msgid ""
       "You need to create <filename>/etc/fstab</filename>. <informalexample><screen>\n"
@@ -933,37 +957,37 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid "The command <userinput>ls /proc</userinput> should now show a non-empty directory. Should this fail, you may be able to mount proc from outside the chroot:"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid "An option in the file <filename>/etc/default/rcS</filename> determines whether the system will interpret the hardware clock as being set to UTC or local time. The following command allows you to set that and choose your timezone."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
       "# editor /etc/default/rcS\n"
@@ -971,13 +995,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
       "To configure networking, edit <filename>/etc/network/interfaces</filename>, <filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> and <filename>/etc/hosts</filename>. <informalexample><screen>\n"
@@ -1031,13 +1055,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
       "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</filename> that will allow installing additional packages. However, you may want to add some additional sources, for example for source packages and security updates: <informalexample><screen>\n"
@@ -1049,13 +1073,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
       "To configure your locale settings to use a language other than English, install the <classname>locales</classname> support package and configure it. Currently the use of UTF-8 locales is recommended. <informalexample><screen>\n"
@@ -1065,7 +1089,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
       "# aptitude install console-data\n"
@@ -1073,61 +1097,61 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid "Note that the keyboard cannot be set while in the chroot, but will be configured for the next reboot."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid "If you intend to boot this system, you probably want a &arch-kernel; kernel and a boot loader. Identify available pre-packaged kernels with:"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable>"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
 msgid "To make your &debian-gnu; system bootable, set up your boot loader to load the installed kernel with your new root partition. Note that <command>debootstrap</command> does not install a boot loader, though you can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, no-c-format
 msgid "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or <userinput>man lilo.conf</userinput></phrase> for instructions on setting up the bootloader. If you are keeping the system you used to install &debian;, just add an entry for the &debian; install to your existing grub <filename>menu.lst</filename><phrase arch=\"x86\">or <filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you could also copy it to the new system and edit it there. After you are done editing, call <command>lilo</command> (remember it will use <filename>lilo.conf</filename> relative to the system you call it from)</phrase>."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
       "Installing and setting up <classname>grub</classname> is as easy as: <informalexample><screen>\n"
@@ -1138,19 +1162,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid "Note that this assumes that a <filename>/dev/hda</filename> device file has been created. There are alternative methods to install <command>grub</command>, but those are outside the scope of this appendix."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
       "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1164,13 +1188,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
 msgid "Check <userinput>man yaboot.conf</userinput> for instructions on setting up the bootloader. If you are keeping the system you used to install &debian;, just add an entry for the &debian; install to your existing <filename>yaboot.conf</filename>. You could also copy it to the new system and edit it there. After you are done editing, call ybin (remember it will use <filename>yaboot.conf</filename> relative to the system you call it from)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
       "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: <informalexample><screen>\n"
@@ -1186,13 +1210,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
       "As mentioned earlier, the installed system will be very basic. If you would like to make the system a bit more mature, there is an easy method to install all packages with <quote>standard</quote> priority: <informalexample><screen>\n"
@@ -1201,91 +1225,91 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid "After the installation there will be a lot of downloaded packages in <filename>/var/cache/apt/archives/</filename>. You can free up some diskspace by running:"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid "This section explains how to install &debian-gnu; on a computer without an Ethernet card, but with just a remote gateway computer attached via a Null-Modem cable (also called Null-Printer cable). The gateway computer should be connected to a network that has a &debian; mirror on it (e.g. to the Internet)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid "In the example in this appendix we will set up a PLIP connection using a gateway connected to the Internet over a dial-up connection (ppp0). We will use IP addresses 192.168.0.1 and 192.168.0.2 for the PLIP interfaces on the target system and the source system respectively (these addresses should be unused within your network address space)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid "The PLIP connection set up during the installation will also be available after the reboot into the installed system (see <xref linkend=\"boot-new\"/>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid "Before you start, you will need to check the BIOS configuration (IO base address and IRQ) for the parallel ports of both the source and target systems. The most common values are <literal>io=0x378</literal>, <literal>irq=7</literal>."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid "A target computer, called <emphasis>target</emphasis>, where &debian; will be installed."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid "Another computer connected to the Internet, called <emphasis>source</emphasis>, that will function as the gateway."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;\">PLIP-Install-HOWTO</ulink> for more information on this cable and instructions how to make your own."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid "The following shell script is a simple example of how to configure the source computer as a gateway to the Internet using ppp0."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
       "#!/bin/sh\n"
@@ -1306,13 +1330,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
       "Boot the installation media. The installation needs to be run in expert mode; enter <userinput>expert</userinput> at the boot prompt. If you need to set parameters for kernel modules, you also need to do this at the boot prompt. For example, to boot the installer and set values for the <quote>io</quote> and <quote>irq</quote> options for the parport_pc module, enter the following at the boot prompt: <informalexample><screen>\n"
@@ -1321,217 +1345,217 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid "Select the <userinput>plip-modules</userinput> option from the list; this will make the PLIP drivers available to the installation system."
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid "If target <emphasis>does</emphasis> have a network card, a list of driver modules for detected cards will be shown. If you want to force &d-i; to use plip instead, you have to deselect all listed driver modules. Obviously, if target doesn't have a network card, the installer will not show this list."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid "Because no network card was detected/selected earlier, the installer will ask you to select a network driver module from a list. Select the <userinput>plip</userinput> module."
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid "Name server addresses: you can enter the same addresses used on source (see <filename>/etc/resolv.conf</filename>)"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid "In some countries PPP over Ethernet (PPPoE) is a common protocol for broadband (ADSL or cable) connections to an Internet Service Provider. Setting up a network connection using PPPoE is not supported by default in the installer, but can be made to work very simply. This section explains how."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid "The PPPoE connection set up during the installation will also be available after the reboot into the installed system (see <xref linkend=\"boot-new\"/>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid "To have the option of setting up and using PPPoE during the installation, you will need to install using one of the CD-ROM/DVD images that are available. It is not supported for other installation methods (e.g. netboot<phrase condition=\"supports-floppy-boot\"> or floppy</phrase>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid "Installing over PPPoE is mostly the same as any other installation. The following steps explain the differences."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</userinput><footnote arch=\"x86\"> <para> See <xref linkend=\"boot-screen\"/> for information on how to add a boot parameter. </para> </footnote>. This will ensure the component responsible for the setup of PPPoE (<classname>ppp-udeb</classname>) will be loaded and run automatically."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid "Follow the regular initial steps of the installation (language, country and keyboard selection; the loading of additional installer components<footnote> <para> The <classname>ppp-udeb</classname> component is loaded as one of the additional components in this step. If you want to install at medium or low priority (expert mode), you can also manually select the <classname>ppp-udeb</classname> instead of entering the <quote>modules</quote> parameter at the boot prompt. </para> </footnote>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid "The next step is the detection of network hardware, in order to identify any Ethernet cards present in the system."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid "After this the actual setup of PPPoE is started. The installer will probe all the detected Ethernet interfaces in an attempt to find a PPPoE concentrator (a type of server which handles PPPoE connections)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid "It is possible that the concentrator will not to be found at the first attempt. This can happen occasionally on slow or loaded networks or with faulty servers. In most cases a second attempt to detect the concentrator will be successful; to retry, select <guimenuitem>Configure and start a PPPoE connection</guimenuitem> from the main menu of the installer."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid "After a concentrator is found, the user will be prompted to type the login information (the PPPoE username and password)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid "At this point the installer will use the provided information to establish the PPPoE connection. If the correct information was provided, the PPPoE connection should be configured and the installer should be able to use it to connect to the Internet and retrieve packages over it (if needed). If the login information is not correct or some error appears, the installer will stop, but the configuration can be attempted again by selecting the menu entry <guimenuitem>Configure and start a PPPoE connection</guimenuitem>."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid "The graphical version of the installer is only available for a limited number of architectures, including &arch-title;. The functionality of the graphical installer is essentially the same as that of the regular installer as it basically uses the same programs, but with a different frontend."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid "Although the functionality is identical, the graphical installer still has a few significant advantages. The main advantage is that it supports more languages, namely those that use a character set that cannot be displayed with the regular <quote>newt</quote> frontend. It also has a few usability advantages such as the option to use a mouse, and in some cases several questions can be displayed on a single screen."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid "The graphical installer is available with all CD images and with the hd-media installation method. To boot the graphical installer simply select the relevant option from the boot menu. Expert and rescue mode for the graphical installer can be selected from the <quote>Advanced options</quote> menu. The previously used boot methods <userinput>installgui</userinput>, <userinput>expertgui</userinput> and <userinput>rescuegui</userinput> can still be used from the boot prompt which is shown after selecting the <quote>Help</quote> option in the boot menu."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
 msgid "There is also a graphical installer image that can be netbooted. And there is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso\"> <para> The mini ISO image can be downloaded from a &debian; mirror as described in <xref linkend=\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is mainly useful for testing."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
 msgid "For &arch-title;, currently only an experimental <quote>mini</quote> ISO image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image can be downloaded from a &debian; mirror as described in <xref linkend=\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. </para> </footnote>. It should work on almost all PowerPC systems that have an ATI graphical card, but is unlikely to work on other systems."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid "Just as with the regular installer it is possible to add boot parameters when starting the graphical installer."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid "The graphical installer requires significantly more memory to run than the regular installer: &minimum-memory-gtk;. If insufficient memory is available, it will automatically fall back to the regular <quote>newt</quote> frontend."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid "If the amount of memory in your system is below &minimum-memory;, the graphical installer may fail to boot at all while booting the regular installer would still work. Using the regular installer is recommended for systems with little available memory."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid "As already mentioned, the graphical installer basically works the same as the regular installer and thus the rest of this manual can be used to guide you through the installation process."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid "If you prefer using the keyboard over the mouse, there are two things you need to know. To expand a collapsed list (used for example for the selection of countries within continents), you can use the <keycap>+</keycap> and <keycap>-</keycap> keys. For questions where more than one item can be selected (e.g. task selection), you first need to tab to the &BTN-CONT; button after making your selections; hitting enter will toggle a selection, not activate &BTN-CONT;."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid "If a dialog offers additional help information, a <guibutton>Help</guibutton> button will be displayed. The help information can be accessed either by activating the button or by pressing the <keycap>F1</keycap> key."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid "To switch to another console, you will also need to use the <keycap>Ctrl</keycap> key, just as with the X Window System. For example, to switch to VT2 (the first debug shell) you would use: <keycombo> <keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</keycap> </keycombo>. The graphical installer itself runs on VT5, so you can use <keycombo> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo> to switch back."
 msgstr ""
diff --git a/po/pot/using-d-i.pot b/po/pot/using-d-i.pot
index 9d52eaed2..031d2a9c3 100644
--- a/po/pot/using-d-i.pot
+++ b/po/pot/using-d-i.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -257,112 +257,112 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
-msgid "clock-setup"
+msgid "user-setup"
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:247
 #, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr ""
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
+msgid "clock-setup"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:255
+#, no-c-format
 msgid "Updates the system clock and determines whether the clock is set to UTC or not."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "Allows the user to partition disks attached to the system, create file systems on the selected partitions, and attach them to the mountpoints. Included are also interesting features like a fully automatic mode or LVM support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "Allows the user to partition disks attached to the system. A partitioning program appropriate to your computer's architecture is chosen."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "Displays a list of partitions, and creates file systems on the selected partitions according to user instructions."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "Helps the user with the configuration of the <firstterm>LVM</firstterm> (Logical Volume Manager)."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant Array of Inexpensive Disks). This Software RAID is usually superior to the cheap IDE (pseudo hardware) RAID controllers found on newer motherboards."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "Installs the most basic set of packages which would allow the computer to operate under &debian-gnu; when rebooted."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr ""
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -731,23 +731,89 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
-msgid "Partitioning and Mount Point Selection"
+msgid "Setting Up Users And Passwords"
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:902
 #, no-c-format
+msgid "Just before configuring the clock, the installer will allow you to set up the <quote>root</quote> account and/or an account for the first user. Other user accounts can be created after the installation has been completed."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid "The <emphasis>root</emphasis> account is also called the <emphasis>super-user</emphasis>; it is a login that bypasses all security protection on your system. The root account should only be used to perform system administration, and only used for as short a time as possible."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid "Any password you create should contain at least 6 characters, and should contain both upper- and lower-case characters, as well as punctuation characters. Take extra care when setting your root password, since it is such a powerful account. Avoid dictionary words or use of any personal information which could be guessed."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid "If anyone ever tells you they need your root password, be extremely wary. You should normally never give your root password out, unless you are administering a machine with more than one system administrator."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid "The system will ask you whether you wish to create an ordinary user account at this point. This account should be your main personal log-in. You should <emphasis>not</emphasis> use the root account for daily use or as your personal login."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid "Why not? Well, one reason to avoid using root's privileges is that it is very easy to do irreparable damage as root. Another reason is that you might be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; that is a program that takes advantage of your super-user powers to compromise the security of your system behind your back. Any good book on Unix system administration will cover this topic in more detail &mdash; consider reading one if it is new to you."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid "You will first be prompted for the user's full name. Then you'll be asked for a name for the user account; generally your first name or something similar will suffice and indeed will be the default. Finally, you will be prompted for a password for this account."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid "If at any point after installation you would like to create another account, use the <command>adduser</command> command."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
+msgid "Partitioning and Mount Point Selection"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:986
+#, no-c-format
 msgid "At this time, after hardware detection has been executed a final time, &d-i; should be at its full strength, customized for the user's needs and ready to do some real work. As the title of this section indicates, the main task of the next few components lies in partitioning your disks, creating filesystems, assigning mountpoints and optionally configuring closely related options like RAID, LVM or encrypted devices."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid "If you are uncomfortable with partitioning, or just want to know more details, see <xref linkend=\"partitioning\"/>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
       "If a hard disk has previously used under Solaris, the partitioner may not detect the size of the drive correctly. Creating a new partition table does not fix this issue. What does help, is to <quote>zero</quote> the first few sectors of the drive: <informalexample><screen>\n"
@@ -756,313 +822,313 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid "First you will be given the opportunity to automatically partition either an entire drive, or available free space on a drive. This is also called <quote>guided</quote> partitioning. If you do not want to autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid "The partitioner used in &d-i; is fairly versatile. It allows to create many different partitioning schemes, using various partition tables, file systems and advanced block devices."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid "Exactly which options are available depends mainly on the architecture, but also on other factors. For example, on systems with limited internal memory some options may not be available. Defaults may vary as well. The type of partition table used by default can for example be different for large capacity hard disks than for smaller hard disks. Some options can only be changed when installing at medium or low debconf priority; at higher priorities sensible defaults will be used."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid "The installer supports various forms of advanced partitioning and use of storage devices, which in many cases can be used in combination."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support for Serial ATA RAID is currently only available if enabled when the installer is booted. Further information is available on <ulink url=\"&url-d-i-sataraid;\">our Wiki</ulink>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. Support for multipath is currently only available if enabled when the installer is booted."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> <emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid "The default file system selected in most cases is ext3; for <filename>/boot</filename> partitions ext2 will be selected by default when guided partitioning is used."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid "Support for the Reiser file system is no longer available by default. When the installer is running at medium or low debconf priority it can be enabled by selecting the <classname>partman-reiserfs</classname> component. Only version 3 of the file system is supported."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid "Used on some systems to read flash memory. It is not possible to create new jffs2 partitions."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid "Existing partitions will be recognized and it is possible to assign mount points for them. It is not possible to create new qnx4 partitions."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid "Existing NTFS partitions can be resized and it is possible to assign mount points for them. It is not possible to create new NTFS partitions."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid "If you choose guided partitioning, you may have three options: to create partitions directly on the hard disk (classic method), or to create them using Logical Volume Management (LVM), or to create them using encrypted LVM<footnote> <para> The installer will encrypt the LVM volume group using a 256 bit AES key and makes use of the kernel's <quote>dm-crypt</quote> support. </para> </footnote>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid "When using LVM or encrypted LVM, the installer will create most partitions inside one big partition; the advantage of this method is that partitions inside this big partition can be resized relatively easily later. In the case of encrypted LVM the big partition will not be readable without knowing a special key phrase, thus providing extra security of your (personal) data."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid "When using encrypted LVM, the installer will also automatically erase the disk by writing random data to it. This further improves security (as it makes it impossible to tell which parts of the disk are in use and also makes sure that any traces of previous installations are erased), but may take some time depending on the size of your disk."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid "If you choose guided partitioning using LVM or encrypted LVM, some changes in the partition table will need to be written to the selected disk while LVM is being set up. These changes effectively erase all data that is currently on the selected hard disk and you will not be able to undo them later. However, the installer will ask you to confirm these changes before they are written to disk."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid "If you choose guided partitioning (either classic or using (encrypted) LVM) for a whole disk, you will first be asked to select the disk you want to use. Check that all your disks are listed and, if you have several disks, make sure you select the correct one. The order they are listed in may differ from what you are used to. The size of the disks may help to identify them."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid "Any data on the disk you select will eventually be lost, but you will always be asked to confirm any changes before they are written to the disk. If you have selected the classic method of partitioning, you will be able to undo any changes right until the end; when using (encrypted) LVM this is not possible."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid "Next, you will be able to choose from the schemes listed in the table below. All schemes have their pros and cons, some of which are discussed in <xref linkend=\"partitioning\"/>. If you are unsure, choose the first one. Bear in mind that guided partitioning needs a certain minimal amount of free space to operate with. If you don't give it at least about 1GB of space (depends on chosen scheme), guided partitioning will fail."
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid "If you choose guided partitioning using (encrypted) LVM, the installer will also create a separate <filename>/boot</filename> partition. The other partitions, including the swap partition, will be created inside the LVM partition."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid "If you choose guided partitioning for your IA-64 system, there will be an additional partition, formatted as a FAT16 bootable filesystem, for the EFI boot loader. There is also an additional menu item in the formatting menu to manually set up a partition as an EFI boot partition."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid "After selecting a scheme, the next screen will show your new partition table, including information on whether and how partitions will be formatted and where they will be mounted."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
       "The list of partitions might look like this: <informalexample><screen>\n"
@@ -1085,601 +1151,601 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid "This concludes the guided partitioning. If you are satisfied with the generated partition table, you can choose <guimenuitem>Finish partitioning and write changes to disk</guimenuitem> from the menu to implement the new partition table (as described at the end of this section). If you are not happy, you can choose to <guimenuitem>Undo changes to partitions</guimenuitem> and run guided partitioning again, or modify the proposed changes as described below for manual partitioning."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
 msgid "A similar screen to the one shown just above will be displayed if you choose manual partitioning except that your existing partition table will be shown and without the mount points. How to manually set up your partition table and the usage of partitions by your new &debian; system will be covered in the remainder of this section."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid "If you select a pristine disk which has neither partitions nor free space on it, you will be asked if a new partition table should be created (this is needed so you can create new partitions). After this, a new line entitled <quote>FREE SPACE</quote> should appear in the table under the selected disk."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid "If you select some free space, you will have the opportunity to create a new partition. You will have to answer a quick series of questions about its size, type (primary or logical), and location (beginning or end of the free space). After this, you will be presented with a detailed overview of your new partition. The main setting is <guimenuitem>Use as:</guimenuitem>, which determines if the partition will have a file system on it, or be used for swap, software RAID, LVM, an encrypted file system, or not be used at all. Other settings include mountpoint, mount options, and bootable flag; which settings are shown depends on how the partition is to be used. If you don't like the preselected defaults, feel free to change them to your liking. E.g. by selecting the option <guimenuitem>Use as:</guimenuitem>, you can choose a different filesystem for this partition, including options to use the partition for swap, software RAID, LVM, or not use it at all. Another nice feature is the ability to copy data from an existing partition onto this one. When you are satisfied with your new partition, select <guimenuitem>Done setting up the partition</guimenuitem> and you will return to <command>partman</command>'s main screen."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid "If you decide you want to change something about your partition, simply select the partition, which will bring you to the partition configuration menu. This is the same screen as is used when creating a new partition, so you can change the same settings. One thing that may not be very obvious at a first glance is that you can resize the partition by selecting the item displaying the size of the partition. Filesystems known to work are at least fat16, fat32, ext2, ext3 and swap. This menu also allows you to delete a partition."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid "Be sure to create at least two partitions: one for the <emphasis>root</emphasis> filesystem (which must be mounted as <filename>/</filename>) and one for <emphasis>swap</emphasis>. If you forget to mount the root filesystem, <command>partman</command> won't let you continue until you correct this issue."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid "If you forget to select and format an EFI boot partition, <command>partman</command> will detect this and will not let you continue until you allocate one."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid "Capabilities of <command>partman</command> can be extended with installer modules, but are dependent on your system's architecture. So if you can't see all promised goodies, check if you have loaded all required modules (e.g. <filename>partman-ext3</filename>, <filename>partman-xfs</filename>, or <filename>partman-lvm</filename>)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid "After you are satisfied with partitioning, select <guimenuitem>Finish partitioning and write changes to disk</guimenuitem> from the partitioning menu. You will be presented with a summary of changes made to the disks and asked to confirm that the filesystems should be created as requested."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid "If you have more than one harddrive<footnote><para> To be honest, you can construct an MD device even from partitions residing on single physical drive, but that won't give any benefits. </para></footnote> in your computer, you can use <command>mdcfg</command> to set up your drives for increased performance and/or better reliability of your data. The result is called <firstterm>Multidisk Device</firstterm> (or after its most famous variant <firstterm>software RAID</firstterm>)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid "MD is basically a bunch of partitions located on different disks and combined together to form a <emphasis>logical</emphasis> device. This device can then be used like an ordinary partition (i.e. in <command>partman</command> you can format it, assign a mountpoint, etc.)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid "What benefits this brings depends on the type of MD device you are creating. Currently supported are: <variablelist> <varlistentry> <term>RAID0</term><listitem><para> Is mainly aimed at performance. RAID0 splits all incoming data into <firstterm>stripes</firstterm> and distributes them equally over each disk in the array. This can increase the speed of read/write operations, but when one of the disks fails, you will lose <emphasis>everything</emphasis> (part of the information is still on the healthy disk(s), the other part <emphasis>was</emphasis> on the failed disk). </para><para> The typical use for RAID0 is a partition for video editing. </para></listitem> </varlistentry> <varlistentry> <term>RAID1</term><listitem><para> Is suitable for setups where reliability is the first concern. It consists of several (usually two) equally-sized partitions where every partition contains exactly the same data. This essentially means three things. First, if one of your disks fails, you still have the data mirrored on the remaining disks. Second, you can use only a fraction of the available capacity (more precisely, it is the size of the smallest partition in the RAID). Third, file-reads are load-balanced among the disks, which can improve performance on a server, such as a file server, that tends to be loaded with more disk reads than writes. </para><para> Optionally you can have a spare disk in the array which will take the place of the failed disk in the case of failure. </para></listitem> </varlistentry> <varlistentry> <term>RAID5</term><listitem><para> Is a good compromise between speed, reliability and data redundancy. RAID5 splits all incoming data into stripes and distributes them equally on all but one disk (similar to RAID0). Unlike RAID0, RAID5 also computes <firstterm>parity</firstterm> information, which gets written on the remaining disk. The parity disk is not static (that would be called RAID4), but is changing periodically, so the parity information is distributed equally on all disks. When one of the disks fails, the missing part of information can be computed from remaining data and its parity. RAID5 must consist of at least three active partitions. Optionally you can have a spare disk in the array which will take the place of the failed disk in the case of failure. </para><para> As you can see, RAID5 has a similar degree of reliability to RAID1 while achieving less redundancy. On the other hand, it might be a bit slower on write operations than RAID0 due to computation of parity information. </para></listitem> </varlistentry> <varlistentry> <term>RAID6</term><listitem><para> Is similar to RAID5 except that it uses two parity devices instead of one. </para><para> A RAID6 array can survive up to two disk failures. </para></listitem> </varlistentry> <varlistentry> <term>RAID10</term><listitem><para> RAID10 combines striping (as in RAID0) and mirroring (as in RAID1). It creates <replaceable>n</replaceable> copies of incoming data and distributes them across the partitions so that none of the copies of the same data are on the same device. The default value of <replaceable>n</replaceable> is 2, but it can be set to something else in expert mode. The number of partitions used must be at least <replaceable>n</replaceable>. RAID10 has different layouts for distributing the copies. The default is near copies. Near copies have all of the copies at about the same offset on all of the disks. Far copies have the copies at different offsets on the disks. Offset copies copy the stripe, not the individual copies. </para><para> RAID10 can be used to achieve reliability and redundancy without the drawback of having to calculate parity. </para></listitem> </varlistentry> </variablelist> To sum it up:"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid "Size of the smallest partition multiplied by (number of devices in RAID minus one)"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid "Size of the smallest partition multiplied by (number of devices in RAID minus two)"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid "Total of all partitions divided by the number of chunk copies (defaults to two)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid "If you want to know more about Software RAID, have a look at <ulink url=\"&url-software-raid-howto;\">Software RAID HOWTO</ulink>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid "To create an MD device, you need to have the desired partitions it should consist of marked for use in a RAID. (This is done in <command>partman</command> in the <guimenu>Partition settings</guimenu> menu where you should select <menuchoice> <guimenu>Use as:</guimenu> <guimenuitem>physical volume for RAID</guimenuitem> </menuchoice>.)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid "Make sure that the system can be booted with the partitioning scheme you are planning. In general it will be necessary to create a separate file system for <filename>/boot</filename> when using RAID for the root (<filename>/</filename>) file system. Most boot loaders <phrase arch=\"x86\">(including lilo and grub)</phrase> do support mirrored (not striped!) RAID1, so using for example RAID5 for <filename>/</filename> and RAID1 for <filename>/boot</filename> can be an option."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid "Support for MD is a relatively new addition to the installer. You may experience problems for some RAID levels and in combination with some bootloaders if you try to use MD for the root (<filename>/</filename>) file system. For experienced users, it may be possible to work around some of these problems by executing some configuration or installation steps manually from a shell."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> from the main <command>partman</command> menu. (The menu will only appear after you mark at least one partition for use as <guimenuitem>physical volume for RAID</guimenuitem>.) On the first screen of <command>mdcfg</command> simply select <guimenuitem>Create MD device</guimenuitem>. You will be presented with a list of supported types of MD devices, from which you should choose one (e.g. RAID1). What follows depends on the type of MD you selected."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid "RAID0 is simple &mdash; you will be issued with the list of available RAID partitions and your only task is to select the partitions which will form the MD."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid "RAID1 is a bit more tricky. First, you will be asked to enter the number of active devices and the number of spare devices which will form the MD. Next, you need to select from the list of available RAID partitions those that will be active and then those that will be spare. The count of selected partitions must be equal to the number provided earlier. Don't worry. If you make a mistake and select a different number of partitions, &d-i; won't let you continue until you correct the issue."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid "RAID5 has a setup procedure similar to RAID1 with the exception that you need to use at least <emphasis>three</emphasis> active partitions."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid "RAID6 also has a setup procedure similar to RAID1 except that at least <emphasis>four</emphasis> active partitions are required."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid "RAID10 again has a setup procedure similar to RAID1 except in expert mode. In expert mode, &d-i; will ask you for the layout. The layout has two parts. The first part is the layout type. It is either <literal>n</literal> (for near copies), <literal>f</literal> (for far copies), or <literal>o</literal> (for offset copies). The second part is the number of copies to make of the data. There must be at least that many active devices so that all of the copies can be distributed onto different disks."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid "It is perfectly possible to have several types of MD at once. For example, if you have three 200 GB hard drives dedicated to MD, each containing two 100 GB partitions, you can combine the first partitions on all three disks into the RAID0 (fast 300 GB video editing partition) and use the other three partitions (2 active and 1 spare) for RAID1 (quite reliable 100 GB partition for <filename>/home</filename>)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid "After you set up MD devices to your liking, you can <guimenuitem>Finish</guimenuitem> <command>mdcfg</command> to return back to the <command>partman</command> to create filesystems on your new MD devices and assign them the usual attributes like mountpoints."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid "If you are working with computers at the level of system administrator or <quote>advanced</quote> user, you have surely seen the situation where some disk partition (usually the most important one) was short on space, while some other partition was grossly underused and you had to manage this situation by moving stuff around, symlinking, etc."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid "To avoid the described situation you can use Logical Volume Manager (LVM). Simply said, with LVM you can combine your partitions (<firstterm>physical volumes</firstterm> in LVM lingo) to form a virtual disk (so called <firstterm>volume group</firstterm>), which can then be divided into virtual partitions (<firstterm>logical volumes</firstterm>). The point is that logical volumes (and of course underlying volume groups) can span across several physical disks."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid "Now when you realize you need more space for your old 160GB <filename>/home</filename> partition, you can simply add a new 300GB disk to the computer, join it with your existing volume group and then resize the logical volume which holds your <filename>/home</filename> filesystem and voila &mdash; your users have some room again on their renewed 460GB partition. This example is of course a bit oversimplified. If you haven't read it yet, you should consult the <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid "LVM setup in &d-i; is quite simple and completely supported inside <command>partman</command>. First, you have to mark the partition(s) to be used as physical volumes for LVM. This is done in the <guimenu>Partition settings</guimenu> menu where you should select <menuchoice> <guimenu>Use as:</guimenu> <guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid "When you return to the main <command>partman</command> screen, you will see a new option <guimenuitem>Configure the Logical Volume Manager</guimenuitem>. When you select that, you will first be asked to confirm pending changes to the partition table (if any) and after that the LVM configuration menu will be shown. Above the menu a summary of the LVM configuration is shown. The menu itself is context sensitive and only shows valid actions. The possible actions are:"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device structure, names and sizes of logical volumes and more"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</command> screen"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid "Use the options in that menu to first create a volume group and then create your logical volumes inside it."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid "After you return to the main <command>partman</command> screen, any created logical volumes will be displayed in the same way as ordinary partitions (and you should treat them as such)."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid "&d-i; allows you to set up encrypted partitions. Every file you write to such a partition is immediately saved to the device in encrypted form. Access to the encrypted data is granted only after entering the <firstterm>passphrase</firstterm> used when the encrypted partition was originally created. This feature is useful to protect sensitive data in case your laptop or hard drive gets stolen. The thief might get physical access to the hard drive, but without knowing the right passphrase, the data on the hard drive will look like random characters."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid "The two most important partitions to encrypt are: the home partition, where your private data resides, and the swap partition, where sensitive data might be stored temporarily during operation. Of course, nothing prevents you from encrypting any other partitions that might be of interest. For example <filename>/var</filename> where database servers, mail servers or print servers store their data, or <filename>/tmp</filename> which is used by various programs to store potentially interesting temporary files. Some people may even want to encrypt their whole system. The only exception is the <filename>/boot</filename> partition which must remain unencrypted, because currently there is no way to load the kernel from an encrypted partition."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid "Please note that the performance of encrypted partitions will be less than that of unencrypted ones because the data needs to be decrypted or encrypted for every read or write. The performance impact depends on your CPU speed, chosen cipher and a key length."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid "To use encryption, you have to create a new partition by selecting some free space in the main partitioning menu. Another option is to choose an existing partition (e.g. a regular partition, an LVM logical volume or a RAID volume). In the <guimenu>Partition settings</guimenu> menu, you need to select <guimenuitem>physical volume for encryption</guimenuitem> at the <menuchoice> <guimenu>Use as:</guimenu> </menuchoice> option. The menu will then change to include several cryptographic options for the partition."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid "&d-i; supports several encryption methods. The default method is <firstterm>dm-crypt</firstterm> (included in newer Linux kernels, able to host LVM physical volumes), the other is <firstterm>loop-AES</firstterm> (older, maintained separately from the Linux kernel tree). Unless you have compelling reasons to do otherwise, it is recommended to use the default."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid "First, let's have a look at the options available when you select <userinput>Device-mapper (dm-crypt)</userinput> as the encryption method. As always: when in doubt, use the defaults, because they have been carefully chosen with security in mind."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid "This option lets you select the encryption algorithm (<firstterm>cipher</firstterm>) which will be used to encrypt the data on the partition. &d-i; currently supports the following block ciphers: <firstterm>aes</firstterm>, <firstterm>blowfish</firstterm>, <firstterm>serpent</firstterm>, and <firstterm>twofish</firstterm>. It is beyond the scope of this document to discuss the qualities of these different algorithms, however, it might help your decision to know that in 2000, <emphasis>AES</emphasis> was chosen by the American National Institute of Standards and Technology as the standard encryption algorithm for protecting sensitive information in the 21st century."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid "Here you can specify the length of the encryption key. With a larger key size, the strength of the encryption is generally improved. On the other hand, increasing the length of the key usually has a negative impact on performance. Available key sizes vary depending on the cipher."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</firstterm> algorithm is used in cryptography to ensure that applying the cipher on the same <firstterm>clear text</firstterm> data with the same key always produces a unique <firstterm>cipher text</firstterm>. The idea is to prevent the attacker from deducing information from repeated patterns in the encrypted data."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid "From the provided alternatives, the default <userinput>cbc-essiv:sha256</userinput> is currently the least vulnerable to known attacks. Use the other alternatives only when you need to ensure compatibility with some previously installed system that is not able to use newer algorithms."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid "The encryption key will be computed<footnote> <para> Using a passphrase as the key currently means that the partition will be set up using <ulink url=\"&url-luks;\">LUKS</ulink>. </para></footnote> on the basis of a passphrase which you will be able to enter later in the process."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid "A new encryption key will be generated from random data each time you try to bring up the encrypted partition. In other words: on every shutdown the content of the partition will be lost as the key is deleted from memory. (Of course, you could try to guess the key with a brute force attack, but unless there is an unknown weakness in the cipher algorithm, it is not achievable in our lifetime.)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid "Random keys are useful for swap partitions because you do not need to bother yourself with remembering the passphrase or wiping sensitive information from the swap partition before shutting down your computer. However, it also means that you will <emphasis>not</emphasis> be able to use the <quote>suspend-to-disk</quote> functionality offered by newer Linux kernels as it will be impossible (during a subsequent boot) to recover the suspended data written to the swap partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid "Determines whether the content of this partition should be overwritten with random data before setting up the encryption. This is recommended because it might otherwise be possible for an attacker to discern which parts of the partition are in use and which are not. In addition, this will make it harder to recover any leftover data from previous installations<footnote><para> It is believed that the guys from three-letter agencies can restore the data even after several rewrites of the magnetooptical media, though. </para></footnote>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid "If you select <menuchoice> <guimenu>Encryption method:</guimenu> <guimenuitem>Loopback (loop-AES)</guimenuitem> </menuchoice>, the menu changes to provide the following options:"
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid "For loop-AES, unlike dm-crypt, the options for cipher and key size are combined, so you can select both at the same time. Please see the above sections on ciphers and key sizes for further information."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid "The encryption key will be generated from random data during the installation. Moreover this key will be encrypted with <application>GnuPG</application>, so to use it, you will need to enter the proper passphrase (you will be asked to provide one later in the process)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid "After you have selected the desired parameters for your encrypted partitions, return back to the main partitioning menu. There should now be a new menu item called <guimenu>Configure encrypted volumes</guimenu>. After you select it, you will be asked to confirm the deletion of data on partitions marked to be erased and possibly other actions such as writing a new partition table. For large partitions this might take some time."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid "Next you will be asked to enter a passphrase for partitions configured to use one. Good passphrases should be longer than 8 characters, should be a mixture of letters, numbers and other characters and should not contain common dictionary words or information easily associable with you (such as birthdates, hobbies, pet names, names of family members or relatives, etc.)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid "Before you input any passphrases, you should have made sure that your keyboard is configured correctly and generates the expected characters. If you are unsure, you can switch to the second virtual console and type some text at the prompt. This ensures that you won't be surprised later, e.g. by trying to input a passphrase using a qwerty keyboard layout when you used an azerty layout during the installation. This situation can have several causes. Maybe you switched to another keyboard layout during the installation, or the selected keyboard layout might not have been set up yet when entering the passphrase for the root file system."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid "If you selected to use methods other than a passphrase to create encryption keys, they will be generated now. Because the kernel may not have gathered a sufficient amount of entropy at this early stage of the installation, the process may take a long time. You can help speed up the process by generating entropy: e.g. by pressing random keys, or by switching to the shell on the second virtual console and generating some network and disk traffic (downloading some files, feeding big files into <filename>/dev/null</filename>, etc.). This will be repeated for each partition to be encrypted."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
       "After returning to the main partitioning menu, you will see all encrypted volumes as additional partitions which can be configured in the same way as ordinary partitions. The following example shows two different volumes. The first one is encrypted via dm-crypt, the second one via loop-AES. <informalexample><screen>\n"
@@ -1692,126 +1758,60 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</replaceable> and <replaceable>loop0</replaceable> in this case) and the mount points you assigned to each encrypted volume. You will need this information later when booting the new system. The differences between the ordinary boot process and the boot process with encryption involved will be covered later in <xref linkend=\"mount-encrypted-volumes\"/>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid "Once you are satisfied with the partitioning scheme, continue with the installation."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid "Although this stage is the least problematic, it consumes a significant fraction of the install because it downloads, verifies and unpacks the whole base system. If you have a slow computer or network connection, this could take some time."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid "During installation of the base system, package unpacking and setup messages are redirected to <userinput>tty4</userinput>. You can access this terminal by pressing <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>; get back to the main installer process with <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid "The unpack/setup messages generated during this phase are also saved in <filename>/var/log/syslog</filename>. You can check them there if the installation is performed over a serial console."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid "As part of the installation, a &arch-kernel; kernel will be installed. At the default priority, the installer will choose one for you that best matches your hardware. In lower priority modes, you will be able to choose from a list of available kernels."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid "When packages are installed using the package management system, it will by default also install packages that are recommended by those packages. Recommended packages are not strictly required for the core functionality of the selected software, but they do enhance that software and should, in the view of the package maintainers, normally be installed together with that software."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid "For technical reasons packages installed during the installation of the base system are installed without their <quote>Recommends</quote>. The rule described above only takes effect after this point in the installation process."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid "After the base system has been installed, the installer will allow you to set up the <quote>root</quote> account and/or an account for the first user. Other user accounts can be created after the installation has been completed."
-msgstr ""
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid "The <emphasis>root</emphasis> account is also called the <emphasis>super-user</emphasis>; it is a login that bypasses all security protection on your system. The root account should only be used to perform system administration, and only used for as short a time as possible."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid "Any password you create should contain at least 6 characters, and should contain both upper- and lower-case characters, as well as punctuation characters. Take extra care when setting your root password, since it is such a powerful account. Avoid dictionary words or use of any personal information which could be guessed."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid "If anyone ever tells you they need your root password, be extremely wary. You should normally never give your root password out, unless you are administering a machine with more than one system administrator."
-msgstr ""
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid "The system will ask you whether you wish to create an ordinary user account at this point. This account should be your main personal log-in. You should <emphasis>not</emphasis> use the root account for daily use or as your personal login."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid "Why not? Well, one reason to avoid using root's privileges is that it is very easy to do irreparable damage as root. Another reason is that you might be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; that is a program that takes advantage of your super-user powers to compromise the security of your system behind your back. Any good book on Unix system administration will cover this topic in more detail &mdash; consider reading one if it is new to you."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid "You will first be prompted for the user's full name. Then you'll be asked for a name for the user account; generally your first name or something similar will suffice and indeed will be the default. Finally, you will be prompted for a password for this account."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid "If at any point after installation you would like to create another account, use the <command>adduser</command> command."
-msgstr ""
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -2222,7 +2222,7 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2771
 #, no-c-format
-msgid "The criteria for selecting a partition is that it is FAT format filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices depending on what it finds from scanning all of the disks of the system including EFI partitions of other system disks and EFI diagnostic partitions. Remember, <command>elilo</command> may format the partition during the installation, erasing any previous contents!"
+msgid "The criterion for selecting a partition is that it must be a FAT format filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices depending on what it finds from scanning all of the disks of the system including EFI partitions of other system disks and EFI diagnostic partitions. Remember, <command>elilo</command> may format the partition during the installation, erasing any previous contents!"
 msgstr ""
 
 #. Tag: title
diff --git a/po/pt/administrivia.po b/po/pt/administrivia.po
index e0c49c265..b6624e2fd 100644
--- a/po/pt/administrivia.po
+++ b/po/pt/administrivia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: administrativia 24750\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-09-11 11:42+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -32,10 +32,15 @@ msgstr "Acerca deste Documento"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This manual was created for Sarge's debian-installer, based on the Woody "
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -201,9 +206,17 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Many, many &debian; users and developers contributed to this document. "
+#| "Particular note must be made of Michael Schmitz (m68k support), Frank "
+#| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
+#| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
+#| "(SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous "
+#| "edits and text. We have to thank Pascal Le Bail for useful information "
+#| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/pt/bookinfo.po b/po/pt/bookinfo.po
index 95e12178b..8257b87c3 100644
--- a/po/pt/bookinfo.po
+++ b/po/pt/bookinfo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-09-11 11:43+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -39,17 +39,28 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Este guia de instalação é baseado num manual anterior escrito para o antigo "
 "sistema de instalação de Debian (as \"boot-floppies\"), e foi actualizado "
diff --git a/po/pt/hardware.po b/po/pt/hardware.po
index 426ccf73e..6dc2374d7 100644
--- a/po/pt/hardware.po
+++ b/po/pt/hardware.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-09 15:17+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -32,8 +32,8 @@ msgid ""
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "Esta secção contém informação acerca de que hardware é necessário para se "
-"iniciar com &debian;. Irá também encontrar links para mais informações acerca "
-"do hardware suportado por GNU e &arch-kernel;."
+"iniciar com &debian;. Irá também encontrar links para mais informações "
+"acerca do hardware suportado por GNU e &arch-kernel;."
 
 #. Tag: title
 #: hardware.xml:20
@@ -57,9 +57,10 @@ msgstr ""
 "kernel Linux ou pelo kernel kFreeBSD e pelas ferramentas GNU. Por isso "
 "qualquer arquitectura ou plataforma para a qual tenha sido portado o kernel "
 "Linux ou kFreeBSD, libc, <command>gcc</command>, etc. e para a qual exista "
-"um port de &debian;, poderá correr &debian;. Para mais detalhes sobre sistemas "
-"com a arquitectura &arch-title; que tenham sido testados com &debian-gnu;, "
-"por favor, veja as páginas dos Ports em <ulink url=\"&url-ports;\"></ulink>."
+"um port de &debian;, poderá correr &debian;. Para mais detalhes sobre "
+"sistemas com a arquitectura &arch-title; que tenham sido testados com "
+"&debian-gnu;, por favor, veja as páginas dos Ports em <ulink url=\"&url-"
+"ports;\"></ulink>."
 
 #. Tag: para
 #: hardware.xml:32
@@ -560,8 +561,8 @@ msgid ""
 msgstr ""
 "Cada arquitectura ARM distinta necessita do seu próprio kernel. Devido a "
 "isso a distribuição standard &debian; apenas suporta a instalação num certo "
-"número das plataformas mais comuns. No entanto, a 'userland' do &debian; pode "
-"ser utilizada por <emphasis>qualquer</emphasis> CPU ARM."
+"número das plataformas mais comuns. No entanto, a 'userland' do &debian; "
+"pode ser utilizada por <emphasis>qualquer</emphasis> CPU ARM."
 
 #. Tag: para
 #: hardware.xml:286
@@ -573,7 +574,8 @@ msgid ""
 msgstr ""
 "A maioria dos CPUs ARM podem correr em qualquer modo endian (big ou little). "
 "No entanto actualmente a maioria das implementações dos sistemas usam o modo "
-"little-endian. &debian; actualmente suporta apenas sistemas ARM little-endian."
+"little-endian. &debian; actualmente suporta apenas sistemas ARM little-"
+"endian."
 
 #. Tag: para
 #: hardware.xml:294
@@ -602,9 +604,9 @@ msgstr ""
 "relacionados com o armazenamento de dados e processamento. &debian; "
 "actualmente suporta, a plataforma IOP32x, com os chips IOP 80219 e 32x "
 "normalmente encontrados em dispositivos 'Network Attached Storage' (NAS). "
-"&debian; suporta explicitamente dois desses dispositivos: o <ulink url=\"&url-"
-"arm-cyrius-glantank;\">GLAN Tank</ulink> da IO-Data e o <ulink url=\"&url-"
-"arm-cyrius-n2100;\">Thecus N2100</ulink>."
+"&debian; suporta explicitamente dois desses dispositivos: o <ulink url="
+"\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> da IO-Data e o <ulink url="
+"\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
 
 #. Tag: term
 #: hardware.xml:315
@@ -768,10 +770,10 @@ msgstr ""
 "além do âmbito deste manual. </para> </footnote>. (Nenhuma versão de Linux "
 "alguma vez suportou 286 ou processadores anteriores.) Todos os processadores "
 "i486 e posteriores ainda são suportados<footnote> <para> Muitos pacotes "
-"&debian; irão correr ligeiramente mais rápido em computadores modernos como um "
-"efeito positivo do fim do suporte para esses processadores antigos. O i486, "
-"introduzido em 1989, tem três opcodes (bswap, cmpxchg, e xadd) que o i386, "
-"introduzido em 1986, não tinha. Anteriormente, estes não podiam ser "
+"&debian; irão correr ligeiramente mais rápido em computadores modernos como "
+"um efeito positivo do fim do suporte para esses processadores antigos. O "
+"i486, introduzido em 1989, tem três opcodes (bswap, cmpxchg, e xadd) que o "
+"i386, introduzido em 1986, não tinha. Anteriormente, estes não podiam ser "
 "facilmente utilizados pela maioria dos pacotes &debian;; agora já podem. </"
 "para> </footnote>."
 
@@ -799,9 +801,9 @@ msgstr "I/O Bus"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "O bus do sistema é a parte da motherboard que permite que ao CPU comunicar "
 "com periféricos tais como os dispositivos de armazenamento. O seu computador "
@@ -853,9 +855,9 @@ msgid ""
 "supported."
 msgstr ""
 "Em SGI IP22, SGI Indy, Indigo 2 e Challenge S com processadores R4000, "
-"R4400, R4600 e R5000 são suportas pelo sistema de instalação &debian; em 'big "
-"endian' MIPS. Na SGI IP32, actualmente só são suportados sistemas baseados "
-"no R5000."
+"R4400, R4600 e R5000 são suportas pelo sistema de instalação &debian; em "
+"'big endian' MIPS. Na SGI IP32, actualmente só são suportados sistemas "
+"baseados no R5000."
 
 #. Tag: para
 #: hardware.xml:525
@@ -890,8 +892,8 @@ msgstr ""
 "<listitem><para> Cobalt Microserver: apenas as máquinas Cobalt baseadas em "
 "MIPS estão cobertas aqui. Isto inclui Cobalt RaQ, Qube2 e RaQ2, e o Gateway "
 "Microserver. </para></listitem> <listitem><para> MIPS Malta: esta plataforma "
-"é emulada pelo QEMU e por isso é uma boa forma de testar e correr &debian; em "
-"MIPS se não tiver o hardware. </para></listitem> </itemizedlist> A "
+"é emulada pelo QEMU e por isso é uma boa forma de testar e correr &debian; "
+"em MIPS se não tiver o hardware. </para></listitem> </itemizedlist> A "
 "informação completa acerca das maquinas mips/mipsel suportadas pode ser "
 "encontrada na <ulink url=\"&url-linux-mips;\">homepage do Linux-MIPS</"
 "ulink>. Em seguida, apenas os sistemas suportados pelo instalador &debian; "
@@ -1545,33 +1547,25 @@ msgstr "Tipos de máquina S/390 e zSeries"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
 msgstr ""
-"Informação completa acerca das máquinas S/390 e zSeries suportadas pode ser "
-"encontrada no Redbook da IBM <ulink url=\"http://www.redbooks.ibm.com/pubs/"
-"pdfs/redbooks/sg246264.pdf\"> Linux no IBM eServer zSeries e S/390: "
-"Distribuições </ulink> no capitulo 2.1 ou na <ulink url=\"http://www-128.ibm."
-"com/developerworks/openworks/linux/linux390/index.html\">Página da zSeries "
-"na developerWorks</ulink>. Resumindo, G5, Multiprise 3000, G6 e toda a "
-"zSeries são totalmente suportadas; as máquinas Multiprise 2000, G3 e G4 são "
-"suportadas com emulação de vírgula flutuante IEEE e por isso terão uma "
-"performance diminuída."
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPUs e Placas principais Suportados"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1585,13 +1579,13 @@ msgstr ""
 "incluem e qual o nível de suporte que pode ser esperado para cada uma delas."
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1605,25 +1599,25 @@ msgstr ""
 "\"> página da Wikipedia sobre SPARCstation</ulink>."
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
 "already been discontinued after earlier releases."
 msgstr ""
-"O último lançamento &debian; a suportar a sparc32 foi o Etch, mas mesmo assim "
-"apenas para sistemas sun4m. O suporte para outras sub-arquitecturas 32-bits "
-"já tinha sido descontinuado após lançamentos anteriores."
+"O último lançamento &debian; a suportar a sparc32 foi o Etch, mas mesmo "
+"assim apenas para sistemas sun4m. O suporte para outras sub-arquitecturas 32-"
+"bits já tinha sido descontinuado após lançamentos anteriores."
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1641,13 +1635,13 @@ msgstr ""
 "ou sparc64-smp em configurações UP ou SMP respectivamente."
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1661,7 +1655,7 @@ msgstr ""
 "sparc64-smp."
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1671,13 +1665,13 @@ msgstr ""
 "PRIMEPOWER não são suportados devido á falta de suporte no kernel Linux."
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "Portáteis"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1693,13 +1687,13 @@ msgstr ""
 "<ulink url=\"&url-x86-laptop;\">páginas do Linux Laptop</ulink>. "
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "Múltiplos Processadores"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1711,13 +1705,14 @@ msgid ""
 msgstr ""
 "Suporte para múltiplos processadores &mdash; também chamado de <quote>multi-"
 "processamento simétrico</quote> ou SMP &mdash; está disponível para esta "
-"arquitectura. A imagem standard de kernel de &debian; &release; foi compilada "
-"com suporte SMP. O kernel standard também é utilizável em sistemas não-SMP, "
-"mas com uma ligeira sobrecarga que irá causar uma pequena redução do "
-"desempenho. Em utilizações normais do sistema praticamente não será notado."
+"arquitectura. A imagem standard de kernel de &debian; &release; foi "
+"compilada com suporte SMP. O kernel standard também é utilizável em sistemas "
+"não-SMP, mas com uma ligeira sobrecarga que irá causar uma pequena redução "
+"do desempenho. Em utilizações normais do sistema praticamente não será "
+"notado."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1728,14 +1723,14 @@ msgid ""
 "section;</quote> section of the kernel config.</phrase>"
 msgstr ""
 "De forma a optimizar o kernel para sistemas que só utilizem 1 CPU, terá que "
-"substituir o kernel &debian; padrão. <phrase arch=\"linux-any\">Pode encontrar "
-"uma discussão de como fazer isto em <xref linkend=\"kernel-baking\"/>. Nesta "
-"altura (kernel versão &kernelversion;) a forma de desactivar o SMP é não "
-"seleccionar <quote>&smp-config-option;</quote> na secção <quote>&smp-config-"
-"section;</quote> da configuração da kernel.</phrase>"
+"substituir o kernel &debian; padrão. <phrase arch=\"linux-any\">Pode "
+"encontrar uma discussão de como fazer isto em <xref linkend=\"kernel-baking"
+"\"/>. Nesta altura (kernel versão &kernelversion;) a forma de desactivar o "
+"SMP é não seleccionar <quote>&smp-config-option;</quote> na secção "
+"<quote>&smp-config-section;</quote> da configuração da kernel.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1747,23 +1742,24 @@ msgid ""
 msgstr ""
 "O suporte para multi-processador &mdash; também chamado de <quote>multi-"
 "processamento simétrico</quote> ou SMP &mdash; está disponível para esta "
-"arquitectura. A imagem standard do kernel de &debian; &release; foi compilada "
-"com suporte para <firstterm>SMP-alternatives</firstterm>. Isto significa que "
-"o kernel irá detectar o número de processadores (ou cores de processador) e "
-"irá desactivar automaticamente SMP em sistemas com um único processador."
+"arquitectura. A imagem standard do kernel de &debian; &release; foi "
+"compilada com suporte para <firstterm>SMP-alternatives</firstterm>. Isto "
+"significa que o kernel irá detectar o número de processadores (ou cores de "
+"processador) e irá desactivar automaticamente SMP em sistemas com um único "
+"processador."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr ""
-"A versão 486 dos pacotes &debian; de imagens de kernel para &arch-title; não é "
-"compilada com suporte para SMP."
+"A versão 486 dos pacotes &debian; de imagens de kernel para &arch-title; não "
+"é compilada com suporte para SMP."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1780,7 +1776,7 @@ msgstr ""
 "simplesmente utilizar apenas o primeiro CPU."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -1798,7 +1794,7 @@ msgstr ""
 "section;</quote> da configuração da kernel.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1817,7 +1813,7 @@ msgstr ""
 "usar o primeiro CPU."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1829,7 +1825,7 @@ msgstr ""
 "um pacote de kernel apropriado."
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, no-c-format
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
@@ -1846,20 +1842,27 @@ msgstr ""
 "phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "Placas Gráficas Suportadas"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "Você deverá estar a utilizar uma placa gráfica compatível com VGA para a "
 "consola de terminal. Quase todas as placas gráficas modernas são compatíveis "
@@ -1868,29 +1871,30 @@ msgstr ""
 "utilizado durante o processo de instalação descrito neste documento. "
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "O suporte &debian; para interfaces gráficos é determinado pelo suporte "
 "existente do sistema X11 da X.Org. A maioria das placas gráficas AGP, PCI, "
-"PCIe e PCI-X sob o X.Org. Detalhes sobre barramentos gráficos, placas, monitores e "
-"dispositivos apontadores suportados podem ser encontrados em <ulink url="
-"\"&url-xorg;\"></ulink>. &debian; &release; vem com X.Org versão &x11ver;."
+"PCIe e PCI-X sob o X.Org. Detalhes sobre barramentos gráficos, placas, "
+"monitores e dispositivos apontadores suportados podem ser encontrados em "
+"<ulink url=\"&url-xorg;\"></ulink>. &debian; &release; vem com X.Org versão "
+"&x11ver;."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "O X.Org X Window System é suportado apenas em SGI Indy e em O2."
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1911,7 +1915,7 @@ msgstr ""
 "nele incluída acerca de como activar a placa."
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1939,13 +1943,13 @@ msgstr ""
 "desligando o teclado antes de arrancar o sistema."
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Hardware Para Ligação em Rede"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1961,7 +1965,7 @@ msgstr ""
 "\"i386\">Muitas placas ISA antigas também são suportadas.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1971,61 +1975,61 @@ msgstr ""
 "placas de rede da Sun:"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "A lista de dispositivos de rede suportados é:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) e ligação ESCON (real ou emulada)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet e OSA-Express Fast Ethernet (non-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express no modo QDIO, HiperSockets e Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2045,19 +2049,19 @@ msgstr ""
 "\"&url-slug-firmware;\">sitio de Firmware-Slug</ulink>."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "RDIS é suportado, mas não durante a instalação."
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Placas de Rede Sem Fios (Wireless)"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2075,7 +2079,7 @@ msgstr ""
 "instalação veja <xref linkend=\"loading-firmware\"/>."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2087,7 +2091,7 @@ msgstr ""
 "mas não são suportadas durante a instalação."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2099,7 +2103,7 @@ msgstr ""
 "mais poderosa, não poderá ser utilizado durante o processo de instalação."
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2118,7 +2122,7 @@ msgstr ""
 "(após reiniciar) e configure manualmente a rede."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2129,20 +2133,21 @@ msgid ""
 "which allows you to use a Windows driver.</phrase>"
 msgstr ""
 "Em alguns casos o controlador que necessita pode não estar disponível como "
-"um pacote &debian;. Tem então de procurar código fonte disponível na internet "
-"e compilar você mesmo o controlador. Como fazer isto está fora do âmbito "
-"deste manual. <phrase arch=\"x86\">Se não existir disponível nenhum dirver "
-"Linux, o seu último recurso é utilizar o pacote <classname>ndiswrapper</"
-"classname>, que permite utilizar um driver Windows.</phrase>"
+"um pacote &debian;. Tem então de procurar código fonte disponível na "
+"internet e compilar você mesmo o controlador. Como fazer isto está fora do "
+"âmbito deste manual. <phrase arch=\"x86\">Se não existir disponível nenhum "
+"dirver Linux, o seu último recurso é utilizar o pacote "
+"<classname>ndiswrapper</classname>, que permite utilizar um driver Windows.</"
+"phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "Problemas Conhecidos para &arch-title;"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2152,13 +2157,13 @@ msgstr ""
 "mencionar aqui."
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "Conflito entre controladores tulip e dfme"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2177,7 +2182,7 @@ msgstr ""
 "funcionar, ou funcionar mal."
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2192,7 +2197,7 @@ msgstr ""
 "em <xref linkend=\"module-blacklist\"/>."
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2210,13 +2215,13 @@ msgstr ""
 "o módulo errado pode ser novamente carregado quando o sistema reiniciar."
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2226,13 +2231,13 @@ msgstr ""
 "Sun B100 blade."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "Ecrãs Braille"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2251,13 +2256,13 @@ msgstr ""
 "classname> versão &brlttyver;."
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "Hardware Sintetizador de Voz"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2279,13 +2284,13 @@ msgstr ""
 "classname> versão &speakupver;."
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Periféricos e Outro Hardware"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2298,7 +2303,7 @@ msgstr ""
 "sistema."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2309,7 +2314,7 @@ msgstr ""
 ">)."
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2321,7 +2326,7 @@ msgstr ""
 "hardware é suportado por Linux."
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2333,7 +2338,7 @@ msgstr ""
 "num DASD ou através de rede utilizando NFS, HTTP ou FTP."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2342,13 +2347,13 @@ msgstr ""
 "A Cobalt RaQ não suporta dispositivos adicionais para a Qube tem um slot PCI."
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "Dispositivos que Necessitam de Firmware"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2367,7 +2372,7 @@ msgstr ""
 "que também necessitam de firmware."
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2385,7 +2390,7 @@ msgstr ""
 "pacote separado a partir da secção não-livre do arquivo."
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2403,13 +2408,13 @@ msgstr ""
 "<xref linkend=\"loading-firmware\"/>"
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "Comprar Hardware Especificamente para GNU/&arch-kernel; "
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2425,7 +2430,7 @@ msgstr ""
 "suportado por GNU/Linux."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2441,7 +2446,7 @@ msgstr ""
 "quote> para obter informação que o possa ajudar."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2459,13 +2464,13 @@ msgstr ""
 "Suporte comerciantes de hardware amigáveis para com &arch-kernel;."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Evitar Hardware Fechado ou Proprietário."
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2479,7 +2484,7 @@ msgstr ""
 "código fonte de &arch-kernel;."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2495,13 +2500,13 @@ msgstr ""
 "comunidade de software livre é um mercado importante."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Hardware específico para Windows "
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2528,7 +2533,7 @@ msgstr ""
 "equivalentes que ainda incluem a inteligência embebida."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2567,7 +2572,7 @@ msgstr ""
 "poder de processamento embebido do seu hardware. "
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, no-c-format
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
@@ -2585,13 +2590,13 @@ msgstr ""
 "ulink>."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "Meios de Instalação"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2602,20 +2607,20 @@ msgid ""
 "to this page once you reach that section."
 msgstr ""
 "Esta secção irá ajudá-lo a determinar que diferentes tipos de suporte pode "
-"utilizar para instalar &debian;. Por exemplo, se tiver uma drive de disquetes "
-"na sua máquina, esta pode ser utilizada para instalar &debian;. Existe um "
-"capítulo inteiro dedicado aos suportes, <xref linkend=\"install-methods\"/>, "
-"que lista as vantagens e desvantagens de cada tipo de suporte. Pode desejar "
-"voltar a esta página assim que alcançar esse capítulo."
+"utilizar para instalar &debian;. Por exemplo, se tiver uma drive de "
+"disquetes na sua máquina, esta pode ser utilizada para instalar &debian;. "
+"Existe um capítulo inteiro dedicado aos suportes, <xref linkend=\"install-"
+"methods\"/>, que lista as vantagens e desvantagens de cada tipo de suporte. "
+"Pode desejar voltar a esta página assim que alcançar esse capítulo."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "Disquetes"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2627,19 +2632,19 @@ msgstr ""
 "alta densidade (1440 kilobytes)."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "Para CHRP, o suporte de disquete está actualmente quebrado."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2653,7 +2658,7 @@ msgstr ""
 "não standard que não são nem SCSI nem IDE/ATAPI."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2673,7 +2678,7 @@ msgstr ""
 "meios; veja o <xref linkend=\"boot-installer\"/>."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2685,7 +2690,7 @@ msgstr ""
 "utilização de CD-ROMs com Linux."
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2695,13 +2700,13 @@ msgstr ""
 "FireWire que são suportados pelos drivers ohci1394 e sbp2."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "Os CD-ROMs IDE/ATAPI são suportados as todas as máquinas ARM."
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2721,13 +2726,13 @@ msgstr ""
 "firmware, a entrada <quote>System installation</quote>."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "Disco Rígido"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2739,7 +2744,7 @@ msgstr ""
 "operativo carregue o instalador para o disco rígido."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2749,13 +2754,13 @@ msgstr ""
 "entanto pode instalar a partir de uma partição SunOS (slices UFS)."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB Memory Stick"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2765,21 +2770,21 @@ msgid ""
 "This is also useful for small systems which have no room for unnecessary "
 "drives."
 msgstr ""
-"A maior parte das máquinas &debian; necessitam das drives de disquetes e/ou CD-"
-"ROM apenas para instalar o sistema ou por motivos de recuperação. Se opera "
-"alguns servidores, provavelmente já pensou em omitir essas drives e usar um "
-"memory stick USB para instalar e (quando necessário) recuperar o sistema. "
-"Isto também é útil em pequenos sistemas que não têm espaço para drives "
-"desnecessárias."
+"A maior parte das máquinas &debian; necessitam das drives de disquetes e/ou "
+"CD-ROM apenas para instalar o sistema ou por motivos de recuperação. Se "
+"opera alguns servidores, provavelmente já pensou em omitir essas drives e "
+"usar um memory stick USB para instalar e (quando necessário) recuperar o "
+"sistema. Isto também é útil em pequenos sistemas que não têm espaço para "
+"drives desnecessárias."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "Rede"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2799,7 +2804,7 @@ msgstr ""
 "também configurar o seu sistema para utilizar ISDN (RDIS) e PPP."
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2811,7 +2816,7 @@ msgstr ""
 "preferível para &arch-title;.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2821,13 +2826,13 @@ msgstr ""
 "local e montando todos os sistemas de ficheiros locais em NFS é outra opção."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x ou sistema GNU"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2844,13 +2849,13 @@ msgstr ""
 "\"linux-upgrade\"/>."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Sistemas de Armazenamento Suportados"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
@@ -2870,7 +2875,7 @@ msgstr ""
 "&debian; possa ser instalado no leque mais variado possível de hardware.  "
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
@@ -2878,14 +2883,14 @@ msgid ""
 "SATA and SCSI controllers and drives, USB, and FireWire. The supported file "
 "systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
 msgstr ""
-"Geralmente, o sistema de instalação de &debian; inclui suporte para disquetes, "
-"drives IDE (também conhecido como PATA), disquetes IDE, dispositivos IDE de "
-"porta paralela, controladores SATA e SCSI e drives, USB e FireWire. Os "
-"sistemas de ficheiros suportados incluem FAT, extensões Win-32 de FAT (VFAT) "
-"e NTFS."
+"Geralmente, o sistema de instalação de &debian; inclui suporte para "
+"disquetes, drives IDE (também conhecido como PATA), disquetes IDE, "
+"dispositivos IDE de porta paralela, controladores SATA e SCSI e drives, USB "
+"e FireWire. Os sistemas de ficheiros suportados incluem FAT, extensões "
+"Win-32 de FAT (VFAT) e NTFS."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2901,7 +2906,7 @@ msgstr ""
 "de Compatibilidade de Hardware de Linux</ulink> para mais detalhes."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2925,7 +2930,7 @@ msgstr ""
 "ulink>"
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2937,7 +2942,7 @@ msgstr ""
 "suporta disquetes em sistemas CHRP."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2949,7 +2954,7 @@ msgstr ""
 "suporta a drive de disquetes."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2959,7 +2964,7 @@ msgstr ""
 "suportado pelo sistema de arranque."
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2972,13 +2977,13 @@ msgstr ""
 "mais comum organização de disco S/390 (cdl)."
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Requisitos de Memória e de Espaço em Disco "
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2992,7 +2997,7 @@ msgstr ""
 "hardware-reqts\"/>."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -3012,6 +3017,27 @@ msgstr ""
 "footnote> ou espaço em disco disponível poderá ser possível mas apenas é "
 "aconselhada a utilizadores experientes."
 
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "Informação completa acerca das máquinas S/390 e zSeries suportadas pode "
+#~ "ser encontrada no Redbook da IBM <ulink url=\"http://www.redbooks.ibm.com/"
+#~ "pubs/pdfs/redbooks/sg246264.pdf\"> Linux no IBM eServer zSeries e S/390: "
+#~ "Distribuições </ulink> no capitulo 2.1 ou na <ulink url=\"http://www-128."
+#~ "ibm.com/developerworks/openworks/linux/linux390/index.html\">Página da "
+#~ "zSeries na developerWorks</ulink>. Resumindo, G5, Multiprise 3000, G6 e "
+#~ "toda a zSeries são totalmente suportadas; as máquinas Multiprise 2000, G3 "
+#~ "e G4 são suportadas com emulação de vírgula flutuante IEEE e por isso "
+#~ "terão uma performance diminuída."
+
 #~ msgid "DEC Alpha"
 #~ msgstr "DEC Alpha"
 
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index 04a772a82..9fabc6f97 100644
--- a/po/pt/install-methods.po
+++ b/po/pt/install-methods.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods.po\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-09 15:00+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -246,8 +246,8 @@ msgid ""
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "A Kurobox Pro necessita de um kernel e ramdisk numa partição ext2 no disco "
-"em que pretende instalar &debian;. Estas imagens podem ser obtidas a partir de "
-"&kuroboxpro-firmware-img;."
+"em que pretende instalar &debian;. Estas imagens podem ser obtidas a partir "
+"de &kuroboxpro-firmware-img;."
 
 #. Tag: title
 #: install-methods.xml:160
@@ -1371,9 +1371,9 @@ msgid ""
 "memory stick (<userinput>umount /mnt</userinput>)."
 msgstr ""
 "Se utilizou uma imagem <filename>hd-media</filename>, deve agora copiar uma "
-"imagem ISO &debian; (businesscard, netinst, ou imagem completa de CD; assegure-"
-"se que escolhe uma que caiba) para a 'pen'. Quando terminar, desmonte a "
-"'pen' USB (<userinput>umount /mnt</userinput>)."
+"imagem ISO &debian; (businesscard, netinst, ou imagem completa de CD; "
+"assegure-se que escolhe uma que caiba) para a 'pen'. Quando terminar, "
+"desmonte a 'pen' USB (<userinput>umount /mnt</userinput>)."
 
 #. Tag: title
 #: install-methods.xml:893
@@ -1553,13 +1553,16 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:996
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
+#| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
-"Copie os seguintes ficheiros de uma imagem de CD &debian; para <filename>c:\\</"
-"filename>."
+"Copie os seguintes ficheiros de uma imagem de CD &debian; para <filename>c:"
+"\\</filename>."
 
 #. Tag: para
 #: install-methods.xml:1001
@@ -2242,9 +2245,9 @@ msgid ""
 "</screen></informalexample> to adjust the range of source ports the Linux "
 "TFTP server uses."
 msgstr ""
-"Se tenciona instalar &debian; numa máquina SGI e o seu servidor é uma máquina "
-"GNU/Linux utilizando um Linux 2.4, necessitará de configurar o seguinte no "
-"servidor <informalexample><screen>\n"
+"Se tenciona instalar &debian; numa máquina SGI e o seu servidor é uma "
+"máquina GNU/Linux utilizando um Linux 2.4, necessitará de configurar o "
+"seguinte no servidor <informalexample><screen>\n"
 "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
 "</screen></informalexample> para desligar o Path MTU discovery, caso "
 "contrário o PROM da SGI não consegue fazer o download do kernel. Além disso, "
@@ -2440,8 +2443,8 @@ msgstr ""
 "É possível fazer instalações totalmente automáticas para instalar em vários "
 "computadores. Os pacotes &debian; destinados a essa função incluem "
 "<classname>fai-quickstart</classname> (que utiliza um servidor de "
-"instalação), e o próprio Instalador &debian;. Para informação detalhada veja a "
-"<ulink url=\"http://fai-project.org\">Página do FAI</ulink>."
+"instalação), e o próprio Instalador &debian;. Para informação detalhada veja "
+"a <ulink url=\"http://fai-project.org\">Página do FAI</ulink>."
 
 #. Tag: title
 #: install-methods.xml:1603
diff --git a/po/pt/preparing.po b/po/pt/preparing.po
index c0fca009b..821716c5f 100644
--- a/po/pt/preparing.po
+++ b/po/pt/preparing.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-09 13:13+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -50,9 +50,10 @@ msgid ""
 "that will require a complete re-installation of your system is very rare; "
 "perhaps mechanical failure of the hard disk would be the most common case."
 msgstr ""
-"Primeiro, apenas uma nota sobre re-instalações. Com &debian;, a circunstância "
-"em que você necessita de uma reinstalação completa do seu sistema é muito "
-"rara; talvez por falha mecânica do disco rígido na maior parte dos casos."
+"Primeiro, apenas uma nota sobre re-instalações. Com &debian;, a "
+"circunstância em que você necessita de uma reinstalação completa do seu "
+"sistema é muito rara; talvez por falha mecânica do disco rígido na maior "
+"parte dos casos."
 
 #. Tag: para
 #: preparing.xml:27
@@ -466,21 +467,18 @@ msgstr "&arch-title; Referências de Hardware"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Instruções de instalação e controladores de dispositivos (DASD, XPRAM, "
-"Consola, tape, z90 crypto, chandev, rede) para Linux em &arch-title; "
-"utilizando o kernel 2.4."
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Controladores de Dispositivos e Comandos de Instalação"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -490,13 +488,13 @@ msgstr ""
 "&arch-title; hardware."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux para &arch-title;"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
@@ -508,19 +506,19 @@ msgstr ""
 "instalação básica são os mesmos para todas as distribuições de &arch-title;."
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux para IBM eServer zSeries e &arch-title;: Distribuições"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Encontrar Fontes de Informação acerca de Hardware"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -532,19 +530,19 @@ msgstr ""
 "o seu hardware antes da instalação."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "Informação sobre o hardware pode ser reunida a partir de:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "Os manuais que vêm com cada peça de hardware."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -556,19 +554,19 @@ msgstr ""
 "manual para a combinação. Muitas vezes, é a tecla <keycap>Delete</keycap>."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "As caixas para cada peça de hardware."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "A janela de Sistema no Painel de Controlo do Windows."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -580,7 +578,7 @@ msgstr ""
 "da RAM e memória do disco rígido."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -591,179 +589,179 @@ msgstr ""
 "rede e o correio electrónico."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Informação Necessária Sobre Hardware para uma Instalação"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "Hardware"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "Informação Que Pode Necessitar"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "Discos Rígidos"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "Quantos possui."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "A sua ordem no sistema."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "IDE (também conhecido como PATA), SATA ou SCSI."
 
 # index.docbook:445, index.docbook:497
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "Espaço livre disponível."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "Partições."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "Partições onde outros sistemas operativos estão instalados."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "Monitor"
 
 # index.docbook:453, index.docbook:473, index.docbook:479, index.docbook:485
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "Modelo e Fabricante."
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "Resoluções suportadas."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Taxa de refrescamento horizontal."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Taxa de refrescamento vertical."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Profundidade da cor (número de cores) suportada."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "Tamanho do ecrã."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "Rato"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Tipo: série, PS/2, ou USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "Porta."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "Fabricante."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "Número de botões."
 
 # index.docbook:472, index.docbook:500
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "Rede"
 
 # index.docbook:475, index.docbook:501
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "Tipo de adaptador."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "Impressora"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Resoluções de impressão suportadas."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "Placa de Vídeo"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "Vídeo RAM disponível."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -773,37 +771,37 @@ msgstr ""
 "com as capacidades do seu monitor)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "Número do dispositivo(s)."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "Números de dispositivo."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "Número relativo do adaptador para placas OSA."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Compatibilidade de Hardware"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -817,7 +815,7 @@ msgstr ""
 "como alguns sistemas operativos."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -827,7 +825,7 @@ msgstr ""
 "precisa de uma versão do Windows para funcionar."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -842,7 +840,7 @@ msgstr ""
 "rapidamente obsoletos."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -853,20 +851,20 @@ msgstr ""
 "para Windows."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "Pode-se verificar a compatibilidade de hardware fazendo:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr ""
 "Verificar as páginas web dos fabricantes acerca de novos controladores."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -877,7 +875,7 @@ msgstr ""
 "configurações de outras mais conhecidas."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -887,19 +885,19 @@ msgstr ""
 "páginas web dedicadas à sua arquitectura."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "Procurar na Internet pela experiência de outros utilizadores."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "Configurações de rede"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -911,31 +909,31 @@ msgstr ""
 "deve perguntar ao administrador da rede do sistema por esta informação."
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "O seu hostname (você poderá ser decidir à sua maneira)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "O seu nome de domínio."
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "O endereço IP do seu computador."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "A máscara de rede para utilizar na sua rede."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -945,7 +943,7 @@ msgstr ""
 "encaminhado, se a sua rede <emphasis>tiver</emphasis> uma gateway."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -955,7 +953,7 @@ msgstr ""
 "Name Service)."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -969,31 +967,31 @@ msgstr ""
 "seu computador durante o processo de instalação."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Se utiliza uma rede wireless, então deverá também identificar:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "ESSID da sua rede wireless."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "Chave de segurança WEP (Se aplicável)."
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Reunir os Requisitos Mínimos de Hardware"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -1005,7 +1003,7 @@ msgstr ""
 "deseja."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -1017,14 +1015,14 @@ msgstr ""
 "utilizadores arriscam-se a sair frustrados se ignorarem estas sugestões."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "Um Pentium 4, 1GHz é o mínimo recomendado para um sistema desktop."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
@@ -1032,98 +1030,104 @@ msgstr ""
 "desktop."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Requisitos Mínimos de Sistema Recomendados"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "Tipo de Instalação"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (mínimo)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (recomendado)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "Disco Rígido"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "Sem desktop"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 megabytes"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 megabytes"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 gigabyte"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "Com Desktop"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 megabytes"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 megabytes"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 gigabytes"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "Os verdadeiros requisitos mínimos de memória sem muito inferiores aos "
 "números listados nesta tabela. Dependendo da arquitectura, é possível "
-"instalar &debian; com tão pouco como 20MB (para s390) até 60MB (para "
-"amd64). O mesmo se passa para os requisitos de espaço em disco, "
-"especialmente se escolher quais as aplicações a instalar. para informação "
-"adicional de requisitos de espaço em disco veja <xref linkend=\"tasksel-size-"
-"list\"/>."
+"instalar &debian; com tão pouco como 20MB (para s390) até 60MB (para amd64). "
+"O mesmo se passa para os requisitos de espaço em disco, especialmente se "
+"escolher quais as aplicações a instalar. para informação adicional de "
+"requisitos de espaço em disco veja <xref linkend=\"tasksel-size-list\"/>."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1140,7 +1144,7 @@ msgstr ""
 "<classname>wmaker</classname>, mas há outros que podem ser escolhidos."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1152,7 +1156,7 @@ msgstr ""
 "ser utilizado o servidor."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1165,7 +1169,7 @@ msgstr ""
 "ficheiros e dados."
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1190,13 +1194,13 @@ msgstr ""
 "desktop gráfico."
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Pré-Particionamento para sistemas Multi-Boot"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1210,7 +1214,7 @@ msgstr ""
 "num quarto não afecta qualquer outro quarto."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1222,30 +1226,31 @@ msgstr ""
 "máquina significa LPAR ou VM guest."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, no-c-format
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "Se você já possui um sistema operativo no seu sistema <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> e quiser colocar &debian; no mesmo disco, vai necessitar de "
-"reparticionar o disco. &debian; necessita das suas próprias partições no disco "
-"rígido. Não pode ser instalado em partições Windows ou MacOS. Pode ser "
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> e quiser colocar &debian; no mesmo disco, vai necessitar "
+"de reparticionar o disco. &debian; necessita das suas próprias partições no "
+"disco rígido. Não pode ser instalado em partições Windows ou MacOS. Pode ser "
 "possível partilhar algumas partições com outros sistemas Unix, mas isso não "
 "é coberto aqui. No mínimo necessita de uma partição dedicada para a raiz de "
 "&debian;."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, no-c-format
 msgid ""
 "You can find information about your current partition setup by using a "
@@ -1264,7 +1269,7 @@ msgstr ""
 "as partições actuais sem efectuar alterações."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1280,13 +1285,13 @@ msgstr ""
 "mudar uma parede, ou arrisca-se a destruí-la."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: escrever acerca de discos HP-UX?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
@@ -1300,7 +1305,7 @@ msgstr ""
 "particionamento incluído no instalador pode lidar facilmente com essa tarefa."
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1328,7 +1333,7 @@ msgstr ""
 "os CDs ou tapes originais de instalação."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
@@ -1341,13 +1346,13 @@ msgstr ""
 "Se a sua máquina já tem múltiplas partições, e pode ser disponibilizado "
 "espaço livre suficiente apagando e substituindo uma ou mais dessas, desse "
 "modo pode também esperar e utilizar o programa de particionamento do "
-"instalador de &debian;. Você deve na mesma continuar a ler o material abaixo, "
-"porque podem ocorrer circunstâncias especiais tal como a ordem das partições "
-"existentes dentro do mapa de partições, que o obriguem a particionar antes "
-"de instalar."
+"instalador de &debian;. Você deve na mesma continuar a ler o material "
+"abaixo, porque podem ocorrer circunstâncias especiais tal como a ordem das "
+"partições existentes dentro do mapa de partições, que o obriguem a "
+"particionar antes de instalar."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1360,7 +1365,7 @@ msgstr ""
 "ficheiros."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
@@ -1382,7 +1387,7 @@ msgstr ""
 "do sistema operativo nativo com que deseja ficar."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
 msgid ""
 "If you are going to install more than one operating system on the same "
@@ -1393,12 +1398,12 @@ msgid ""
 msgstr ""
 "Se vai instalar mais do que um sistema operativo na mesma máquina, Você deve "
 "instalar todos os outros sistemas operativos antes de proceder com a "
-"instalação de &debian;. As instalações de Windows e de outros SO podem tirar a "
-"possibilidade de iniciar &debian;, ou encorajá-lo a reformatar as partições "
-"não-nativas."
+"instalação de &debian;. As instalações de Windows e de outros SO podem tirar "
+"a possibilidade de iniciar &debian;, ou encorajá-lo a reformatar as "
+"partições não-nativas."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1408,7 +1413,7 @@ msgstr ""
 "sistema operativo nativo poupa-lhe trabalho."
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, no-c-format
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
@@ -1431,7 +1436,7 @@ msgstr ""
 "substituí-la por partições de &arch-parttype;."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
@@ -1443,13 +1448,13 @@ msgstr ""
 "operativo nativo e &debian;, você necessita de:"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Salvaguardar tudo no computador."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1463,7 +1468,7 @@ msgstr ""
 "forçar que o CD se torne o sistema activo de MacOS.</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1474,13 +1479,13 @@ msgstr ""
 "para &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "Instalar o sistema operativo nativo na sua nova partição."
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
@@ -1490,20 +1495,21 @@ msgstr ""
 "fazer o download dos ficheiros de arranque do instalador de &debian;."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
-"Arrancar com o instalador de &debian; para continuar a instalação de &debian;."
+"Arrancar com o instalador de &debian; para continuar a instalação de "
+"&debian;."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Particionar a partir de DOS ou Windows"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
@@ -1518,7 +1524,7 @@ msgstr ""
 "melhor."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1540,39 +1546,39 @@ msgstr ""
 "existentes."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr ""
 "Reparticionamento Sem Perdas Quando Inicia a Partir de DOS, Win-32 ou OS/2"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "Uma das instalações mais comuns é num sistema que já contém o DOS (incluindo "
-"Windows 3.1), Win32 (tal como o Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7), ou OS/2, "
-"e é desejado colocar &debian; no mesmo disco sem destruir o sistema anterior. "
-"Note que o instalador suporta redimensionamento dos sistemas de ficheiros "
-"FAT e NTFS tal como os que são utilizados pelo DOS e Windows. Simplesmente "
-"inicie o instalador e quando chegar à etapa do particionamento, escolha a "
-"opção para particionamento <menuchoice> <guimenuitem>Manual</guimenuitem> </"
-"menuchoice>, escolha a partição a redimensionar, e especifique o seu novo "
-"tamanho. Assim na maioria dos casos não é necessário utilizar o método "
-"descrito abaixo."
+"Windows 3.1), Win32 (tal como o Windows 95, 98, Me, NT, 2000, XP, 2003, "
+"Vista, 7), ou OS/2, e é desejado colocar &debian; no mesmo disco sem "
+"destruir o sistema anterior. Note que o instalador suporta redimensionamento "
+"dos sistemas de ficheiros FAT e NTFS tal como os que são utilizados pelo DOS "
+"e Windows. Simplesmente inicie o instalador e quando chegar à etapa do "
+"particionamento, escolha a opção para particionamento <menuchoice> "
+"<guimenuitem>Manual</guimenuitem> </menuchoice>, escolha a partição a "
+"redimensionar, e especifique o seu novo tamanho. Assim na maioria dos casos "
+"não é necessário utilizar o método descrito abaixo."
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
@@ -1585,12 +1591,12 @@ msgstr ""
 "Antes de ir mais longe, você deve ter decidido como vai dividir o disco. O "
 "método nesta secção apenas vai dividir a partição em duas partes. Uma vai "
 "conter o SO original, e a outra será utilizada para &debian;. Durante a "
-"instalação de &debian;, ser-lhe-á dada a oportunidade para utilizar a parte do "
-"disco para &debian; como achar melhor, i.e., como swap ou como um sistema de "
-"ficheiros."
+"instalação de &debian;, ser-lhe-á dada a oportunidade para utilizar a parte "
+"do disco para &debian; como achar melhor, i.e., como swap ou como um sistema "
+"de ficheiros."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1608,19 +1614,28 @@ msgstr ""
 "tirado da partição."
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
-msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+#: preparing.xml:983
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The first thing needed is a copy of <command>fips</command> which is "
+#| "available in the <filename>tools/</filename> directory on your nearest "
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
+#| "filename> to a bootable floppy. A bootable floppy can be created using "
+#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
+#| "command> comes with very good documentation which you may want to read. "
+#| "You will definitely need to read the documentation if you use a disk "
+#| "compression driver or a disk manager. Create the disk and read the "
+#| "documentation <emphasis>before</emphasis> you defragment the disk."
+msgid ""
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "A primeira coisa necessária é uma cópia de <command>fips</command> que está "
 "disponível no directório <filename>tools/</filename> no seu mirror &debian; "
@@ -1634,7 +1649,7 @@ msgstr ""
 "emphasis> de desfragmentar o disco."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1655,7 +1670,7 @@ msgstr ""
 "Windows 95 e superiores."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1668,7 +1683,7 @@ msgstr ""
 "instruções."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1678,13 +1693,13 @@ msgstr ""
 "<command>fips</command> pode não o ajudar."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Particionar para DOS"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1701,7 +1716,7 @@ msgstr ""
 "DOS e em Windows."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1715,19 +1730,19 @@ msgstr ""
 "executando o seguinte comando a partir de &debian;:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Particionar em SunOS"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
@@ -1745,13 +1760,13 @@ msgstr ""
 "partições EXT2 (Linux), UFS (SunOS), romfs ou iso9660 (CDROM)."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Particionar a partir de Linux ou outro SO"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1775,7 +1790,7 @@ msgstr ""
 "muito provavelmente terá problemas com a geometria do disco."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1789,13 +1804,13 @@ msgstr ""
 "localização; veja <xref linkend=\"partitioning\"/>."
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "Particionar com MacOS/OSX"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1811,7 +1826,7 @@ msgstr ""
 "application>."
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1824,7 +1839,7 @@ msgstr ""
 "&debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1851,7 +1866,7 @@ msgstr ""
 "acessíveis quer a partir de OS 9 ou de OS X."
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1869,13 +1884,13 @@ msgstr ""
 "e MS-DOS FAT são suportadas por ambos MacOS e Linux."
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Pré-Instalação do Hardware e Configuração do Sistema Operativo"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1887,21 +1902,22 @@ msgid ""
 "also highlighted."
 msgstr ""
 "Esta secção vai levá-lo através da preparação do hardware da pré-instalação, "
-"se existir alguma, que necessite fazer antes de instalar &debian;. Normalmente "
-"isto envolve verificar e possivelmente alterar definições no firmware para o "
-"seu sistema. O <quote>firmware</quote> é o software mais importante "
-"utilizado pelo hardware; é o mais crítico invocado pelo processo de arranque "
-"(depois de o ligar). Também são sublinhados alguns casos conhecidos de "
-"hardware que afectam a estabilidade de &debian-gnu; no seu sistema."
+"se existir alguma, que necessite fazer antes de instalar &debian;. "
+"Normalmente isto envolve verificar e possivelmente alterar definições no "
+"firmware para o seu sistema. O <quote>firmware</quote> é o software mais "
+"importante utilizado pelo hardware; é o mais crítico invocado pelo processo "
+"de arranque (depois de o ligar). Também são sublinhados alguns casos "
+"conhecidos de hardware que afectam a estabilidade de &debian-gnu; no seu "
+"sistema."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Invocar o Menu de Configuração da BIOS"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
@@ -1919,7 +1935,7 @@ msgstr ""
 "levar a bloqueios intermitentes ou a não poder instalar &debian;."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1933,25 +1949,25 @@ msgstr ""
 "quote>) depende de quem escreveu o software da BIOS:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "tecla <keycap>Delete</keycap> durante o POST (Power On Self Test)"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1961,25 +1977,25 @@ msgstr ""
 "keycombo>, ou <keycap>Delete</keycap> durante o POST"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "tecla <keycap>Esc</keycap> key durante o POST"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -1991,13 +2007,13 @@ msgstr ""
 "keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2009,7 +2025,7 @@ msgstr ""
 "keycap> </keycombo> ou <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2019,7 +2035,7 @@ msgstr ""
 "<ulink url=\"&url-invoking-bios-info;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2036,13 +2052,13 @@ msgstr ""
 
 # index.docbook:1522, index.docbook:1865
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Selecção de Dispositivo Para Arranque"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
@@ -2064,7 +2080,7 @@ msgstr ""
 "instalar &debian;."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2077,7 +2093,7 @@ msgstr ""
 "controlador SCSI."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2093,7 +2109,7 @@ msgstr ""
 "<quote>USB-ZIP</quote> para que arranque a partir do dispositivo USB."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2105,13 +2121,13 @@ msgstr ""
 "de modo a reiniciar a sua máquina a partir do disco rígido."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Alterar a Ordem de Arranque para Computadores Com IDE"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2124,7 +2140,7 @@ msgstr ""
 "teclas exacta."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2135,19 +2151,19 @@ msgstr ""
 "lista drives."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "Entradas comuns em máquinas IDE são C, A, cdrom ou A, C, cdrom."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C é o disco rígido, e A a drive de disquetes."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2159,7 +2175,7 @@ msgstr ""
 "Down</keycap> permitem percorrer as escolhas possíveis."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2169,13 +2185,13 @@ msgstr ""
 "alterações no seu computador."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Alterar a Ordem de Arranque em Computadores com SCSI"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
@@ -2184,7 +2200,7 @@ msgstr ""
 "utilitário de configuração SCSI."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2195,7 +2211,7 @@ msgstr ""
 "computador."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2207,13 +2223,13 @@ msgstr ""
 "a documentação do seu hardware para saber a combinação de teclas exacta."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Encontrar o utilitário para alterar a ordem de arranque."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2222,7 +2238,7 @@ msgstr ""
 "primeiro na lista."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2233,19 +2249,19 @@ msgstr ""
 "<keycap>F10</keycap>."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Miscelânea de Definições na BIOS"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "Definições de CD-ROM"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2259,13 +2275,13 @@ msgstr ""
 "<userinput>seek failed</userinput>, este pode ser o seu problema."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Memória Estendida vs. Expandida"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2279,13 +2295,13 @@ msgstr ""
 "de memória estendida e não pode utilizar memória expandida."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Protecção de Vírus"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2311,13 +2327,13 @@ msgstr ""
 "após o gestor de arranque ter sido configurado. </para> </footnote>."
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Shadow RAM"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2343,13 +2359,13 @@ msgstr ""
 "&arch-kernel; a dispositivos de hardware."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Memory Hole"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2361,7 +2377,7 @@ msgstr ""
 "você tiver tanta memória como isso."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2382,13 +2398,13 @@ msgstr ""
 "essa definição e sem essa não."
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Advanced Power Management"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2404,13 +2420,13 @@ msgstr ""
 "fazer um trabalho melhor na gestão de energia do que a BIOS."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Invocar OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2426,7 +2442,7 @@ msgstr ""
 "documentação do hardware que veio com o a sua máquina."
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2444,7 +2460,7 @@ msgstr ""
 "\"&url-netbsd-powerpc-faq;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2469,7 +2485,7 @@ msgstr ""
 "noutro computador, ligado à parta do modem."
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2492,13 +2508,13 @@ msgstr ""
 "nvram."
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Invocar o OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2514,7 +2530,7 @@ msgstr ""
 "máquina, tais como diagnósticos e scripts simples."
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2535,7 +2551,7 @@ msgstr ""
 "carregue na tecla <keycap>n</keycap> para obter a nova linha de comandos."
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2550,7 +2566,7 @@ msgstr ""
 "programa diferente."
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2571,7 +2587,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2614,7 +2630,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2645,19 +2661,19 @@ msgstr ""
 "</screen></informalexample> e em Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Configuração da BIOS"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2681,7 +2697,7 @@ msgstr ""
 "linhas em vez de baseada em caracteres."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2702,7 +2718,7 @@ msgstr ""
 "para si."
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2728,13 +2744,13 @@ msgstr ""
 "percorrer as etapas de instalação específicas de &debian;."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Instalações Nativas e por LPAR"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2750,13 +2766,13 @@ msgstr ""
 "Distributions</ulink> Redbook acerca de como definir uma LPAR para Linux."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Instalação como um VM guest"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2772,13 +2788,21 @@ msgstr ""
 "Distributions</ulink> Redbook em como definir um VM guest para correr Linux."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "Você necessita copiar todos os ficheiros a partir do subdirectório "
 "<filename>generic</filename> para o seu disco CMS. Assegure-se que transfere "
@@ -2786,13 +2810,13 @@ msgstr ""
 "modo binário com um registo de tamanho fixo de 80 caracteres."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Preparar um servidor de instalação"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2807,7 +2831,7 @@ msgstr ""
 "FTP."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2822,25 +2846,25 @@ msgstr ""
 "directórios."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: mais informação necessária &mdash; de um Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Assuntos de Hardware Para Estar Atento"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Suporte USB da BIOS e teclados"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2861,13 +2885,13 @@ msgstr ""
 "keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Visibilidade do ecrã em OldWorld Powermacs"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2889,6 +2913,17 @@ msgstr ""
 "utilizar 256 cores em vez de <quote>thousands</quote> ou <quote>millions</"
 "quote>."
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Instruções de instalação e controladores de dispositivos (DASD, XPRAM, "
+#~ "Consola, tape, z90 crypto, chandev, rede) para Linux em &arch-title; "
+#~ "utilizando o kernel 2.4."
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Controladores de Dispositivos e Comandos de Instalação"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha FAQ"
 
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index fdf59f89e..37a2e218b 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-09 15:55+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1080,8 +1080,8 @@ msgstr ""
 "valores específicos para a sua rede, tais como o mirror &debian; a utilizar. "
 "Desta forma as instalações na sua rede irão sempre obter uma boa escolha de "
 "mirror, mas o resto da instalação pode ser feita interactivamente. Utilizar "
-"o preseed de DHCP para automatizar totalmente as instalações de &debian; deve "
-"ser feito com cuidado."
+"o preseed de DHCP para automatizar totalmente as instalações de &debian; "
+"deve ser feito com cuidado."
 
 #. Tag: title
 #: preseed.xml:571
@@ -2011,13 +2011,17 @@ msgstr "Particionamento utilizando RAID"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
 msgstr ""
 "Também pode utilizar preseeding para configurar partições em arrays RAID por "
 "software. Os níveis RAID suportados são 0, 1 e 5, 6 e 10, criar 'degraded "
@@ -2026,7 +2030,26 @@ msgstr ""
 "no array; veja <xref linkend=\"preseed-bootloader\"/>."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgstr ""
+"Também pode utilizar preseeding para configurar partições em arrays RAID por "
+"software. Os níveis RAID suportados são 0, 1 e 5, 6 e 10, criar 'degraded "
+"arrays' e especificar dispositivos de reserva. Se está a utilizar RAID 1, "
+"pode fazer preseed ao grub para instalar em todos os dispositivos utilizados "
+"no array; veja <xref linkend=\"preseed-bootloader\"/>."
+
+#. Tag: para
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2042,7 +2065,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2147,13 +2170,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Controlar como são montadas as partições"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2172,7 +2195,7 @@ msgstr ""
 "qualquer sistema de ficheiros sem a etiqueta será montado utilizando um UUID."
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2182,7 +2205,7 @@ msgstr ""
 "continuar a utilizar os seus nomes tradicionais em vez de UUIDs."
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2199,7 +2222,7 @@ msgstr ""
 "aleatório."
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2215,13 +2238,13 @@ msgstr ""
 "# d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "Instalação do sistema base"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2232,7 +2255,7 @@ msgstr ""
 "instalação. As únicas perguntas colocadas referem-se à instalação do kernel."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2263,13 +2286,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "Configuração de contas"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2281,7 +2304,7 @@ msgstr ""
 "texto simples ou <emphasis>hashes</emphasis> MD5."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2297,7 +2320,7 @@ msgstr ""
 "segurança já que o acesso a hashes MD5 permite ataques \"à bruta\"."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2356,7 +2379,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2376,7 +2399,7 @@ msgstr ""
 "autenticação SSH ou <command>sudo</command>)."
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
@@ -2385,19 +2408,19 @@ msgstr ""
 "palavra-passe:"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "Configuração do Apt"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2411,7 +2434,7 @@ msgstr ""
 "acrescentar outros repositórios (locais)."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2471,13 +2494,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "Selecção de pacotes"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2487,73 +2510,73 @@ msgstr ""
 "tarefas disponíveis neste momento incluem:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2565,7 +2588,7 @@ msgstr ""
 "inclusão da tarefa <userinput>standard</userinput>."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2581,7 +2604,7 @@ msgstr ""
 "linha de comandos do kernel."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2619,14 +2642,62 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Instalação do gestor de arranque"
 
 #. Tag: screen
-#: preseed.xml:1084
-#, no-c-format
+#: preseed.xml:1087
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
+#| "# instead, uncomment this:\n"
+#| "#d-i grub-installer/skip boolean true\n"
+#| "# To also skip installing lilo, and install no bootloader, uncomment "
+#| "this\n"
+#| "# too:\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
+#| "\n"
+#| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
+#| "the\n"
+#| "# default. If you need GRUB Legacy for some particular reason, then\n"
+#| "# uncomment this:\n"
+#| "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
+#| "\n"
+#| "# This is fairly safe to set, it makes grub install automatically to the "
+#| "MBR\n"
+#| "# if no other operating system is detected on the machine.\n"
+#| "d-i grub-installer/only_debian boolean true\n"
+#| "\n"
+#| "# This one makes grub-installer install to the MBR if it also finds some "
+#| "other\n"
+#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
+#| "d-i grub-installer/with_other_os boolean true\n"
+#| "\n"
+#| "# Alternatively, if you want to install to a location other than the "
+#| "mbr,\n"
+#| "# uncomment and edit these lines:\n"
+#| "#d-i grub-installer/only_debian boolean false\n"
+#| "#d-i grub-installer/with_other_os boolean false\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
+#| "# To install grub to multiple disks:\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+#| "\n"
+#| "# Optional password for grub, either in clear text\n"
+#| "#d-i grub-installer/password password r00tme\n"
+#| "#d-i grub-installer/password-again password r00tme\n"
+#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
+#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
+#| "\n"
+#| "# Use the following option to add additional boot parameters for the\n"
+#| "# installed system (if supported by the bootloader installer).\n"
+#| "# Note: options passed to the installer will be added automatically.\n"
+#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
 "you want lilo installed\n"
@@ -2661,6 +2732,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2717,7 +2790,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2729,13 +2802,13 @@ msgstr ""
 "comando do exemplo em <xref linkend=\"preseed-account\"/>."
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "A terminar a instalação"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2778,13 +2851,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Preseed de outros pacotes"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2804,19 +2877,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "Opções avançadas"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Executar comandos personalizados durante a instalação"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2827,7 +2900,7 @@ msgstr ""
 "da instalação."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2878,13 +2951,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "Utilizar o preseed para alterar valores por omissão"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2910,7 +2983,7 @@ msgstr ""
 "ser útil para testar ou depurar o seu ficheiro de pré-configuração."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2924,7 +2997,7 @@ msgstr ""
 "rodapé para <xref linkend=\"preseed-bootparms\"/>."
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2947,13 +3020,13 @@ msgstr ""
 "mostradas durante a instalação e não para parâmetros <quote>internos</quote>."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Carregamento em série dos ficheiros de pré-configuração"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2970,7 +3043,7 @@ msgstr ""
 "ficheiros."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -3023,7 +3096,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po
index e23c35eef..5578f17d2 100644
--- a/po/pt/random-bits.po
+++ b/po/pt/random-bits.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-09 12:56+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -829,8 +829,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "Servidor de DNS"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -845,13 +873,13 @@ msgstr ""
 "download e instalação."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Instalar &debian-gnu; a partir de um sistema Unix/Linux"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -874,7 +902,7 @@ msgstr ""
 "chroot &debian;."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -891,7 +919,7 @@ msgstr ""
 "tipos de arranque."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -905,21 +933,21 @@ msgid ""
 msgstr ""
 "Como isto é principalmente um procedimento manual, você deve ter em conta "
 "que tem de fazer muita da configuração básica do próprio sistema, a qual "
-"requer mais conhecimentos de &debian; e de &arch-kernel; em geral do que fazer "
-"uma instalação normal. Não pode esperar que este procedimento resulte num "
-"sistema idêntico ao criado a partir de uma instalação normal. Deve também "
-"ter em mente que este procedimento apenas dá os passos básicos para instalar "
-"um sistema. Poderão ser necessários passos adicionais de instalação/"
+"requer mais conhecimentos de &debian; e de &arch-kernel; em geral do que "
+"fazer uma instalação normal. Não pode esperar que este procedimento resulte "
+"num sistema idêntico ao criado a partir de uma instalação normal. Deve "
+"também ter em mente que este procedimento apenas dá os passos básicos para "
+"instalar um sistema. Poderão ser necessários passos adicionais de instalação/"
 "configuração."
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "Começar"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -935,7 +963,7 @@ msgstr ""
 "se tencionar instalar ambientes de desktop como o GNOME ou o KDE)."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -954,7 +982,7 @@ msgstr ""
 "ext2, omita <userinput>-j</userinput>."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -978,7 +1006,7 @@ msgstr ""
 "estritamente arbitrário, é referenciado posteriormente mais abaixo."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -988,7 +1016,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -1000,13 +1028,13 @@ msgstr ""
 "directórios antes de proceder para a próxima etapa."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Instalar <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -1031,7 +1059,7 @@ msgstr ""
 "<command>debootstrap</command>."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -1058,7 +1086,7 @@ msgstr ""
 "instalar os ficheiros."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1070,13 +1098,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Corra <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -1093,7 +1121,7 @@ msgstr ""
 "mirror/list\"></ulink>."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1105,7 +1133,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1125,7 +1153,7 @@ msgstr ""
 "<userinput>s390</userinput>, ou <userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1135,13 +1163,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Configurar o Sistema Base"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1150,27 +1178,27 @@ msgid ""
 "</screen></informalexample> After chrooting you may need to set the terminal "
 "definition to be compatible with the &debian; base system, for example:"
 msgstr ""
-"Agora tem um verdadeiro sistema &debian;, embora um pouco leve, no disco. Faça "
-"<command>chroot</command> para lá: <informalexample><screen>\n"
+"Agora tem um verdadeiro sistema &debian;, embora um pouco leve, no disco. "
+"Faça <command>chroot</command> para lá: <informalexample><screen>\n"
 "# LANG=C chroot /mnt/debinst /bin/bash\n"
 "</screen></informalexample> Após fazer chroot pode querer configurar a "
 "definição do terminal para ser compatível com o sistema base &debian;, por "
 "exemplo:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "Criar ficheiros de dispositivos"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1191,13 +1219,13 @@ msgstr ""
 "sistema."
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "Algumas das opções disponíveis são:"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr ""
@@ -1205,7 +1233,7 @@ msgstr ""
 "utilizando"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1215,7 +1243,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1224,7 +1252,7 @@ msgstr ""
 "<command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1236,13 +1264,13 @@ msgstr ""
 "ficheiros de dispositivos, por isso esta opção deve ser utilizada com cuidado"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Partições a Montar"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1317,13 +1345,13 @@ msgstr ""
 "de continuar:"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1334,19 +1362,19 @@ msgstr ""
 "não-vazio. Se isto falhar, você pode montar o proc fora da chroot:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Configurar o Fuso Horário"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1359,7 +1387,7 @@ msgstr ""
 "ou hora local. O seguinte comando permite-lhe escolher o seu fuso horário."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1369,13 +1397,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "Configurar a Rede"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1500,13 +1528,13 @@ msgstr ""
 "associada com um nome de interface (eth0, eth1, etc.) que você espera."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Configurar o Apt"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1533,13 +1561,13 @@ msgstr ""
 "update</userinput> depois de ter feito alterações á lista de fontes."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Configurar os Locales e o Teclado"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1558,7 +1586,7 @@ msgstr ""
 "</screen></informalexample> Para configurar o seu teclado (se necessário):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1568,7 +1596,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1578,13 +1606,13 @@ msgstr ""
 "configurado após o próximo reboot."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Instalar um Kernel"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1595,13 +1623,13 @@ msgstr ""
 "disponíveis com:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
@@ -1609,7 +1637,7 @@ msgstr ""
 "pacote."
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1619,13 +1647,13 @@ msgstr ""
 "replaceable>"
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Configurar o Boot Loader"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1640,7 +1668,7 @@ msgstr ""
 "&debian; para o fazer."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1664,7 +1692,7 @@ msgstr ""
 "<filename>lilo.conf</filename> relativo ao sistema de onde o chama)</phrase>."
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1687,7 +1715,7 @@ msgstr ""
 "criar um <filename>/boot/grub/menu.lst</filename> são e funcional."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1699,13 +1727,13 @@ msgstr ""
 "<command>grub</command>, mas esses estão fora do âmbito deste apêndice."
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Aqui está um <filename>/etc/lilo.conf</filename> simples como exemplo:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1727,7 +1755,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1746,7 +1774,7 @@ msgstr ""
 "você o chamar)."
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1776,13 +1804,13 @@ msgstr ""
 "<userinput>ide0:</userinput> em vez de <userinput>hd:</userinput>."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Últimos toques"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1802,7 +1830,7 @@ msgstr ""
 "<command>aptitude</command> para instalar pacotes individualmente."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1814,19 +1842,19 @@ msgstr ""
 "disco ao correr:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "Instalar &debian-gnu; a partir de uma linha IP Paralela (PLIP)"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1841,7 +1869,7 @@ msgstr ""
 "estar ligado a uma rede que tenha um mirror &debian; (e.g. à Internet)."
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1857,7 +1885,7 @@ msgstr ""
 "livres dentro do seu espaço de endereçamento de rede)."
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1868,7 +1896,7 @@ msgstr ""
 "após reiniciar para o sistema instalado (veja <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1882,13 +1910,13 @@ msgstr ""
 "literal>."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "Requisitos"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1898,14 +1926,14 @@ msgstr ""
 "&debian;."
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
 "Media de instalação do sistema; veja <xref linkend=\"installation-media\"/>."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1915,7 +1943,7 @@ msgstr ""
 "irá funcionar como gateway."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1927,13 +1955,13 @@ msgstr ""
 "\">PLIP-Install-HOWTO</ulink>."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "Configurando a fonte"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1943,7 +1971,7 @@ msgstr ""
 "fonte como uma gateway para a Internet utilizando ppp0."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1985,13 +2013,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "Instalar o alvo"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2018,13 +2046,13 @@ msgstr ""
 "durante as várias etapas da instalação."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Carregar os componentes do instalador a partir de CD"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2034,13 +2062,13 @@ msgstr ""
 "disponibilizar os drivers PLIP para o sistema de instalação."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Detectar hardware de rede"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2055,7 +2083,7 @@ msgstr ""
 "irá mostrar esta lista."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2067,19 +2095,19 @@ msgstr ""
 "partir de uma lista. Escolha o módulo <userinput>plip</userinput>."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "Configurar a rede"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configurar a rede com DHCP: Não"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2087,7 +2115,7 @@ msgstr ""
 "Endereço IP: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2097,7 +2125,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2107,13 +2135,13 @@ msgstr ""
 "utilizados na fonte (veja <filename>/etc/resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "Instalar &debian-gnu; utilizando PPP over Ethernet (PPPoE)"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2129,7 +2157,7 @@ msgstr ""
 "Esta secção explica como."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2140,7 +2168,7 @@ msgstr ""
 "após reiniciar para o sistema instalado (veja <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2154,7 +2182,7 @@ msgstr ""
 "netboot<phrase condition=\"supports-floppy-boot\"> ou disquete</phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2164,7 +2192,7 @@ msgstr ""
 "seguintes passos explicam as diferenças."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2181,7 +2209,7 @@ msgstr ""
 "automaticamente executado."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2201,7 +2229,7 @@ msgstr ""
 "prompt de arranque. </para> </footnote>)."
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2211,7 +2239,7 @@ msgstr ""
 "quais placas Ethernet presentes no sistema."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2223,7 +2251,7 @@ msgstr ""
 "concentrador PPPoE (um tipo de servidor que lida com ligações PPPoE)."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2240,7 +2268,7 @@ msgstr ""
 "guimenuitem>."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2251,7 +2279,7 @@ msgstr ""
 "chave)."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2272,13 +2300,13 @@ msgstr ""
 "uma ligação PPPoE</guimenuitem>."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "O Instalador Gráfico"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2292,7 +2320,7 @@ msgstr ""
 "que oferece basicamente os mesmo programas, mas com um frontend diferente."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2310,7 +2338,7 @@ msgstr ""
 "casos várias perguntas podem ser mostradas num único ecrã."
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2333,7 +2361,7 @@ msgstr ""
 "opção <quote>Help</quote> no menu de arranque."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2345,12 +2373,13 @@ msgid ""
 msgstr ""
 "Existe também uma imagem 'netboot'. E existe uma <quote>mini</quote> imagem "
 "ISO especial <footnote id=\"gtk-miniiso\"> <para> Pode ser feito o download "
-"da mini imagem ISO a partir de um mirror &debian; tal como é descrito em <xref "
-"linkend=\"downloading-files\"/>. Procure por <filename>netboot/gtk/mini.iso</"
-"filename>. </para> </footnote>, que é útil principalmente para testes."
+"da mini imagem ISO a partir de um mirror &debian; tal como é descrito em "
+"<xref linkend=\"downloading-files\"/>. Procure por <filename>netboot/gtk/"
+"mini.iso</filename>. </para> </footnote>, que é útil principalmente para "
+"testes."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2369,7 +2398,7 @@ msgstr ""
 "funcione noutros sistemas."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2379,7 +2408,7 @@ msgstr ""
 "iniciar o instalador gráfico."
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2393,7 +2422,7 @@ msgstr ""
 "usual <quote>newt</quote>."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2407,13 +2436,13 @@ msgstr ""
 "sistemas com pouca memória."
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "Utilizar o instalador gráfico"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2425,7 +2454,7 @@ msgstr ""
 "utilizado para o guiar através do processo de instalação."
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2445,7 +2474,7 @@ msgstr ""
 "irá mudar uma escolha, e não activar o &BTN-CONT;."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2457,7 +2486,7 @@ msgstr ""
 "activar o botão ou carregando na tecla <keycap>F1</keycap>."
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po
index 6239ef421..59a1a5b6b 100644
--- a/po/pt/using-d-i.po
+++ b/po/pt/using-d-i.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-09 14:25+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -418,8 +418,8 @@ msgid ""
 "Presents a list of &debian; archive mirrors. The user may choose the source "
 "of his installation packages."
 msgstr ""
-"Mostra uma lista de mirrors de ficheiros &debian;. O utilizador pode escolher "
-"a source dos seus pacotes de instalação."
+"Mostra uma lista de mirrors de ficheiros &debian;. O utilizador pode "
+"escolher a source dos seus pacotes de instalação."
 
 #. Tag: term
 #: using-d-i.xml:219
@@ -474,11 +474,23 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "Define a password de root, e adiciona um utilizador que não o root."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -488,26 +500,26 @@ msgstr ""
 "UTC ou não."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr ""
 "Escolhe o fuso horário, baseado na localização escolhida anteriormente."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
@@ -522,13 +534,13 @@ msgstr ""
 "particionamento preferida em &debian;."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -538,13 +550,13 @@ msgstr ""
 "programa apropriado de acordo com a arquitectura do seu computador."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -554,13 +566,13 @@ msgstr ""
 "seleccionadas de acordo com as instruções do utilizador."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -570,13 +582,13 @@ msgstr ""
 "(Logical Volume Manager)."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -589,13 +601,13 @@ msgstr ""
 "encontram em motherboards novas."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -605,18 +617,6 @@ msgstr ""
 "sob &debian-gnu; quando for reiniciado."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "Define a password de root, e adiciona um utilizador que não o root."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -769,8 +769,8 @@ msgid ""
 "selecting your preferred language, keyboard layout or desired network "
 "mirror)."
 msgstr ""
-"Vamos assumir que o Instalador &debian; arrancou e que você está perante o seu "
-"ecrã inicial. Nesta altura, as capacidades do &d-i; ainda são bastante "
+"Vamos assumir que o Instalador &debian; arrancou e que você está perante o "
+"seu ecrã inicial. Nesta altura, as capacidades do &d-i; ainda são bastante "
 "limitadas. Não sabe muito acerca do seu hardware, idioma preferido, ou que "
 "tarefa deve executar. Não se preocupe. O &d-i; é bastante inteligente, pode "
 "automaticamente identificar o seu hardware, localizar o resto dos seus "
@@ -973,9 +973,9 @@ msgid ""
 msgstr ""
 "A zona geográfica escolhida (na maioria dos casos um país) será utilizada "
 "mais tarde no processo de instalação para escolher o fuso horário correcto e "
-"um 'mirror' &debian; apropriado para esse país. O idioma e o país em conjunto "
-"irão ajudar a determinar o locale predefinido para o seu sistema e escolher "
-"a disposição correcta do teclado."
+"um 'mirror' &debian; apropriado para esse país. O idioma e o país em "
+"conjunto irão ajudar a determinar o locale predefinido para o seu sistema e "
+"escolher a disposição correcta do teclado."
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -1117,15 +1117,16 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Os teclados são normalmente construídos de acordo com os caracteres "
 "utilizados no seu idioma. Escolha um layout de acordo com o teclado que está "
 "a utilizar, ou se o seu teclado não estiver representado escolha um próximo. "
 "Quando a instalação do sistema terminar, você poderá escolher um layout de "
 "teclado a partir de uma gama maior de escolhas (como root execute "
-"<command>dpkg-reconfigure keyboard-configuration</command> após ter completado a instalação)."
+"<command>dpkg-reconfigure keyboard-configuration</command> após ter "
+"completado a instalação)."
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1461,11 +1462,152 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Definir Utilizadores E Palavras Passe"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"Depois do sistema base ter sido instalado, o instalador irá permitir-lhe "
+"definir a conta <quote>root</quote> e/ou uma conta para o primeiro "
+"utilizador. Outras contas de utilizador podem ser criadas após a instalação "
+"estar terminada."
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "Definir a Palavra Passe de Root"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"A conta de root é também chamada de <emphasis>super-user</emphasis>; é um "
+"acesso ao sistema que ultrapassa qualquer protecção de segurança no seu "
+"sistema. A conta de root deve apenas ser utilizada para efectuar "
+"administração do sistema, e apenas por um período que deve ser o mais curto "
+"possível."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"Qualquer password que criar deve conter pelo menos 6 caracteres, e deve "
+"conter tanto caracteres maiúsculos como minúsculos, bem como caracteres de "
+"pontuação. Tenha especial atenção quando definir a sua password de root, uma "
+"vez que é uma conta com muitos poderes. Evite o uso de palavras que constem "
+"em dicionários ou que contenham alguma informação pessoal que facilmente "
+"possa ser adivinhada."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Se alguma vez alguém lhe disser que precisa da sua password de root, esteja "
+"atento. Normalmente não deve dar a sua password de root, a não ser que "
+"esteja a administrar uma máquina com mais do que um administrador de "
+"sistemas."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Criar um Utilizador Normal"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"Nesta fase o sistema perguntar-lhe-á se pretende criar uma conta para um "
+"utilizador normal. Esta conta deverá ser a sua conta principal de acesso. "
+"<emphasis>Não</emphasis> Deve usar a conta de root para o uso diário ou para "
+"seu o acesso pessoal."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"Porque não? Bem, uma das razões para evitar usar os privilégios de root é "
+"porque é muito fácil fazer estragos irreparáveis como root. Outra razão é "
+"porque poderá ser levado a correr um programa <emphasis>Cavalo de Tróia</"
+"emphasis> &mdash; que é um programa que tira vantagens de poderes de um "
+"super-utilizador para comprometer a segurança do seu sistema sem dar por "
+"isso. Qualquer bom livro de administração de sistemas Unix cobrirá este "
+"tópico com mais detalhe &mdash; considere a leitura de um se este assunto "
+"for novo para si."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Ser-lhe-á perguntado inicialmente o nome completo do utilizador. "
+"Seguidamente ser-lhe-á perguntado por um nome para a conta de utilizador; "
+"geralmente o seu primeiro nome ou algo similar será suficiente e será esse o "
+"valor por defeito. Finalmente, ser-lhe-á perguntado a password para esta "
+"conta."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Se em qualquer ponto depois da instalação pretender criar outra conta, "
+"utilize o comando <command>adduser</command>."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Particionar e Escolher os Pontos de Montagem"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1484,7 +1626,7 @@ msgstr ""
 "tais como RAID, LVM e dispositivos encriptados."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1494,7 +1636,7 @@ msgstr ""
 "mais detalhes, veja o <xref linkend=\"partitioning\"/>."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1516,7 +1658,7 @@ msgstr ""
 "disco inacessíveis."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1531,13 +1673,13 @@ msgstr ""
 "partir do menu."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "Opções de particionamento suportadas"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1549,7 +1691,7 @@ msgstr ""
 "particionamento, sistemas de ficheiros e dispositivos de blocos avançados."
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1570,7 +1712,7 @@ msgstr ""
 "razoáveis."
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1581,31 +1723,31 @@ msgstr ""
 "utilizados em conjunto."
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "Gestão de Volumes Lógicos (LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "RAID por software"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "São suportados os níveis de RAID 0, 1, 4, 5, 6 e 10."
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "Encriptação"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1614,7 +1756,7 @@ msgstr ""
 "classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1628,13 +1770,13 @@ msgstr ""
 "<ulink url=\"&url-d-i-sataraid;\">nosso Wiki</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>Multipath</emphasis> (experimental)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1646,13 +1788,13 @@ msgstr ""
 "activado quando o instalador arrancar."
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "São suportados os seguintes sistemas de ficheiros."
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1664,7 +1806,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1676,19 +1818,19 @@ msgstr ""
 "ext2 quando for utilizado o particionamento assistido."
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>jfs</emphasis> (não disponível em todas as arquitecturas)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>xfs</emphasis> (não disponível em todas as arquitecturas)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
@@ -1697,7 +1839,7 @@ msgstr ""
 "arquitecturas)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1711,13 +1853,13 @@ msgstr ""
 "reiserfs</classname>. Apenas é suportada a versão 3 do sistema de ficheiros."
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1727,13 +1869,13 @@ msgstr ""
 "novas partições jffs2."
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1743,19 +1885,19 @@ msgstr ""
 "de montagem. Não é possível criar novas partições qnx4."
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (apenas-leitura)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1765,13 +1907,13 @@ msgstr ""
 "lhes pontos de montagem. Não é possível criar novas partições NTFS."
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "Particionamento Guiado"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1789,7 +1931,7 @@ msgstr ""
 "crypt</quote> do kernel </para> </footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1798,7 +1940,7 @@ msgstr ""
 "arquitecturas."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1815,7 +1957,7 @@ msgstr ""
 "seus dados pessoais."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1832,7 +1974,7 @@ msgstr ""
 "tamanho do seu disco."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1850,7 +1992,7 @@ msgstr ""
 "para confirmar estas alterações antes de serem escritas no disco."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1868,7 +2010,7 @@ msgstr ""
 "discos pode ajudar a identificá-los."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1884,7 +2026,7 @@ msgstr ""
 "(encriptado) isto não é possível."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1902,73 +2044,73 @@ msgstr ""
 "espaço (depende do esquema escolhido) o particionamento guiado irá falhar."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Esquema de criação das partições"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Espaço mínimo"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Partições criadas"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Todos os ficheiros numa partição"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Partição /home separada"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Partições /home, /usr, /var e /tmp separadas"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1978,7 +2120,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1992,7 +2134,7 @@ msgstr ""
 "dentro da partição LVM."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -2007,7 +2149,7 @@ msgstr ""
 "partição de arranque EFI."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -2019,7 +2161,7 @@ msgstr ""
 "partições formatadas e onde serão montadas."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2070,7 +2212,7 @@ msgstr ""
 "alcançada utilizando o particionamento manual."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2091,13 +2233,13 @@ msgstr ""
 "propostas como descritas abaixo para o particionamento manual."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "Particionamento Manual"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
@@ -2113,7 +2255,7 @@ msgstr ""
 "&debian; será tema do resto desta secção."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2128,7 +2270,7 @@ msgstr ""
 "debaixo do disco seleccionado."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2170,7 +2312,7 @@ msgstr ""
 "<command>partman</command>."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2192,7 +2334,7 @@ msgstr ""
 "ext3 e swap. Este menu permite-lhe ainda apagar uma partição."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2208,7 +2350,7 @@ msgstr ""
 "permitirá continuar até que corrija esta situação."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2220,7 +2362,7 @@ msgstr ""
 "continuar até que aloque uma."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2236,7 +2378,7 @@ msgstr ""
 "xfs</filename>, ou <filename>partman-lvm</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2251,13 +2393,13 @@ msgstr ""
 "os sistemas de ficheiros sejam criados conforme foram pedidos."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Configurar Dispositivos Multidisk (Software RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2278,7 +2420,7 @@ msgstr ""
 "<firstterm>software RAID</firstterm>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2293,7 +2435,7 @@ msgstr ""
 "atribuir um ponto de montagem, etc.)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2405,55 +2547,55 @@ msgstr ""
 "variablelist> Para resumir:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Dispositivos Mínimos"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Dispositivo Sobresselente"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "Sobrevive a falhas de disco?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Espaço Disponível"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>não</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
@@ -2461,43 +2603,43 @@ msgstr ""
 "no RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "opcional"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>sim</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Dimensão da partição RAID mais pequena"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2507,19 +2649,19 @@ msgstr ""
 "no RAID menos um)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2529,13 +2671,13 @@ msgstr ""
 "no RAID menos dois)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2545,7 +2687,7 @@ msgstr ""
 "definido para dois)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2555,7 +2697,7 @@ msgstr ""
 "<ulink url=\"&url-software-raid-howto;\">Software RAID HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2571,7 +2713,7 @@ msgstr ""
 "guimenuitem> </menuchoice>.)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2592,7 +2734,7 @@ msgstr ""
 "<filename>/boot</filename>."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2610,7 +2752,7 @@ msgstr ""
 "instalação manualmente a partir de uma shell."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2633,7 +2775,7 @@ msgstr ""
 "que seleccionar."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2645,7 +2787,7 @@ msgstr ""
 "formaram o MD."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2666,7 +2808,7 @@ msgstr ""
 "até que corrija o problema."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2677,7 +2819,7 @@ msgstr ""
 "partições activas."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2688,7 +2830,7 @@ msgstr ""
 "partições activas."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2708,7 +2850,7 @@ msgstr ""
 "que todas as cópias possam ser distribuídas em discos diferentes."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2726,7 +2868,7 @@ msgstr ""
 "muito fiável de 100 GB para <filename>/home</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2741,13 +2883,13 @@ msgstr ""
 "habituais."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "A configurar o Logical Volume Manager (LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2764,7 +2906,7 @@ msgstr ""
 "lado para o outro, fazer links simbólicos, etc."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2784,7 +2926,7 @@ msgstr ""
 "podem ser fisicamente espalhadas por vários discos."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2805,7 +2947,7 @@ msgstr ""
 "<ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2822,7 +2964,7 @@ msgstr ""
 "guimenuitem> </menuchoice>."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2842,7 +2984,7 @@ msgstr ""
 "contexto e apenas mostra acções válidas. As acções possíveis são:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2852,43 +2994,43 @@ msgstr ""
 "estrutura do dispositivo LVM, nome e tamanhos dos volumes lógicos e mais."
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Criar grupo de volumes"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Criar volume lógico"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Apagar grupo de volumes"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Apagar volume lógico"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Estender grupo de volumes"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Reduzir grupo de volumes"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2898,7 +3040,7 @@ msgstr ""
 "<command>partman</command>"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2908,7 +3050,7 @@ msgstr ""
 "depois criar os seus volumes lógicos dentro."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2920,13 +3062,13 @@ msgstr ""
 "deverá tratá-las como tal)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Configurar Volumes Encriptados"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2949,7 +3091,7 @@ msgstr ""
 "caracteres aleatórios."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2977,7 +3119,7 @@ msgstr ""
 "carregar o kernel a partir de uma partição encriptada."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2992,7 +3134,7 @@ msgstr ""
 "chave."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -3013,7 +3155,7 @@ msgstr ""
 "partição."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -3030,7 +3172,7 @@ msgstr ""
 "escolha por omissão."
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -3044,13 +3186,13 @@ msgstr ""
 "foram cuidadosamente escolhidos com a segurança em mente."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Encriptação: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3076,13 +3218,13 @@ msgstr ""
 "século XXI."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Comprimento da chave: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -3096,13 +3238,13 @@ msgstr ""
 "desempenho. Os comprimentos disponíveis das chaves variam consoante a cifra."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "Algoritmo IV: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3120,7 +3262,7 @@ msgstr ""
 "repetidos nos dados encriptados."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3135,25 +3277,25 @@ msgstr ""
 "seja capaz de utilizar algoritmos mais recentes."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Chave de encriptação: <userinput>Frase-chave</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Pode escolher aqui o tipo de chave de encriptação para esta partição."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Frase-chave"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3167,13 +3309,13 @@ msgstr ""
 "frase-chave na qual poderá introduzir no processo, mais à frente."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Chave aleatória"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3191,7 +3333,7 @@ msgstr ""
 "cifragem, isto não é alcançável durante a nossa vida.)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3211,13 +3353,13 @@ msgstr ""
 "escritos para a partição de swap."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Apagar dados: <userinput>sim</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3238,7 +3380,7 @@ msgstr ""
 "dados mesmo após várias escritas na media magneto-óptica. </para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3250,13 +3392,13 @@ msgstr ""
 "para disponibilizar as seguintes opções:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Encriptação: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3269,26 +3411,26 @@ msgstr ""
 "cifras e comprimentos de chave."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Chave de encriptação: <userinput>Keyfile (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr ""
 "Pode seleccionar aqui o tipo de chave de encriptação para esta partição."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Keyfile (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3302,19 +3444,19 @@ msgstr ""
 "chave apropriada (ser-lhe-á pedido para indicar uma, adiante no processo)."
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "Por favor veja a secção acerca de chaves aleatórias, acima."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "Por favor veja acima a secção acerca de apagar dados."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3333,7 +3475,7 @@ msgstr ""
 "pode demorar algum tempo."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3350,7 +3492,7 @@ msgstr ""
 "de animais de estimação, nomes de familiares, etc.)."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3375,7 +3517,7 @@ msgstr ""
 "chave para o sistema de ficheiros raiz."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3398,7 +3540,7 @@ msgstr ""
 "cada partição a ser encriptada."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3432,7 +3574,7 @@ msgstr ""
 "valores por omissão não lhe servirem."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3451,7 +3593,7 @@ msgstr ""
 "encrypted-volumes\"/>."
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3461,13 +3603,13 @@ msgstr ""
 "instalação."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "Instalar o Sistema Base"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3480,7 +3622,7 @@ msgstr ""
 "computador ou uma ligação de rede lenta, isto poderá demorar algum tempo."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3497,7 +3639,7 @@ msgstr ""
 "keycap><keycap>F1</keycap></keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3509,7 +3651,7 @@ msgstr ""
 "instalação foi feita através de uma consola série."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3523,7 +3665,7 @@ msgstr ""
 "a partir de uma lista de kernels disponíveis."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3541,7 +3683,7 @@ msgstr ""
 "instalados em conjunto com esse software."
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3554,142 +3696,6 @@ msgstr ""
 "descrita acima apenas tem efeito após este ponto do processo de instalação."
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "Definir Utilizadores E Palavras Passe"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"Depois do sistema base ter sido instalado, o instalador irá permitir-lhe "
-"definir a conta <quote>root</quote> e/ou uma conta para o primeiro "
-"utilizador. Outras contas de utilizador podem ser criadas após a instalação "
-"estar terminada."
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "Definir a Palavra Passe de Root"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"A conta de root é também chamada de <emphasis>super-user</emphasis>; é um "
-"acesso ao sistema que ultrapassa qualquer protecção de segurança no seu "
-"sistema. A conta de root deve apenas ser utilizada para efectuar "
-"administração do sistema, e apenas por um período que deve ser o mais curto "
-"possível."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"Qualquer password que criar deve conter pelo menos 6 caracteres, e deve "
-"conter tanto caracteres maiúsculos como minúsculos, bem como caracteres de "
-"pontuação. Tenha especial atenção quando definir a sua password de root, uma "
-"vez que é uma conta com muitos poderes. Evite o uso de palavras que constem "
-"em dicionários ou que contenham alguma informação pessoal que facilmente "
-"possa ser adivinhada."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Se alguma vez alguém lhe disser que precisa da sua password de root, esteja "
-"atento. Normalmente não deve dar a sua password de root, a não ser que "
-"esteja a administrar uma máquina com mais do que um administrador de "
-"sistemas."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "Criar um Utilizador Normal"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"Nesta fase o sistema perguntar-lhe-á se pretende criar uma conta para um "
-"utilizador normal. Esta conta deverá ser a sua conta principal de acesso. "
-"<emphasis>Não</emphasis> Deve usar a conta de root para o uso diário ou para "
-"seu o acesso pessoal."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"Porque não? Bem, uma das razões para evitar usar os privilégios de root é "
-"porque é muito fácil fazer estragos irreparáveis como root. Outra razão é "
-"porque poderá ser levado a correr um programa <emphasis>Cavalo de Tróia</"
-"emphasis> &mdash; que é um programa que tira vantagens de poderes de um "
-"super-utilizador para comprometer a segurança do seu sistema sem dar por "
-"isso. Qualquer bom livro de administração de sistemas Unix cobrirá este "
-"tópico com mais detalhe &mdash; considere a leitura de um se este assunto "
-"for novo para si."
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Ser-lhe-á perguntado inicialmente o nome completo do utilizador. "
-"Seguidamente ser-lhe-á perguntado por um nome para a conta de utilizador; "
-"geralmente o seu primeiro nome ou algo similar será suficiente e será esse o "
-"valor por defeito. Finalmente, ser-lhe-á perguntado a password para esta "
-"conta."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Se em qualquer ponto depois da instalação pretender criar outra conta, "
-"utilize o comando <command>adduser</command>."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4613,14 +4619,21 @@ msgstr "Escolha a partição correcta!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "O critério para escolher a partição é o do sistema de ficheiros formatado em "
 "FAT com a flag <emphasis>boot</emphasis> activa. O &d-i; pode mostrar várias "
diff --git a/po/ro/bookinfo.po b/po/ro/bookinfo.po
index cf9728d82..d927d1a44 100644
--- a/po/ro/bookinfo.po
+++ b/po/ro/bookinfo.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2006-08-20 13:15+0300\n"
 "Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -42,17 +42,28 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This installation guide is based on an earlier manual written for the old "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
+#| "&architecture;, the manual has not been fully updated and fact checked "
+#| "for the new installer. There may remain parts of the manual that are "
+#| "incomplete or outdated or that still document the boot-floppies "
+#| "installer. A newer version of this manual, possibly better documenting "
+#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
+#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
+#| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Acest ghid de instalare este bazat pe un manual anterior scris pentru "
 "vechiul sistem de instalare Debian (<quote>boot-floppies</quote>), şi a fost "
diff --git a/po/ro/using-d-i.po b/po/ro/using-d-i.po
index 329723c1c..8adabad60 100644
--- a/po/ro/using-d-i.po
+++ b/po/ro/using-d-i.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2006-11-25 02:25+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -39,9 +39,9 @@ msgid ""
 "given priorities, and the priority of questions to be asked is set when the "
 "installer is started."
 msgstr ""
-"Programul de instalare al &debian; este format dintr-o colecție de componente "
-"cu scop specific în procesul de instalare , la fiecare dintre pașii "
-"acestuia. Fiecare componentă își efectuează propria sarcină, punând "
+"Programul de instalare al &debian; este format dintr-o colecție de "
+"componente cu scop specific în procesul de instalare , la fiecare dintre "
+"pașii acestuia. Fiecare componentă își efectuează propria sarcină, punând "
 "necesarul întrebări utilizatorului pentru a-și putea îndeplini sarcina. "
 "Aceste întrebări au priorități și pragul priorității întrebărilor care sunt "
 "puse utilizatorului este stabilit la pornirea programului de instalare."
@@ -483,11 +483,23 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "configuratorul pentru utilizator - user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "Pregătește parola „de root”, și adaugă un utilizator obișnuit."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "configuratorul ceasului - clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -497,25 +509,25 @@ msgstr ""
 "conform cu UTC sau nu."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "configuratorul fusului orar - tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "Selectează fusul orar, bazat pe locația selectată anterior."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "managerul de partiții - partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
@@ -530,13 +542,13 @@ msgstr ""
 "preferată în &debian;."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partiționatorul - partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -547,13 +559,13 @@ msgstr ""
 "dumneavoastră."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "configuratorul de partiții - partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -563,13 +575,13 @@ msgstr ""
 "selectate, conform cu instrucțiunile utilizatorului."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "configuratorul LVM - lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -579,13 +591,13 @@ msgstr ""
 "volume logice)."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "configuratorul md - mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -598,13 +610,13 @@ msgstr ""
 "găsite pe plăcile de bază mai noi."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "instalatorul bazei - base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -614,18 +626,6 @@ msgstr ""
 "opereze în &debian-gnu; după ce va fi repornit."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "configuratorul pentru utilizator - user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "Pregătește parola „de root”, și adaugă un utilizator obișnuit."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -730,7 +730,8 @@ msgid ""
 msgstr ""
 "Oferă utilizatorului o metodă să salva informații pe o dischetă, în rețea, "
 "pe disc sau alt mediu când se întâlnesc probleme, pentru a raporta corect, "
-"mai târziu, către dezvoltatorii &debian; probleme ale programului de instalare."
+"mai târziu, către dezvoltatorii &debian; probleme ale programului de "
+"instalare."
 
 #. Tag: title
 #: using-d-i.xml:399
@@ -1119,15 +1120,16 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Tastaturile sunt adesea proiectate după caracterele utilizate într-o limbă. "
 "Selectați un aranjament care este conform cu tastatura folosită, sau "
 "selectați ceva apropiat, dacă aranjamentul de tastatură dorit nu este "
 "reprezentat. Odată instalat sistemul, veți putea să selectați un aranjament "
-"de tastatură dintr-o gamă mai largă de opțiuni (rulați <command>dpkg-reconfigure keyboard-configuration</"
-"command> ca root după ce ați terminat instalarea)."
+"de tastatură dintr-o gamă mai largă de opțiuni (rulați <command>dpkg-"
+"reconfigure keyboard-configuration</command> ca root după ce ați terminat "
+"instalarea)."
 
 # couldn't xml-ised quotes be used for the ' characters?
 #. Tag: para
@@ -1475,11 +1477,109 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:902
+#, no-c-format
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Partiționarea și selectarea punctelor de montare"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, fuzzy, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1499,7 +1599,7 @@ msgstr ""
 "RAID."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, fuzzy, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1510,7 +1610,7 @@ msgstr ""
 "se vedea <xref linkend=\"partitioning\"/>."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1532,7 +1632,7 @@ msgstr ""
 "imposibil accesul la datele de pe acel disc."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1546,14 +1646,14 @@ msgstr ""
 "automat, alegeți din meniu metoda <guimenuitem>Manuală</guimenuitem> ."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, fuzzy, no-c-format
 #| msgid "Created partitions"
 msgid "Supported partitioning options"
 msgstr "Partiții create"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1562,7 +1662,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1575,7 +1675,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1583,39 +1683,39 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, fuzzy, no-c-format
 #| msgid "Configuring the Logical Volume Manager (LVM)"
 msgid "Logical Volume Management (LVM)"
 msgstr "Configurarea Managerului de volume logice (LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1625,13 +1725,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1640,13 +1740,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1655,7 +1755,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1664,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
@@ -1675,7 +1775,7 @@ msgstr ""
 "toate arhitecturile."
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
@@ -1686,14 +1786,14 @@ msgstr ""
 "toate arhitecturile."
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1703,13 +1803,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1717,13 +1817,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1731,19 +1831,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1751,13 +1851,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, fuzzy, no-c-format
 msgid "Guided Partitioning"
 msgstr "Schema de partiționare"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, fuzzy, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1774,7 +1874,7 @@ msgstr ""
 "(criptat) să nu fie prezentă pe toate arhitecturile."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1784,7 +1884,7 @@ msgstr ""
 
 # XXX: shouldn't real Note style be used instead of the inline string?
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1802,7 +1902,7 @@ msgstr ""
 "pentru datele (personale ale) dumneavoastră."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1819,7 +1919,7 @@ msgstr ""
 "de dimensiunea discului."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1837,7 +1937,7 @@ msgstr ""
 "cere să confirmați aceste schimbări înainte de a fi scrise pe disc."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1856,7 +1956,7 @@ msgstr ""
 "identificarea lor."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1872,7 +1972,7 @@ msgstr ""
 "(criptat) acest lucru nu este posibil."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1891,73 +1991,73 @@ msgstr ""
 "eșua."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Schema de partiționare"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Spațiu minim"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Partiții create"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Toate fișierele pe o partiție"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MO"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Partiție /home separată"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MO"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Partiții /home, /usr, /var și /tmp separate"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GO</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1967,7 +2067,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, fuzzy, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1981,7 +2081,7 @@ msgstr ""
 "partiției LVM."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, fuzzy, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1996,7 +2096,7 @@ msgstr ""
 "EFI."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -2008,7 +2108,7 @@ msgstr ""
 "formatate și dacă vor fi montate."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2059,7 +2159,7 @@ msgstr ""
 "partiționarea manuală."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2080,13 +2180,13 @@ msgstr ""
 "propuse după cum se va descrie mai jos la partiționarea manuală."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, fuzzy, no-c-format
 msgid "Manual Partitioning"
 msgstr "Schema de partiționare"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
@@ -2102,7 +2202,7 @@ msgstr ""
 "&debian; vor fi acoperite în restul acestei secțiuni."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, fuzzy, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2117,7 +2217,7 @@ msgstr ""
 "selectat."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, fuzzy, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2156,7 +2256,7 @@ msgstr ""
 "<command>partman</command>."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, fuzzy, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2178,7 +2278,7 @@ msgstr ""
 "și să ștergeți o partiție."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2194,7 +2294,7 @@ msgstr ""
 "lăsa să continuați până nu corectați această problemă."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2206,7 +2306,7 @@ msgstr ""
 "continuați până când nu alocați una."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2223,7 +2323,7 @@ msgstr ""
 "filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2238,13 +2338,13 @@ msgstr ""
 "sistemele de fișiere ar trebui create așa cum s-a cerut."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, fuzzy, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Configurarea dispozitivelor multi-disc (<quote>RAID software</quote>)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2273,7 +2373,7 @@ msgstr ""
 "software</firstterm></quote>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2288,7 +2388,7 @@ msgstr ""
 "montare, etc.)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, fuzzy, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2387,55 +2487,55 @@ msgstr ""
 "variablelist> Pentru a sumariza:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Tipul"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Minim de dispozitive"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Dispozitive de rezervă"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "Supraviețuiește la un defect de disc?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Spațiu disponibil"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>nu</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
@@ -2443,43 +2543,43 @@ msgstr ""
 "RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "opțional"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>da</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Dimensiunea celei mai mici partiții din RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2489,21 +2589,21 @@ msgstr ""
 "RAID minus unu)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, fuzzy, no-c-format
 #| msgid "RAID0"
 msgid "RAID6"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, fuzzy, no-c-format
 #| msgid "<entry>2</entry>"
 msgid "<entry>4</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2516,7 +2616,7 @@ msgstr ""
 "RAID minus unu)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, fuzzy, no-c-format
 #| msgid "RAID0"
 msgid "RAID10"
@@ -2524,7 +2624,7 @@ msgstr "RAID0"
 
 # nu-mi place deloc cum e tradus; aștept sugestii
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, fuzzy, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2534,7 +2634,7 @@ msgstr ""
 "două)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, fuzzy, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2545,7 +2645,7 @@ msgstr ""
 "software</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2563,7 +2663,7 @@ msgstr ""
 
 # nu-mi place traducerea pentru stripped
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, fuzzy, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2584,7 +2684,7 @@ msgstr ""
 "filename> poate fi o variantă posibilă."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Support for MD is a relatively new addition to the installer. You may "
@@ -2610,7 +2710,7 @@ msgstr ""
 "de instalare sau configurare."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2632,7 +2732,7 @@ msgstr ""
 "depinde de tipul de dispozitiv MD selectat."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2644,7 +2744,7 @@ msgstr ""
 "selectați partițiile care vor forma dispozitivul MD."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, fuzzy, no-c-format
 #| msgid ""
 #| "RAID1 is a bit more tricky. First, you will be asked to enter the number "
@@ -2673,7 +2773,7 @@ msgstr ""
 "problema."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, fuzzy, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2684,7 +2784,7 @@ msgstr ""
 "emphasis> partiții active."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2695,7 +2795,7 @@ msgstr ""
 "emphasis> partiții active."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2716,7 +2816,7 @@ msgstr ""
 "active astfel încât copiile să fie distribuite pe discuri diferite."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, fuzzy, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2734,7 +2834,7 @@ msgstr ""
 "(partiție de 100GO, destul de sigură pentru <filename>/home</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2749,13 +2849,13 @@ msgstr ""
 "precum punctele de montare."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Configurarea Managerului de volume logice (LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2772,7 +2872,7 @@ msgstr ""
 "legături simbolice, etc."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2792,7 +2892,7 @@ msgstr ""
 "se pot întinde peste mai multe discuri fizice."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2813,7 +2913,7 @@ msgstr ""
 "fi bine să citiți <ulink url=\"&url-lvm-howto;\">Rețetarul LVM</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2830,7 +2930,7 @@ msgstr ""
 "fizic pentru LVM</guimenuitem> </menuchoice>"
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2850,7 +2950,7 @@ msgstr ""
 "Acțiunile posibile sunt:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2858,43 +2958,43 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2902,7 +3002,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2912,7 +3012,7 @@ msgstr ""
 "și și apoi creați volumele logice în interiorul acestuia."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2924,13 +3024,13 @@ msgstr ""
 "obișnuite (și ar trebui tratate ca atare)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Configurarea volumelor criptate"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2952,7 +3052,7 @@ msgstr ""
 "datele de pe disc vor părea a fi caractere aleatoare."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2981,7 +3081,7 @@ msgstr ""
 "fișiere criptat."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2997,7 +3097,7 @@ msgstr ""
 
 # trebuie verificate numele meniurilor cu ce e în D-I
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, fuzzy, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -3018,7 +3118,7 @@ msgstr ""
 "acea partiție."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -3036,7 +3136,7 @@ msgstr ""
 
 # trebuie verificate opțiunile din meniu dacă sunt în concordanță cu textul
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, fuzzy, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -3050,13 +3150,13 @@ msgstr ""
 "în vedere securitatea."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Criptare: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, fuzzy, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3082,14 +3182,14 @@ msgstr ""
 "protejarea datelor confidențiale în secolul 21."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Dimensiunea cheii: <userinput>256</userinput>"
 
 # mi-ar plăcea o altă traducere pentru 'strength'
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -3103,13 +3203,13 @@ msgstr ""
 "dimensiuni de chei  depinde de algoritmul de criptare."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "Algoritmul VI: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3127,7 +3227,7 @@ msgstr ""
 "șabloane repetate în datele criptate."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3142,25 +3242,25 @@ msgstr ""
 "algoritmii mai noi."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Cheia de criptare: <userinput>Parolă-frază</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Aici puteți alege tipul de cheie de criptare pentru această partiție."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Parolă-frază"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3175,13 +3275,13 @@ msgstr ""
 "procesului."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Cheie aleatoare"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3200,7 +3300,7 @@ msgstr ""
 "cifrare.)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3213,13 +3313,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3233,7 +3333,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3242,13 +3342,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3257,25 +3357,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3285,19 +3385,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3309,7 +3409,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3320,7 +3420,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3335,7 +3435,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3349,7 +3449,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3369,7 +3469,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3381,7 +3481,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3389,13 +3489,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3405,7 +3505,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, fuzzy, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3422,7 +3522,7 @@ msgstr ""
 "keycap><keycap>F1</keycap></keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3431,7 +3531,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3441,7 +3541,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3453,7 +3553,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3463,104 +3563,6 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4222,12 +4224,12 @@ msgstr ""
 #: using-d-i.xml:2771
 #, no-c-format
 msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 
 #. Tag: title
diff --git a/po/ru/administrivia.po b/po/ru/administrivia.po
index f75b64948..22406631d 100644
--- a/po/ru/administrivia.po
+++ b/po/ru/administrivia.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: administrivia\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 13:29+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: administrivia.xml:5
@@ -34,23 +34,22 @@ msgstr "Об этом документе"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This manual was created for Sarge's debian-installer, based on the Woody "
-#| "installation manual for boot-floppies, which was based on earlier Debian "
-#| "installation manuals, and on the Progeny distribution manual which was "
-#| "released under GPL in 2003."
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
-"Настоящее руководство было создано для программы debian-installer "
-"из Sarge, оно основано на руководстве по установке c "
-"использованием boot-floppies дистрибутива Woody, которое в свою "
-"очередь было основано на более ранних руководствах по установке &debian;, "
-"а также на руководстве дистрибутива "
+"Настоящее руководство было создано для программы debian-installer из Sarge, "
+"оно основано на руководстве по установке c использованием boot-floppies "
+"дистрибутива Woody, которое в свою очередь было основано на более ранних "
+"руководствах по установке &debian;, а также на руководстве дистрибутива "
 "Progeny, выпущенном под лицензией GPL в 2003 году."
 
 #. Tag: para
@@ -206,9 +205,9 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Many, many Debian users and developers contributed to this document. "
+#| "Many, many &debian; users and developers contributed to this document. "
 #| "Particular note must be made of Michael Schmitz (m68k support), Frank "
 #| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 #| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
@@ -216,7 +215,7 @@ msgstr ""
 #| "edits and text. We have to thank Pascal Le Bail for useful information "
 #| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
@@ -288,4 +287,3 @@ msgstr "Торговые марки"
 #, no-c-format
 msgid "All trademarks are property of their respective trademark owners."
 msgstr "Все торговые марки являются собственностью их владельцев."
-
diff --git a/po/ru/bookinfo.po b/po/ru/bookinfo.po
index 6f6f36ffa..1bf918bd7 100644
--- a/po/ru/bookinfo.po
+++ b/po/ru/bookinfo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 13:32+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: bookinfo.xml:5
@@ -29,12 +29,6 @@ msgstr "Руководство по установке &debian-gnu;"
 #. Tag: para
 #: bookinfo.xml:8
 #, no-c-format
-#| msgid ""
-#| "This document contains installation instructions for the &debian-gnu; "
-#| "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
-#| "title; (<quote>&architecture;</quote>) architecture. It also contains "
-#| "pointers to more information and information on how to make the most of "
-#| "your new Debian system."
 msgid ""
 "This document contains installation instructions for the &debian-gnu; "
 "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
@@ -50,11 +44,11 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This installation guide is based on an earlier manual written for the old "
-#| "Debian installation system (the <quote>boot-floppies</quote>), and has "
-#| "been updated to document the new Debian installer. However, for "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
 #| "&architecture;, the manual has not been fully updated and fact checked "
 #| "for the new installer. There may remain parts of the manual that are "
 #| "incomplete or outdated or that still document the boot-floppies "
@@ -64,14 +58,14 @@ msgstr ""
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Данное руководство по установке основано на предыдущей версии, описывавшей "
 "старую систему установки &debian; (<quote>boot-floppies</quote>). В текущей "
diff --git a/po/ru/boot-installer.po b/po/ru/boot-installer.po
index bc4768197..bc5bcb21a 100644
--- a/po/ru/boot-installer.po
+++ b/po/ru/boot-installer.po
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: boot-installer.xml:4
@@ -113,12 +113,6 @@ msgstr "Загрузка с CD-ROM"
 #: boot-installer.xml:70 boot-installer.xml:340 boot-installer.xml:811
 #: boot-installer.xml:1469 boot-installer.xml:1831
 #, no-c-format
-#| msgid ""
-#| "The easiest route for most people will be to use a set of Debian CDs. If "
-#| "you have a CD set, and if your machine supports booting directly off the "
-#| "CD, great! Simply <phrase arch=\"x86\"> configure your system for booting "
-#| "off a CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> "
-#| "insert your CD, reboot, and proceed to the next chapter."
 msgid ""
 "The easiest route for most people will be to use a set of &debian; CDs. If "
 "you have a CD set, and if your machine supports booting directly off the CD, "
@@ -156,12 +150,6 @@ msgstr ""
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
 #, no-c-format
-#| msgid ""
-#| "Even if you cannot boot from CD-ROM, you can probably install the Debian "
-#| "system components and any packages you want from CD-ROM. Simply boot "
-#| "using a different media, such as floppies. When it's time to install the "
-#| "operating system, base system, and any additional packages, point the "
-#| "installation system at the CD-ROM drive."
 msgid ""
 "Even if you cannot boot from CD-ROM, you can probably install the &debian; "
 "system components and any packages you want from CD-ROM. Simply boot using a "
@@ -262,30 +250,6 @@ msgstr "По сети с помощью Linux/Unix"
 #. Tag: para
 #: boot-installer.xml:150
 #, no-c-format
-#| msgid ""
-#| "You can use <command>upslug2</command> from any Linux or Unix machine to "
-#| "upgrade the machine via the network. This software is packaged for "
-#| "Debian. First, you have to put your NSLU2 in upgrade mode: <orderedlist> "
-#| "<listitem><para> Disconnect any disks and/or devices from the USB ports. "
-#| "</para></listitem> <listitem><para> Power off the NSLU2 </para></"
-#| "listitem> <listitem><para> Press and hold the reset button (accessible "
-#| "through the small hole on the back just above the power input). </para></"
-#| "listitem> <listitem><para> Press and release the power button to power on "
-#| "the NSLU2. </para></listitem> <listitem><para> Wait for 10 seconds "
-#| "watching the ready/status LED. After 10 seconds it will change from amber "
-#| "to red. Immediately release the reset button. </para></listitem> "
-#| "<listitem><para> The NSLU2 ready/status LED will flash alternately red/"
-#| "green (there is a 1 second delay before the first green). The NSLU2 is "
-#| "now in upgrade mode. </para></listitem> </orderedlist> See the <ulink url="
-#| "\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux "
-#| "pages</ulink> if you have problems with this. Once your NSLU2 is in "
-#| "upgrade mode, you can flash the new image: <informalexample><screen>\n"
-#| "sudo upslug2 -i di-nslu2.bin\n"
-#| "</screen></informalexample> Note that the tool also shows the MAC address "
-#| "of your NSLU2, which may come in handy to configure your DHCP server. "
-#| "After the whole image has been written and verified, the system will "
-#| "automatically reboot. Make sure you connect your USB disk again now, "
-#| "otherwise the installer won't be able to find it."
 msgid ""
 "You can use <command>upslug2</command> from any Linux or Unix machine to "
 "upgrade the machine via the network. This software is packaged for &debian;. "
@@ -312,21 +276,17 @@ msgid ""
 "installer won't be able to find it."
 msgstr ""
 "Для обновления по сети вы можете использовать <command>upslug2</command> с "
-"любой Linux или Unix машины. Эта программа существует в виде пакета &debian;."
-" "
-"Во-первых, переведите NSLU2 в режим обновления: <orderedlist> "
+"любой Linux или Unix машины. Эта программа существует в виде пакета "
+"&debian;. Во-первых, переведите NSLU2 в режим обновления: <orderedlist> "
 "<listitem><para> Отключите диски и/или другие устройства из портов USB.</"
 "para></listitem> <listitem><para> Выключите питание NSLU2 </para></listitem> "
 "<listitem><para> Нажмите и удерживайте кнопку сброса ( она находится в "
-"маленьком отверстии на задней стенке над разъёмом питания). </para><"
-"/listitem> "
-"<listitem><para> Нажмите и отпустите кнопку питания NSLU2. </para></listitem>"
-" "
-"<listitem><para> Подождите 10 секунд, наблюдая за "
+"маленьком отверстии на задней стенке над разъёмом питания). </para></"
+"listitem> <listitem><para> Нажмите и отпустите кнопку питания NSLU2. </"
+"para></listitem> <listitem><para> Подождите 10 секунд, наблюдая за "
 "индикатором готовности/состояния. По прошествии 10 секунд его состояние "
-"изменится с жёлтого на красный. Немедленно отпустите кнопку сброса. </para><"
-"/listitem> "
-"<listitem><para> Лампочка индикатора готовности/состояния NSLU2 "
+"изменится с жёлтого на красный. Немедленно отпустите кнопку сброса. </para></"
+"listitem> <listitem><para> Лампочка индикатора готовности/состояния NSLU2 "
 "заморгает попеременно красным/зелёным (будет задержка в 1 секунду перед "
 "первым появлением зелёного цвета). Теперь NSLU2 находится в режиме "
 "обновления. </para></listitem> </orderedlist> При возникновении проблем "
@@ -392,14 +352,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:245
 #, no-c-format
-#| msgid ""
-#| "To boot the SS4000-E, use your serial nullmodem cable and the ribbon "
-#| "cable to connect to the serial port of the SS4000-E, and reboot the "
-#| "machine. You need to use a serial terminal application to communicate "
-#| "with the machine; a good option on a Debian GNU/Linux is to use the "
-#| "<command>cu</command> program, in the package of the same name. Assuming "
-#| "the serial port on your computer is to be found on <filename>/dev/ttyS0</"
-#| "filename>, use the following command line:"
 msgid ""
 "To boot the SS4000-E, use your serial nullmodem cable and the ribbon cable "
 "to connect to the serial port of the SS4000-E, and reboot the machine. You "
@@ -627,7 +579,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:465
 #, no-c-format
-#| msgid "Booting from CD-ROM"
 msgid "Booting from DOS"
 msgstr "Загрузка из DOS"
 
@@ -638,8 +589,8 @@ msgid ""
 "Boot into DOS (not Windows). To do this, you can for instance boot from a "
 "recovery or diagnostic disk."
 msgstr ""
-"Загрузите DOS (не из Windows). Для этого вы можете использовать "
-"диск восстановления или диагностики."
+"Загрузите DOS (не из Windows). Для этого вы можете использовать диск "
+"восстановления или диагностики."
 
 #. Tag: para
 #: boot-installer.xml:471
@@ -652,13 +603,12 @@ msgid ""
 "disk as explained in <xref linkend=\"files-loadlin\"/>, and change the "
 "current drive to it if needed."
 msgstr ""
-"Если вы можете работать с установочным CD, измените текущий диск "
-"на устройство CD-ROM, например <informalexample><screen>\n"
+"Если вы можете работать с установочным CD, измените текущий диск на "
+"устройство CD-ROM, например <informalexample><screen>\n"
 "d:\n"
-"</screen></informalexample>, а также убедитесь, что "
-"доступен ранее подготовленный жёсткий диск "
-"(<xref linkend=\"files-loadlin\"/>), и измените текущий диск на "
-"его, если потребуется."
+"</screen></informalexample>, а также убедитесь, что доступен ранее "
+"подготовленный жёсткий диск (<xref linkend=\"files-loadlin\"/>), и измените "
+"текущий диск на его, если потребуется."
 
 #. Tag: para
 #: boot-installer.xml:481
@@ -676,9 +626,9 @@ msgstr ""
 "Войдите в подкаталог выбранного вами типа, например, "
 "<informalexample><screen>\n"
 "cd \\&x86-install-dir;\n"
-"</screen></informalexample> Если вы хотите использовать "
-"графический интерфейс к программе установки, то войдите в "
-"подкаталог <filename>gtk</filename>. <informalexample><screen>\n"
+"</screen></informalexample> Если вы хотите использовать графический "
+"интерфейс к программе установки, то войдите в подкаталог <filename>gtk</"
+"filename>. <informalexample><screen>\n"
 "cd gtk\n"
 "</screen></informalexample> Затем запустите <command>install.bat</command>. "
 "Будет загружено ядро и запущена система установки."
@@ -1039,20 +989,6 @@ msgstr "Экран запуска"
 #. Tag: para
 #: boot-installer.xml:715
 #, no-c-format
-#| msgid ""
-#| "When the installer boots, you should be presented with a friendly "
-#| "graphical screen showing the Debian logo and a menu: "
-#| "<informalexample><screen>\n"
-#| "Installer boot menu\n"
-#| "\n"
-#| "Install\n"
-#| "Graphical install\n"
-#| "Advanced options       >\n"
-#| "Help\n"
-#| "\n"
-#| "Press ENTER to boot or TAB to edit a menu entry\n"
-#| "</screen></informalexample> Depending on the installation method you are "
-#| "using, the <quote>Graphical install</quote> option may not be available."
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
 "screen showing the &debian; logo and a menu: <informalexample><screen>\n"
@@ -1229,17 +1165,6 @@ msgstr "Содержимое компакт-диска"
 #. Tag: para
 #: boot-installer.xml:848
 #, no-c-format
-#| msgid ""
-#| "There are three basic variations of Debian Install CDs. The "
-#| "<emphasis>Business Card</emphasis> CD has a minimal installation that "
-#| "will fit on the small form factor CD media. It requires a network "
-#| "connection in order to install the rest of the base installation and make "
-#| "a usable system. The <emphasis>Network Install</emphasis> CD has all of "
-#| "the packages for a base install but requires a network connection to a "
-#| "Debian mirror site in order to install the extra packages one would want "
-#| "for a complete system . The set of Debian CDs can install a complete "
-#| "system from the wide range of packages without needing access to the "
-#| "network."
 msgid ""
 "There are three basic variations of &debian; Install CDs. The "
 "<emphasis>Business Card</emphasis> CD has a minimal installation that will "
@@ -1258,10 +1183,9 @@ msgstr ""
 "работы системы. Диск <emphasis>сетевой установки</emphasis> содержит все "
 "пакеты для базовой установки, но требует сетевого соединения с серверами- "
 "зеркалами &debian; для установки дополнительных пакетов, если вам хочется "
-"получить "
-"полноценную систему. С помощью всего комплекта компакт-дисков &debian; можно "
-"установить полноценную систему с большим выбором пакетов без всякого доступа "
-"к сети."
+"получить полноценную систему. С помощью всего комплекта компакт-дисков "
+"&debian; можно установить полноценную систему с большим выбором пакетов без "
+"всякого доступа к сети."
 
 #. Tag: para
 #: boot-installer.xml:864
@@ -1292,13 +1216,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:880
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer CD contains a small EFI partition where the "
-#| "<command>ELILO</command> bootloader, its configuration file, the "
-#| "installer's kernel, and initial filesystem (initrd) are located. The "
-#| "running system also contains an EFI partition where the necessary files "
-#| "for booting the system reside. These files are readable from the EFI "
-#| "Shell as described below."
 msgid ""
 "The &debian; Installer CD contains a small EFI partition where the "
 "<command>ELILO</command> bootloader, its configuration file, the installer's "
@@ -1307,13 +1224,11 @@ msgid ""
 "reside. These files are readable from the EFI Shell as described below."
 msgstr ""
 "Компакт-диск с программой установки &debian; содержит небольшой раздел EFI, "
-"в котором "
-"находятся системный загрузчик <command>ELILO</command>, его "
-"файл настройки, ядро программы установки и начальная файловая система "
-"(initrd). Работающая "
-"система тоже содержит раздел EFI, в котором располагаются необходимые для "
-"загрузки системы файлы. Эти файлы доступны для чтения из командной оболочки "
-"EFI Shell, как описано ниже."
+"в котором находятся системный загрузчик <command>ELILO</command>, его файл "
+"настройки, ядро программы установки и начальная файловая система (initrd). "
+"Работающая система тоже содержит раздел EFI, в котором располагаются "
+"необходимые для загрузки системы файлы. Эти файлы доступны для чтения из "
+"командной оболочки EFI Shell, как описано ниже."
 
 #. Tag: para
 #: boot-installer.xml:889
@@ -1472,19 +1387,14 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:986
 #, no-c-format
-#| msgid ""
-#| "These steps start the Debian boot loader which will display a menu page "
-#| "for you to select a boot kernel and options. Proceed to selecting the "
-#| "boot kernel and options."
 msgid ""
 "These steps start the &debian; boot loader which will display a menu page "
 "for you to select a boot kernel and options. Proceed to selecting the boot "
 "kernel and options."
 msgstr ""
 "Эти шаги запустят начальный загрузчик &debian;, который выведет страницу "
-"меню "
-"для выбора загружаемого ядра и параметров. Чтобы продолжить, выберите ядро и "
-"параметры."
+"меню для выбора загружаемого ядра и параметров. Чтобы продолжить, выберите "
+"ядро и параметры."
 
 #. Tag: title
 #: boot-installer.xml:996
@@ -1495,11 +1405,6 @@ msgstr "Вариант 2: Загрузка из EFI Shell"
 #. Tag: para
 #: boot-installer.xml:997
 #, no-c-format
-#| msgid ""
-#| "If, for some reason, option 1 is not successful, reboot the machine and "
-#| "when the EFI Boot Manager screen appears there should be one option "
-#| "called <command>EFI Shell [Built-in]</command>. Boot the Debian Installer "
-#| "CD with the following steps:"
 msgid ""
 "If, for some reason, option 1 is not successful, reboot the machine and when "
 "the EFI Boot Manager screen appears there should be one option called "
@@ -1508,8 +1413,8 @@ msgid ""
 msgstr ""
 "Если по каким-то причинам вариант 1 не сработал, перезагрузите машину и "
 "когда появится меню системного загрузчика EFI, то в нём должен быть ещё один "
-"пункт<command>EFI Shell [Built-in]</command>. Загрузитесь с CD с "
-"программу установки &debian; с помощью следующих шагов:"
+"пункт<command>EFI Shell [Built-in]</command>. Загрузитесь с CD с программу "
+"установки &debian; с помощью следующих шагов:"
 
 #. Tag: para
 #: boot-installer.xml:1008
@@ -1587,12 +1492,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1049
 #, no-c-format
-#| msgid ""
-#| "As with option 1, these steps start the Debian boot loader which will "
-#| "display a menu page for you to select a boot kernel and options. You can "
-#| "also enter the shorter <command>fs<replaceable>n</replaceable>:elilo</"
-#| "command> command at the shell prompt. Proceed to selecting the boot "
-#| "kernel and options."
 msgid ""
 "As with option 1, these steps start the &debian; boot loader which will "
 "display a menu page for you to select a boot kernel and options. You can "
@@ -1768,10 +1667,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1156
 #, no-c-format
-#| msgid ""
-#| "Press <command>ENTER</command>. This will load and start the kernel. The "
-#| "kernel will display its usual initialization messages followed by the "
-#| "first screen of the Debian Installer."
 msgid ""
 "Press <command>ENTER</command>. This will load and start the kernel. The "
 "kernel will display its usual initialization messages followed by the first "
@@ -1947,12 +1842,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1292
 #, no-c-format
-#| msgid ""
-#| "The boot loader will display its prompt after it has downloaded and "
-#| "processed its configuration file. At this point, the installation "
-#| "proceeds with the same steps as a CD install. Select a boot option as in "
-#| "above and when the kernel has completed installing itself from the "
-#| "network, it will start the Debian Installer."
 msgid ""
 "The boot loader will display its prompt after it has downloaded and "
 "processed its configuration file. At this point, the installation proceeds "
@@ -1963,8 +1852,7 @@ msgstr ""
 "Системный загрузчик покажет своё приглашение после получения и обработки "
 "своего файла настройки. С этого момента установка продолжится также как и "
 "при установке с CD. Выберите пункт загрузки, который приведён выше и когда "
-"ядро "
-"полностью установится из сети, запустится программа установки &debian;."
+"ядро полностью установится из сети, запустится программа установки &debian;."
 
 # index.docbook:1972, index.docbook:2015
 #. Tag: title
@@ -1976,15 +1864,6 @@ msgstr "Загрузка SGI с сервера TFTP"
 #. Tag: para
 #: boot-installer.xml:1319
 #, no-c-format
-#| msgid ""
-#| "After entering the command monitor use <informalexample><screen>\n"
-#| "bootp():\n"
-#| "</screen></informalexample> on SGI machines to boot linux and to begin "
-#| "installation of the Debian Software. In order to make this work you may "
-#| "have to unset the <envar>netaddr</envar> environment variable. Type "
-#| "<informalexample><screen>\n"
-#| "unsetenv netaddr\n"
-#| "</screen></informalexample> in the command monitor to do this."
 msgid ""
 "After entering the command monitor use <informalexample><screen>\n"
 "bootp():\n"
@@ -1995,13 +1874,12 @@ msgid ""
 "unsetenv netaddr\n"
 "</screen></informalexample> in the command monitor to do this."
 msgstr ""
-"На компьютерах SGI для загрузки linux и начала установки &debian; "
-"после входа в командный монитор используйте <informalexample><screen>\n"
+"На компьютерах SGI для загрузки linux и начала установки &debian; после "
+"входа в командный монитор используйте <informalexample><screen>\n"
 "bootp():\n"
-"</screen></informalexample>. "
-"Чтобы сделать это, вам может понадобиться "
-"сбросить переменную окружения <envar>netaddr</envar>. "
-"Для этого наберите <informalexample><screen>\n"
+"</screen></informalexample>. Чтобы сделать это, вам может понадобиться "
+"сбросить переменную окружения <envar>netaddr</envar>. Для этого наберите "
+"<informalexample><screen>\n"
 "unsetenv netaddr\n"
 "</screen></informalexample> в командном мониторе."
 
@@ -2179,12 +2057,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1512
 #, no-c-format
-#| msgid ""
-#| "OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
-#| "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
-#| "software version of this driver is not available. All OldWorld systems "
-#| "have floppy drives, so use the floppy drive to launch the installer, and "
-#| "then point the installer to the CD for the needed files."
 msgid ""
 "OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
 "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
@@ -2290,27 +2162,6 @@ msgstr "Загрузка NewWorld Mac из OpenFirmware"
 #. Tag: para
 #: boot-installer.xml:1588
 #, no-c-format
-#| msgid ""
-#| "You will have already placed the <filename>vmlinux</filename>, "
-#| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
-#| "<filename>yaboot.conf</filename> files at the root level of your HFS "
-#| "partition in <xref linkend=\"files-newworld\"/>. You will now have to "
-#| "boot into OpenFirmware (see <xref linkend=\"invoking-openfirmware\"/>). "
-#| "At the prompt, type <informalexample><screen>\n"
-#| "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-#| "</screen></informalexample> replacing <replaceable>x</replaceable> with "
-#| "the partition number of the HFS partition where the kernel and yaboot "
-#| "files were placed, followed by a &enterkey;. On some machines, you may "
-#| "need to use <userinput>ide0:</userinput> instead of <userinput>hd:</"
-#| "userinput>. In a few more seconds you will see a yaboot prompt "
-#| "<informalexample><screen>\n"
-#| "boot:\n"
-#| "</screen></informalexample> At yaboot's <prompt>boot:</prompt> prompt, "
-#| "type either <userinput>install</userinput> or <userinput>install "
-#| "video=ofonly</userinput> followed by a &enterkey;. The "
-#| "<userinput>video=ofonly</userinput> argument is for maximum "
-#| "compatibility; you can try it if <userinput>install</userinput> doesn't "
-#| "work. The Debian installation program should start."
 msgid ""
 "You will have already placed the <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -2948,7 +2799,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:2082
 #, no-c-format
-#| msgid "Debian Installer Parameters"
 msgid "&debian; Installer Parameters"
 msgstr "Параметры программы установки &debian;"
 
@@ -3151,10 +3001,6 @@ msgstr "INSTALL_MEDIA_DEV"
 #. Tag: para
 #: boot-installer.xml:2205
 #, no-c-format
-#| msgid ""
-#| "The value of the parameter is the path to the device to load the Debian "
-#| "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
-#| "userinput>"
 msgid ""
 "The value of the parameter is the path to the device to load the &debian; "
 "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
@@ -3342,12 +3188,6 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 #. Tag: para
 #: boot-installer.xml:2314
 #, no-c-format
-#| msgid ""
-#| "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
-#| "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. "
-#| "Note that this support is currently experimental. Additional information "
-#| "can be found on the <ulink url=\"&url-d-i-wiki;\">Debian Installer Wiki</"
-#| "ulink>."
 msgid ""
 "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
 "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. Note "
@@ -3704,13 +3544,6 @@ msgstr "mirror/protocol (protocol)"
 #. Tag: para
 #: boot-installer.xml:2525
 #, no-c-format
-#| msgid ""
-#| "By default the installer will use the http protocol to download files "
-#| "from Debian mirrors and changing that to ftp is not possible during "
-#| "installations at normal priority. By setting this parameter to "
-#| "<userinput>ftp</userinput>, you can force the installer to use that "
-#| "protocol instead. Note that you cannot select an ftp mirror from a list, "
-#| "you have to enter the hostname manually."
 msgid ""
 "By default the installer will use the http protocol to download files from "
 "&debian; mirrors and changing that to ftp is not possible during "
@@ -4210,9 +4043,6 @@ msgstr "Надёжность дискет"
 #. Tag: para
 #: boot-installer.xml:2819
 #, no-c-format
-#| msgid ""
-#| "The biggest problem for people using floppy disks to install Debian seems "
-#| "to be floppy disk reliability."
 msgid ""
 "The biggest problem for people using floppy disks to install &debian; seems "
 "to be floppy disk reliability."
@@ -4716,14 +4546,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:3104
 #, no-c-format
-#| msgid ""
-#| "If you have a working Debian system, the easiest way to send an "
-#| "installation report is to install the <classname>installation-report</"
-#| "classname> and <classname>reportbug</classname> packages "
-#| "(<command>aptitude install installation-report reportbug</command>), "
-#| "configure <classname>reportbug</classname> as explained in <xref linkend="
-#| "\"mail-outgoing\"/>, and run the command <command>reportbug installation-"
-#| "reports</command>."
 msgid ""
 "If you have a working &debian; system, the easiest way to send an "
 "installation report is to install the <classname>installation-report</"
diff --git a/po/ru/boot-new.po b/po/ru/boot-new.po
index 037b1b091..2d7bb6e32 100644
--- a/po/ru/boot-new.po
+++ b/po/ru/boot-new.po
@@ -16,13 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: boot-new.xml:5
 #, no-c-format
-#| msgid "Booting Into Your New Debian System"
 msgid "Booting Into Your New &debian; System"
 msgstr "Загрузка только что установленной системы &debian;"
 
@@ -45,13 +44,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:13
 #, no-c-format
-#| msgid ""
-#| "If you did a default installation, the first thing you should see when "
-#| "you boot the system is the menu of the <classname>grub</classname> or "
-#| "possibly the <classname>lilo</classname> bootloader. The first choices in "
-#| "the menu will be for your new Debian system. If you had any other "
-#| "operating systems on your computer (like Windows) that were detected by "
-#| "the installation system, those will be listed lower down in the menu."
 msgid ""
 "If you did a default installation, the first thing you should see when you "
 "boot the system is the menu of the <classname>grub</classname><phrase arch="
@@ -71,13 +63,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:23
 #, no-c-format
-#| msgid ""
-#| "If the system fails to start up correctly, don't panic. If the "
-#| "installation was successful, chances are good that there is only a "
-#| "relatively minor problem that is preventing the system from booting "
-#| "Debian. In most cases such problems can be fixed without having to repeat "
-#| "the installation. One available option to fix boot problems is to use the "
-#| "installer's built-in rescue mode (see <xref linkend=\"rescue\"/>)."
 msgid ""
 "If the system fails to start up correctly, don't panic. If the installation "
 "was successful, chances are good that there is only a relatively minor "
@@ -96,18 +81,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:32
 #, no-c-format
-#| msgid ""
-#| "If you are new to Debian and &arch-kernel;, you may need some help from "
-#| "more experienced users. <phrase arch=\"x86\">For direct on-line help you "
-#| "can try the IRC channels #debian or #debian-boot on the OFTC network. "
-#| "Alternatively you can contact the <ulink url=\"&url-list-subscribe;"
-#| "\">debian-user mailing list</ulink>.</phrase> <phrase arch=\"not-"
-#| "x86\">For less common architectures like &arch-title;, your best option "
-#| "is to ask on the <ulink url=\"&url-list-subscribe;\">debian-&arch-"
-#| "listname; mailing list</ulink>.</phrase> You can also file an "
-#| "installation report as described in <xref linkend=\"submit-bug\"/>. "
-#| "Please make sure that you describe your problem clearly and include any "
-#| "messages that are displayed and may help others to diagnose the issue."
 msgid ""
 "If you are new to &debian; and &arch-kernel;, you may need some help from "
 "more experienced users. <phrase arch=\"x86\">For direct on-line help you can "
@@ -596,15 +569,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:321
 #, no-c-format
-#| msgid ""
-#| "Documentation accompanying programs you have installed can be found in "
-#| "<filename>/usr/share/doc/</filename>, under a subdirectory named after "
-#| "the program (or, more precise, the Debian package that contains the "
-#| "program). However, more extensive documentation is often packaged "
-#| "separately in special documentation packages that are mostly not "
-#| "installed by default. For example, documentation about the package "
-#| "management tool <command>apt</command> can be found in the packages "
-#| "<classname>apt-doc</classname> or <classname>apt-howto</classname>."
 msgid ""
 "Documentation accompanying programs you have installed can be found in "
 "<filename>/usr/share/doc/</filename>, under a subdirectory named after the "
diff --git a/po/ru/hardware.po b/po/ru/hardware.po
index 680574ff9..cbcb31cdd 100644
--- a/po/ru/hardware.po
+++ b/po/ru/hardware.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 17:14+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: hardware.xml:5
@@ -27,10 +27,6 @@ msgstr "Системные требования"
 #. Tag: para
 #: hardware.xml:7
 #, no-c-format
-#| msgid ""
-#| "This section contains information about what hardware you need to get "
-#| "started with Debian. You will also find links to further information "
-#| "about hardware supported by GNU and &arch-kernel;."
 msgid ""
 "This section contains information about what hardware you need to get "
 "started with &debian;. You will also find links to further information about "
@@ -49,14 +45,6 @@ msgstr "Поддерживаемое оборудование"
 #. Tag: para
 #: hardware.xml:21
 #, no-c-format
-#| msgid ""
-#| "Debian does not impose hardware requirements beyond the requirements of "
-#| "the Linux kernel and the GNU tool-sets. Therefore, any architecture or "
-#| "platform to which the Linux kernel, libc, <command>gcc</command>, etc. "
-#| "have been ported, and for which a Debian port exists, can run Debian. "
-#| "Please refer to the Ports pages at <ulink url=\"&url-ports;\"></ulink> "
-#| "for more details on &arch-title; architecture systems which have been "
-#| "tested with &debian-gnu;."
 msgid ""
 "&debian; does not impose hardware requirements beyond the requirements of "
 "the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
@@ -67,14 +55,12 @@ msgid ""
 "systems which have been tested with &debian-gnu;."
 msgstr ""
 "Для &debian; не требуется от оборудования сверх того, что требуют ядро Linux "
-"или "
-"kFreeBSD и утилиты GNU. Таким образом, любая архитектура или платформа, на "
-"которую были "
-"перенесены ядро Linux или kFreeBSD, libc, <command>gcc</command> и т.д. "
-"и на которую перенесён &debian;, может работать под &debian;. Сверьтесь со "
-"страницами "
-"переносов <ulink url=\"&url-ports;\"></ulink>, какие системы на архитектуре "
-"&arch-title; были протестированы с &debian-gnu;."
+"или kFreeBSD и утилиты GNU. Таким образом, любая архитектура или платформа, "
+"на которую были перенесены ядро Linux или kFreeBSD, libc, <command>gcc</"
+"command> и т.д. и на которую перенесён &debian;, может работать под "
+"&debian;. Сверьтесь со страницами переносов <ulink url=\"&url-ports;\"></"
+"ulink>, какие системы на архитектуре &arch-title; были протестированы с "
+"&debian-gnu;."
 
 #. Tag: para
 #: hardware.xml:32
@@ -97,9 +83,6 @@ msgstr "Поддерживаемые архитектуры"
 #. Tag: para
 #: hardware.xml:42
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Linux &release; supports eleven major architectures and "
-#| "several variations of each architecture known as <quote>flavors</quote>."
 msgid ""
 "&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
@@ -117,7 +100,6 @@ msgstr "Архитектура"
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
 #, no-c-format
-#| msgid "Debian Designation"
 msgid "&debian; Designation"
 msgstr "Обозначение в &debian;"
 
@@ -492,11 +474,6 @@ msgstr "kfreebsd-amd64"
 #. Tag: para
 #: hardware.xml:196
 #, no-c-format
-#| msgid ""
-#| "This document covers installation for the <emphasis>&arch-title;</"
-#| "emphasis> architecture. If you are looking for information on any of the "
-#| "other Debian-supported architectures take a look at the <ulink url="
-#| "\"http://www.debian.org/ports/\">Debian-Ports</ulink> pages."
 msgid ""
 "This document covers installation for the <emphasis>&arch-title;</emphasis> "
 "architecture using the <emphasis>&arch-kernel;</emphasis> kernel. If you are "
@@ -507,8 +484,7 @@ msgstr ""
 "Этот документ содержит описание установки на архитектуру <emphasis>&arch-"
 "title;</emphasis>. Если вы ищете информацию по любой другой архитектуре, "
 "поддерживаемой &debian;, посмотрите на странице <ulink url=\"http://www."
-"debian."
-"org/ports/\">переносов &debian;</ulink>."
+"debian.org/ports/\">переносов &debian;</ulink>."
 
 #. Tag: para
 #: hardware.xml:206
@@ -529,15 +505,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:216
 #, no-c-format
-#| msgid ""
-#| "This is the first official release of &debian-gnu; for the &arch-title; "
-#| "architecture. We feel that it has proven itself sufficiently to be "
-#| "released. However, because it has not had the exposure (and hence testing "
-#| "by users) that some other architectures have had, you may encounter a few "
-#| "bugs. Use our <ulink url=\"&url-bts;\">Bug Tracking System</ulink> to "
-#| "report any problems; make sure to mention the fact that the bug is on the "
-#| "&arch-title; platform. It can be necessary to use the <ulink url=\"&url-"
-#| "list-subscribe;\">debian-&arch-listname; mailing list</ulink> as well."
 msgid ""
 "This is the first official release of &debian-gnu; for the &arch-title; "
 "architecture. We feel that it has proven itself sufficiently to be released. "
@@ -550,15 +517,14 @@ msgid ""
 "listname; mailing list</ulink> as well."
 msgstr ""
 "Это первый официальный выпуск &debian-gnu; для архитектуры &arch-title;. Мы "
-"его готовым к выпуску. Однако, поскольку эта "
-"архитектура не так сильно распространёна (и, следовательно, не "
-"протестирована пользователями), как другие, вы можете встретить некоторые "
-"ошибки. Используйте нашу <ulink url=\"&url-bts;\">Систему отслеживания "
-"ошибок</ulink>, чтобы сообщить о любой проблеме; убедитесь, что вы упомянули "
-"тот факт, что ошибка возникла на архитектуре &arch-title;, использующей "
-"ядро <emphasis>&arch-kernel;</emphasis>. Возможно, также "
-"придётся воспользоваться <ulink url=\"&url-list-subscribe;\">списком "
-"рассылки debian-&arch-listname;</ulink>."
+"его готовым к выпуску. Однако, поскольку эта архитектура не так сильно "
+"распространёна (и, следовательно, не протестирована пользователями), как "
+"другие, вы можете встретить некоторые ошибки. Используйте нашу <ulink url="
+"\"&url-bts;\">Систему отслеживания ошибок</ulink>, чтобы сообщить о любой "
+"проблеме; убедитесь, что вы упомянули тот факт, что ошибка возникла на "
+"архитектуре &arch-title;, использующей ядро <emphasis>&arch-kernel;</"
+"emphasis>. Возможно, также придётся воспользоваться <ulink url=\"&url-list-"
+"subscribe;\">списком рассылки debian-&arch-listname;</ulink>."
 
 # index.docbook:227, index.docbook:661, index.docbook:759, index.docbook:778, index.docbook:821, index.docbook:863, index.docbook:917, index.docbook:1061, index.docbook:1467
 #. Tag: title
@@ -596,11 +562,6 @@ msgstr "Поддерживаются AMD64 и Intel EM64T."
 #. Tag: para
 #: hardware.xml:277
 #, no-c-format
-#| msgid ""
-#| "Each distinct ARM architecture requires its own kernel. Because of this "
-#| "the standard Debian distribution only supports installation on a number "
-#| "of the most common platforms. The Debian userland however may be used by "
-#| "<emphasis>any</emphasis> ARM CPU."
 msgid ""
 "Each distinct ARM architecture requires its own kernel. Because of this the "
 "standard &debian; distribution only supports installation on a number of the "
@@ -615,10 +576,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:286
 #, no-c-format
-#| msgid ""
-#| "Most ARM CPUs may be run in either endian mode (big or little). However, "
-#| "the majority of current system implementation uses little-endian mode. "
-#| "Debian currently only supports little-endian ARM systems."
 msgid ""
 "Most ARM CPUs may be run in either endian mode (big or little). However, the "
 "majority of current system implementation uses little-endian mode. &debian; "
@@ -644,14 +601,6 @@ msgstr "IOP32x"
 #. Tag: para
 #: hardware.xml:302
 #, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing. Debian currently supports the IOP32x "
-#| "platform, featuring the IOP 80219 and 32x chips commonly found in Network "
-#| "Attached Storage (NAS) devices. Debian explicitly supports two such "
-#| "devices: the <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> "
-#| "from IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</"
-#| "ulink>."
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing. &debian; currently supports the IOP32x "
@@ -664,10 +613,9 @@ msgstr ""
 "для  хранения и обработке данных. В данный момент в &debian; поддерживается "
 "платформа IOP32x, оснащённая чипами IOP 80219 и 32x, которые обычно "
 "используются в устройствах хранения данных, подключённых к сети (NAS). В "
-"&debian; явно поддерживаются два таких устройства: <ulink "
-"url=\"&url-arm-cyrius-"
-"glantank;\">GLAN Tank</ulink> от IO-Data и <ulink url=\"&url-arm-cyrius-"
-"n2100;\">Thecus N2100</ulink>."
+"&debian; явно поддерживаются два таких устройства: <ulink url=\"&url-arm-"
+"cyrius-glantank;\">GLAN Tank</ulink> от IO-Data и <ulink url=\"&url-arm-"
+"cyrius-n2100;\">Thecus N2100</ulink>."
 
 #. Tag: term
 #: hardware.xml:315
@@ -757,9 +705,6 @@ msgstr "<term>Versatile</term>"
 #. Tag: para
 #: hardware.xml:363
 #, no-c-format
-#| msgid ""
-#| "The Versatile platform is emulated by QEMU and is therefore a nice way to "
-#| "test and run Debian on ARM if you don't have the hardware."
 msgid ""
 "The Versatile platform is emulated by QEMU and is therefore a nice way to "
 "test and run &debian; on ARM if you don't have the hardware."
@@ -802,24 +747,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:417
 #, no-c-format
-#| msgid ""
-#| "However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run "
-#| "on 386 or earlier processors. Despite the architecture name \"i386\", "
-#| "support for actual 80386 processors (and their clones) was dropped with "
-#| "the Sarge (r3.1) release of Debian<footnote> <para> We have long tried to "
-#| "avoid this, but in the end it was necessary due a unfortunate series of "
-#| "issues with the compiler and the kernel, starting with an bug in the C++ "
-#| "ABI provided by GCC. You should still be able to run Debian GNU/Linux on "
-#| "actual 80386 processors if you compile your own kernel and compile all "
-#| "packages from source, but that is beyond the scope of this manual. </"
-#| "para> </footnote>. (No version of Linux has ever supported the 286 or "
-#| "earlier chips in the series.) All i486 and later processors are still "
-#| "supported<footnote> <para> Many Debian packages will actually run "
-#| "slightly faster on modern computers as a positive side effect of dropping "
-#| "support for these old chips. The i486, introduced in 1989, has three "
-#| "opcodes (bswap, cmpxchg, and xadd) which the i386, introduced in 1986, "
-#| "did not have. Previously, these could not be easily used by most Debian "
-#| "packages; now they can. </para> </footnote>."
 msgid ""
 "However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
 "on 386 or earlier processors. Despite the architecture name \"i386\", "
@@ -854,8 +781,8 @@ msgstr ""
 "отметить, что многие пакеты &debian; будут работать немного быстрее на "
 "современных компьютерах. Процессор i486, выпущенный в 1989 году, имеет три "
 "команды (bswap, cmpxchg и xadd), которых нет в процессоре i386, выпущенном в "
-"1986 году. Прежде, их нелегко было использовать в большинстве пакетов "
-" &debian;; теперь это возможно. </para> </footnote>."
+"1986 году. Прежде, их нелегко было использовать в большинстве пакетов  "
+"&debian;; теперь это возможно. </para> </footnote>."
 
 #. Tag: para
 #: hardware.xml:450
@@ -882,34 +809,19 @@ msgstr "Шина ввода-вывода (I/O)"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "Системная шина &mdash; это часть материнской платы, которая позволяет "
 "процессору взаимодействовать с периферией, например, с устройствами "
-"хранения. Ваш компьютер должен использовать ISA, EISA, PCI, PCIe, PCI-X или VESA "
-"Local Bus (VLB, иногда называемая VL шиной). В сущности, все персональные "
-"компьютеры, продаваемые в последние годы, имеют одну из них."
+"хранения. Ваш компьютер должен использовать ISA, EISA, PCI, PCIe, PCI-X или "
+"VESA Local Bus (VLB, иногда называемая VL шиной). В сущности, все "
+"персональные компьютеры, продаваемые в последние годы, имеют одну из них."
 
 #. Tag: para
 #: hardware.xml:484
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
-#| "Indigo 2 and Challenge S. Since these machines are very similar, whenever "
-#| "this document refers to the SGI Indy, the Indigo 2 and Challenge S are "
-#| "meant as well. </para></listitem> <listitem><para> SGI IP32: this "
-#| "platform is generally known as SGI O2. </para></listitem> "
-#| "<listitem><para> MIPS Malta: this platform is emulated by QEMU and is "
-#| "therefore a nice way to test and run Debian on MIPS if you don't have the "
-#| "hardware. </para></listitem> </itemizedlist> Complete information "
-#| "regarding supported mips/mipsel machines can be found at the <ulink url="
-#| "\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. In the following, only "
-#| "the systems supported by the Debian installer will be covered. If you are "
-#| "looking for support for other subarchitectures, please contact the <ulink "
-#| "url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
@@ -933,23 +845,16 @@ msgstr ""
 "<listitem><para> SGI IP32: известна также как SGI O2. </para></listitem> "
 "<listitem><para> MIPS Malta: данная платформа эмулируется QEMU и поэтому "
 "замечательно подходит для тестирования и запуска &debian; на MIPS, если у "
-"вас "
-"нет такого аппаратного обеспечения. </para></listitem> </itemizedlist> "
+"вас нет такого аппаратного обеспечения. </para></listitem> </itemizedlist> "
 "Полную информацию о поддерживаемых машинах mips/mipsel можно найти на <ulink "
 "url=\"&url-linux-mips;\">домашней странице Linux-MIPS</ulink>. Далее будут "
 "описываться только системы, поддерживаемые программой установки &debian;. "
-"Если "
-"вам нужна поддержка других субархитектур, напишите в <ulink url=\"&url-list-"
-"subscribe;\">список рассылки debian-&arch-listname;</ulink>."
+"Если вам нужна поддержка других субархитектур, напишите в <ulink url=\"&url-"
+"list-subscribe;\">список рассылки debian-&arch-listname;</ulink>."
 
 #. Tag: para
 #: hardware.xml:519
 #, no-c-format
-#| msgid ""
-#| "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 "
-#| "and R5000 processors are supported by the Debian installation system on "
-#| "big endian MIPS. On SGI IP32, currently only systems based on the R5000 "
-#| "are supported."
 msgid ""
 "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
 "R5000 processors are supported by the &debian; installation system on big "
@@ -976,19 +881,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:542
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-#| "covered here. This includes the Cobalt RaQ, Qube2 and RaQ2, and the "
-#| "Gateway Microserver. </para></listitem> <listitem><para> MIPS Malta: this "
-#| "platform is emulated by QEMU and is therefore a nice way to test and run "
-#| "Debian on MIPS if you don't have the hardware. </para></listitem> </"
-#| "itemizedlist> Complete information regarding supported mips/mipsel "
-#| "machines can be found at the <ulink url=\"&url-linux-mips;\">Linux-MIPS "
-#| "homepage</ulink>. In the following, only the systems supported by the "
-#| "Debian installer will be covered. If you are looking for support for "
-#| "other subarchitectures, please contact the <ulink url=\"&url-list-"
-#| "subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -1013,9 +905,8 @@ msgstr ""
 "найти на <ulink url=\"&url-linux-mips;\">домашней странице Linux-MIPS</"
 "ulink>. Далее будут описываться только системы, поддерживаемые программой "
 "установки &debian;. Если вам нужна поддержка других субархитектур, напишите "
-"в "
-"<ulink url=\"&url-list-subscribe;\">список рассылки debian-&arch-listname;</"
-"ulink>."
+"в <ulink url=\"&url-list-subscribe;\">список рассылки debian-&arch-listname;"
+"</ulink>."
 
 #. Tag: title
 #: hardware.xml:570
@@ -1064,9 +955,6 @@ msgstr "Варианты ядер"
 #. Tag: para
 #: hardware.xml:618
 #, no-c-format
-#| msgid ""
-#| "There are two flavours of the powerpc kernel in Debian, based on the CPU "
-#| "type:"
 msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
@@ -1145,11 +1033,6 @@ msgstr "Субархитектура Power Macintosh (pmac)"
 #. Tag: para
 #: hardware.xml:688
 #, no-c-format
-#| msgid ""
-#| "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
-#| "example) made a series of Macintosh computers based on the PowerPC "
-#| "processor. For purposes of architecture support, they are categorized as "
-#| "NuBus (not supported by Debian), OldWorld, and NewWorld."
 msgid ""
 "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
 "example) made a series of Macintosh computers based on the PowerPC "
@@ -1589,17 +1472,6 @@ msgstr "Субархитектура Nubus PowerMac (не поддерживае
 #. Tag: para
 #: hardware.xml:952
 #, no-c-format
-#| msgid ""
-#| "NuBus systems are not currently supported by Debian/powerpc. The "
-#| "monolithic Linux/PPC kernel architecture does not have support for these "
-#| "machines; instead, one must use the MkLinux Mach microkernel, which "
-#| "Debian does not yet support. These include the following: <itemizedlist> "
-#| "<listitem><para> Power Macintosh 6100, 7100, 8100 </para></listitem> "
-#| "<listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-#| "<listitem><para> Powerbook 1400, 2300, and 5300 </para></listitem> "
-#| "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
-#| "itemizedlist> A linux kernel for these machines and limited support is "
-#| "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgid ""
 "NuBus systems are not currently supported by &debian;/powerpc. The "
 "monolithic Linux/PPC kernel architecture does not have support for these "
@@ -1613,17 +1485,15 @@ msgid ""
 "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgstr ""
 "Системы NuBus на данный момент не поддерживаются &debian;/powerpc. "
-"Монолитная "
-"архитектура ядра Linux/PPC не поддерживается на этих машинах. Следует "
-"использовать микроядро MkLinux Mach, которое &debian; пока не поддерживает. "
-"Это относится к следующим машинам: <itemizedlist> "
+"Монолитная архитектура ядра Linux/PPC не поддерживается на этих машинах. "
+"Следует использовать микроядро MkLinux Mach, которое &debian; пока не "
+"поддерживает. Это относится к следующим машинам: <itemizedlist> "
 "<listitem><para> PowerMacintosh 6100, 7100, 8100 </para></listitem> "
 "<listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
 "<listitem><para> Powerbook 1400, 2300 и 5300 </para></listitem> "
-"<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> "
-"</itemizedlist> Ядро Linux для этих машин и ограниченную "
-"поддержку можно получить на "
-"<ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
+"<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
+"itemizedlist> Ядро Linux для этих машин и ограниченную поддержку можно "
+"получить на <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 
 #. Tag: title
 #: hardware.xml:989
@@ -1686,34 +1556,26 @@ msgstr "машины типа S/390 и zSeries"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
-msgstr ""
-"Полную информацию относительно поддерживаемых машин S/390 и zSeries можно "
-"найти в IBM Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux для IBM eServer zSeries и S/390: "
-"Distributions</ulink> в главе 2.1 или на <ulink url=\"http://www-128.ibm.com/"
-"developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. Вкратце, G5, Multiprise 3000, G6 и все zSeries "
-"полностью поддерживаются; машины Multiprise 2000, G3 и G4 поддерживаются с "
-"эмуляцией плавающей точки IEEE, и из-за этого работают с пониженной "
-"производительностью."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
+msgstr ""
 
 # index.docbook:227, index.docbook:661, index.docbook:759, index.docbook:778, index.docbook:821, index.docbook:863, index.docbook:917, index.docbook:1061, index.docbook:1467
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "Поддержка процессоров и материнских плат"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1727,13 +1589,13 @@ msgstr ""
 "можно ожидать по каждой из них."
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1746,12 +1608,8 @@ msgstr ""
 "wikipedia.org/wiki/SPARCstation\">странице Wikipedia SPARCstation</ulink>."
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
-#| msgid ""
-#| "The last Debian release to support sparc32 was Etch, but even then only "
-#| "for sun4m systems. Support for the other 32-bits subarchitectures had "
-#| "already been discontinued after earlier releases."
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
@@ -1762,13 +1620,13 @@ msgstr ""
 "ранних выпусках."
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1786,13 +1644,13 @@ msgstr ""
 "конфигурациях соответственно."
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1806,7 +1664,7 @@ msgstr ""
 "поддерживаются. Используйте ядро sparc64-smp."
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1816,13 +1674,13 @@ msgstr ""
 "PRIMEPOWER не поддерживаются из-за недостаточной поддержки ядром Linux."
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "Ноутбуки"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1839,21 +1697,14 @@ msgstr ""
 
 # index.docbook:1600, index.docbook:1625, index.docbook:1648
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "Несколько процессоров"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image has been "
-#| "compiled with SMP support. The standard kernel is also usable on non-SMP "
-#| "systems, but has a slight overhead which will cause a small reduction in "
-#| "performance. For normal system use this will hardly be noticable."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1870,15 +1721,8 @@ msgstr ""
 "ли будет заметно."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
-#| msgid ""
-#| "In order to optimize the kernel for single CPU systems, you'll have to "
-#| "replace the standard Debian kernel. <phrase arch=\"linux-any\">You can "
-#| "find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. "
-#| "At this time (kernel version &kernelversion;) the way you disable SMP is "
-#| "to deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
 "replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can "
@@ -1889,21 +1733,13 @@ msgid ""
 msgstr ""
 "Чтобы оптимизировать ядро для однопроцессорных систем, вам нужно заменить "
 "стандартное ядро &debian;. <phrase arch=\"linux-any\">О том, как это "
-"сделать, "
-"можно найти в <xref linkend=\"kernel-baking\"/>. В настоящий момент (версия "
-"ядра &kernelversion;) запретить SMP можно сняв флажок "
-"<quote>&smp-config-option;</quote> в настройках ядра.</phrase>"
+"сделать, можно найти в <xref linkend=\"kernel-baking\"/>. В настоящий момент "
+"(версия ядра &kernelversion;) запретить SMP можно сняв флажок <quote>&smp-"
+"config-option;</quote> в настройках ядра.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image has been "
-#| "compiled with <firstterm>SMP-alternatives</firstterm> support. This means "
-#| "that the kernel will detect the number of processors (or processor cores) "
-#| "and will automatically deactivate SMP on uniprocessor systems."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1920,29 +1756,18 @@ msgstr ""
 "SMP в однопроцессорных системах."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
-#| msgid ""
-#| "The 486 flavour of the Debian kernel image packages for &arch-title; is "
-#| "not compiled with SMP support."
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr ""
 "Вариант 486 пакетов образа ядра &debian; для &arch-title; собран без "
-"поддержки "
-"SMP."
+"поддержки SMP."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. However, the standard Debian &release; kernel image does "
-#| "not support SMP. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. However, the "
@@ -1958,15 +1783,8 @@ msgstr ""
 "использовать только первый процессор."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
-#| msgid ""
-#| "In order to take advantage of multiple processors, you'll have to replace "
-#| "the standard Debian kernel. <phrase arch=\"linux-any\">You can find a "
-#| "discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At "
-#| "this time (kernel version &kernelversion;) the way you enable SMP is to "
-#| "select <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
 "the standard &debian; kernel.<phrase arch=\"linux-any\"> You can find a "
@@ -1976,24 +1794,14 @@ msgid ""
 "quote> section of the kernel config.</phrase>"
 msgstr ""
 "Чтобы получить преимущество использования нескольких процессоров, вам надо "
-"заменить "
-"стандартное ядро &debian;. <phrase arch=\"linux-any\">О том, как это "
-"сделать, "
-"можно найти в <xref linkend=\"kernel-baking\"/>. В настоящий момент (версия "
-"ядра &kernelversion;) разрешить SMP можно установив флажок "
+"заменить стандартное ядро &debian;. <phrase arch=\"linux-any\">О том, как "
+"это сделать, можно найти в <xref linkend=\"kernel-baking\"/>. В настоящий "
+"момент (версия ядра &kernelversion;) разрешить SMP можно установив флажок "
 "<quote>&smp-config-section;</quote> в настройках ядра.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture, and is supported by a precompiled Debian kernel image. "
-#| "Depending on your install media, this SMP-capable kernel may or may not "
-#| "be installed by default. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture, and is supported "
@@ -2005,14 +1813,13 @@ msgstr ""
 "На этой архитектуре поддерживается нескольких процессоров &mdash; так "
 "называемая <quote>симметричная многопроцессорная обработка (symmetric multi-"
 "processing)</quote> или SMP, она уже встроена в поставляемое ядро &debian;. "
-"В зависимости от ваших установочных носителей, "
-"SMP-совместимое ядро может быть установлено по умолчанию. Это не должно "
-"помешать "
-"установке, поскольку стандартное, не-SMP ядро должно загружаться на SMP "
-"системах; ядро просто будет использовать только первый процессор."
+"В зависимости от ваших установочных носителей, SMP-совместимое ядро может "
+"быть установлено по умолчанию. Это не должно помешать установке, поскольку "
+"стандартное, не-SMP ядро должно загружаться на SMP системах; ядро просто "
+"будет использовать только первый процессор."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -2024,15 +1831,8 @@ msgstr ""
 "ядром."
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, no-c-format
-#| msgid ""
-#| "You can also build your own customized kernel to support SMP. <phrase "
-#| "arch=\"linux-any\">You can find a discussion of how to do this in <xref "
-#| "linkend=\"kernel-baking\"/>. At this time (kernel version "
-#| "&kernelversion;) the way you enable SMP is to select <quote>&smp-config-"
-#| "option;</quote> in the <quote>&smp-config-section;</quote> section of the "
-#| "kernel config.</phrase>"
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
 "\"linux-any\"> You can find a discussion of how to do this in <xref linkend="
@@ -2047,20 +1847,27 @@ msgstr ""
 "секции <quote>&smp-config-section;</quote> конфигурации ядра.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "Поддержка видеокарт"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "Вам понадобится VGA-совместимый видео-интерфейс для консольного терминала. "
 "Практически любая современная видеокарта совместима с VGA. Устаревшие "
@@ -2069,20 +1876,20 @@ msgstr ""
 "описанной в этом документе."
 
 #. Tag: para
-#: hardware.xml:1231
-#, no-c-format
+#: hardware.xml:1233
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Debian's support for graphical interfaces is determined by the underlying "
-#| "support found in X.Org's X11 system. Most AGP, PCI and PCIe video cards "
-#| "work under X.Org. Details on supported graphics buses, cards, monitors, "
-#| "and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-#| "Debian &release; ships with X.Org version &x11ver;."
+#| "&debian;'s support for graphical interfaces is determined by the "
+#| "underlying support found in X.Org's X11 system. Most AGP, PCI and PCIe "
+#| "video cards work under X.Org. Details on supported graphics buses, cards, "
+#| "monitors, and pointing devices can be found at <ulink url=\"&url-xorg;"
+#| "\"></ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI and PCIe video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "Поддержка графического интерфейса в &debian; полностью зависит от поддержки "
 "этого интерфейса системой X.Org X11. Большинство видеокарт AGP, PCI и PCIе "
@@ -2091,13 +1898,13 @@ msgstr ""
 "&release; поставляется с X.Org версии &x11ver;."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org X Window System поддерживается только на SGI Indy и O2."
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2117,7 +1924,7 @@ msgstr ""
 "том, как активировать карту."
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2146,13 +1953,13 @@ msgstr ""
 "загрузкой системы."
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Аппаратура для подключения к сети"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2168,7 +1975,7 @@ msgstr ""
 "карт ISA.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2178,61 +1985,61 @@ msgstr ""
 "NIC от Sun:"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "Список поддерживаемых сетевых устройств:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) или ESCON connection (реальная или эмуляция)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet или OSA-Express Fast Ethernet (не-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express в режиме QDIO, HiperSockets и Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2251,19 +2058,19 @@ msgstr ""
 "получить с <ulink url=\"&url-slug-firmware;\">сайта Slug-Firmware</ulink>."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN поддерживается, но не во время установки."
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Карты для беспроводных сетей"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2281,7 +2088,7 @@ msgstr ""
 "микропрограмму во время установки."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2293,7 +2100,7 @@ msgstr ""
 "время установки."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2305,7 +2112,7 @@ msgstr ""
 "алгоритм шифрования, то она не может быть использована при установке."
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2323,15 +2130,8 @@ msgstr ""
 "микропрограмму, которые требуются, и настроить сеть вручную."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
-#| msgid ""
-#| "In some cases the driver you need may not be available as a Debian "
-#| "package. You will then have to look if there is source code available in "
-#| "the internet and compile the driver yourself. How to do this is outside "
-#| "the scope of this manual. <phrase arch=\"x86\">If no Linux driver is "
-#| "available, your last resort is to use the <classname>ndiswrapper</"
-#| "classname> package, which allows you to use a Windows driver.</phrase>"
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
 "package. You will then have to look if there is source code available in the "
@@ -2340,22 +2140,21 @@ msgid ""
 "your last resort is to use the <classname>ndiswrapper</classname> package, "
 "which allows you to use a Windows driver.</phrase>"
 msgstr ""
-"Иногда, нужный драйвер недоступен в виде пакета &debian;. В этом "
-"случае вам придётся "
-"поискать исходный код в интернете и собрать драйвер самостоятельно. Это не "
-"описано в данном руководстве. <phrase arch=\"x86\">Если драйвер под Linux "
-"недоступен, в последнюю очередь можно использовать пакет "
+"Иногда, нужный драйвер недоступен в виде пакета &debian;. В этом случае вам "
+"придётся поискать исходный код в интернете и собрать драйвер самостоятельно. "
+"Это не описано в данном руководстве. <phrase arch=\"x86\">Если драйвер под "
+"Linux недоступен, в последнюю очередь можно использовать пакет "
 "<classname>ndiswrapper</classname>, который позволяет использовать драйвер "
 "от Windows.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "Известные проблемы под &arch-title;"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2365,13 +2164,13 @@ msgstr ""
 "стоит упомянуть."
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "Конфликт драйверов tulip и dfme"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2389,7 +2188,7 @@ msgstr ""
 "то NIC может не работать или работать плохо."
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2403,7 +2202,7 @@ msgstr ""
 "делается смотрите в <xref linkend=\"module-blacklist\"/>)."
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2422,13 +2221,13 @@ msgstr ""
 "перезапуске системы."
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2438,13 +2237,13 @@ msgstr ""
 "blade."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "Дисплеи Брайля"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2462,13 +2261,13 @@ msgstr ""
 "<classname>brltty</classname> версии &brlttyver;."
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "Устройства речевого синтеза"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2489,13 +2288,13 @@ msgstr ""
 "включена <classname>speakup</classname> версии &speakupver;."
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Периферия и другое оборудование"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2507,7 +2306,7 @@ msgstr ""
 "требуется для установки системы."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2518,7 +2317,7 @@ msgstr ""
 "<xref linkend=\"hardware-issues\"/>)."
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2530,7 +2329,7 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2542,7 +2341,7 @@ msgstr ""
 "сети с использованием NFS, HTTP или FTP."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2552,13 +2351,13 @@ msgstr ""
 "PCI-слот."
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "Устройства, которым требуются микропрограммы"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2575,7 +2374,7 @@ msgstr ""
 "а также для некоторых устройств USB и даже контроллеров жёстких дисков."
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2593,7 +2392,7 @@ msgstr ""
 "пакета в архиве в разделе non-free."
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2611,20 +2410,14 @@ msgstr ""
 "linkend=\"loading-firmware\"/>."
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "Покупка аппаратного обеспечения специально для GNU/&arch-kernel;"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
-#| msgid ""
-#| "There are several vendors, who ship systems with Debian or other "
-#| "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-"
-#| "installed</ulink>. You might pay more for the privilege, but it does buy "
-#| "a level of peace of mind, since you can be sure that the hardware is well-"
-#| "supported by GNU/Linux."
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
 "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-installed</"
@@ -2633,14 +2426,13 @@ msgid ""
 "GNU/Linux."
 msgstr ""
 "Некоторые продавцы предлагают системы с <ulink url=\"&url-pre-installed;"
-"\">уже установленным</ulink> &debian; или с другими дистрибутивами GNU/Linux."
-" "
-"Может быть, за это вам придётся заплатить чуть больше, но это плата за "
-"душевный покой, так как в этом случае можно быть уверенным в том, что данное "
-"аппаратное обеспечение хорошо поддерживается GNU/Linux."
+"\">уже установленным</ulink> &debian; или с другими дистрибутивами GNU/"
+"Linux. Может быть, за это вам придётся заплатить чуть больше, но это плата "
+"за душевный покой, так как в этом случае можно быть уверенным в том, что "
+"данное аппаратное обеспечение хорошо поддерживается GNU/Linux."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2656,7 +2448,7 @@ msgstr ""
 "об этом."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2674,13 +2466,13 @@ msgstr ""
 "Поддержите дружественных к &arch-kernel; продавцов аппаратного обеспечения."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Избегайте собственнического или закрытого аппаратного обеспечения"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2694,7 +2486,7 @@ msgstr ""
 "выпускать исходный код под &arch-kernel;."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2710,13 +2502,13 @@ msgstr ""
 "важный рынок."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Аппаратное обеспечение, работающее только в Windows"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2742,7 +2534,7 @@ msgstr ""
 "интеллект."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2781,14 +2573,8 @@ msgstr ""
 "урезают задачи, выполняемые самими устройствами."
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, no-c-format
-#| msgid ""
-#| "You can help improve this situation by encouraging these manufacturers to "
-#| "release the documentation and other resources necessary for us to program "
-#| "their hardware, but the best strategy is simply to avoid this sort of "
-#| "hardware until it is listed as working in the <ulink url=\"&url-hardware-"
-#| "howto;\">Linux Hardware Compatibility HOWTO</ulink>."
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
 "release the documentation and other resources necessary for us to program "
@@ -2800,26 +2586,19 @@ msgstr ""
 "Вы можете повлиять на ситуацию, призвав производителей выпустить "
 "документацию и другие ресурсы необходимые нам для программирования их "
 "устройств, но лучшая стратегия &mdash; просто избегать покупать "
-"устройства<phrase arch=\"linux-any\">, которые не описаны как "
-"работающие в <ulink url=\"&url-hardware-howto;\">Linux Hardware "
-"Compatibility HOWTO</ulink></phrase>."
+"устройства<phrase arch=\"linux-any\">, которые не описаны как работающие в "
+"<ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
+"ulink></phrase>."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "Установочные носители"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
-#| msgid ""
-#| "This section will help you determine which different media types you can "
-#| "use to install Debian. For example, if you have a floppy disk drive on "
-#| "your machine, it can be used to install Debian. There is a whole chapter "
-#| "devoted to media, <xref linkend=\"install-methods\"/>, which lists the "
-#| "advantages and disadvantages of each media type. You may want to refer "
-#| "back to this page once you reach that section."
 msgid ""
 "This section will help you determine which different media types you can use "
 "to install &debian;. For example, if you have a floppy disk drive on your "
@@ -2831,19 +2610,18 @@ msgstr ""
 "Этот раздел поможет определить, какие типы носителей вы можете использовать "
 "для установки &debian;. Например, если на вашей машине есть дисковод гибких "
 "дисков, его можно использовать для установки &debian;. Существует целая "
-"глава, "
-"целиком посвящённая выбору носителей (<xref linkend=\"install-methods\"/>), "
-"в которой перечислены преимущества и недостатки каждого типа. Вы можете "
-"вернуться к этой странице, когда прочитаете эту главу."
+"глава, целиком посвящённая выбору носителей (<xref linkend=\"install-methods"
+"\"/>), в которой перечислены преимущества и недостатки каждого типа. Вы "
+"можете вернуться к этой странице, когда прочитаете эту главу."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "Дискеты"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2855,19 +2633,19 @@ msgstr ""
 "высокой плотности (1440 килобайт)."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "В настоящий момент поддержка дискет для CHRP не работает."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2881,7 +2659,7 @@ msgstr ""
 "очень старые нестандартные (не SCSI и не IDE/ATAPI) приводы CD-ROM."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2901,7 +2679,7 @@ msgstr ""
 "linkend=\"boot-installer\"/>."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2913,7 +2691,7 @@ msgstr ""
 "Linux."
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2923,13 +2701,13 @@ msgstr ""
 "которые поддерживаются драйверами ohci1394 и sbp2."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "IDE/ATAPI CD-ROM поддерживаются на всех машинах ARM."
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2949,13 +2727,13 @@ msgstr ""
 "<quote>System installation</quote> в микропрограмме."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "Жёсткий диск"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2968,7 +2746,7 @@ msgstr ""
 "жёсткий диск."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2978,21 +2756,14 @@ msgstr ""
 "можете установить систему из раздела SunOS (слои UFS)."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "Карта памяти USB"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
-#| msgid ""
-#| "Many Debian boxes need their floppy and/or CD-ROM drives only for setting "
-#| "up the system and for rescue purposes. If you operate some servers, you "
-#| "will probably already have thought about omitting those drives and using "
-#| "an USB memory stick for installing and (when necessary) for recovering "
-#| "the system. This is also useful for small systems which have no room for "
-#| "unnecessary drives."
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
 "up the system and for rescue purposes. If you operate some servers, you will "
@@ -3002,21 +2773,20 @@ msgid ""
 "drives."
 msgstr ""
 "Многим машинам &debian; дисководы гибких и/или компакт-дисков нужны только "
-"для "
-"установки системы и для восстановления. Если вы управляете несколькими "
+"для установки системы и для восстановления. Если вы управляете несколькими "
 "серверами, то вероятно уже не заказываете такие дисководы в комплекте и "
 "используете карты памяти USB для установки и (если необходимо) для "
 "восстановления системы. Также это полезно для маленьких машин, у которых нет "
 "места для ненужных дисководов."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "Сеть"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -3035,7 +2805,7 @@ msgstr ""
 "вы сможете выполнить после завершения установки."
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -3047,7 +2817,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -3057,13 +2827,13 @@ msgstr ""
 "локальной сети и монтированием всех локальных файловых систем через NFS."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Система Un*x или GNU"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -3080,22 +2850,14 @@ msgstr ""
 "linkend=\"linux-upgrade\"/>."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Поддерживаемые системы хранения"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
-#| msgid ""
-#| "The Debian boot disks contain a kernel which is built to maximize the "
-#| "number of systems it runs on. Unfortunately, this makes for a larger "
-#| "kernel, which includes many drivers that won't be used for your "
-#| "machine<phrase arch=\"linux-any\"> (see <xref linkend=\"kernel-baking\"/> "
-#| "to learn how to build your own kernel)</phrase>. Support for the widest "
-#| "possible range of devices is desirable in general, to ensure that Debian "
-#| "can be installed on the widest array of hardware."
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
 "number of systems it runs on. Unfortunately, this makes for a larger kernel, "
@@ -3113,17 +2875,11 @@ msgstr ""
 ">, чтобы научиться создавать своё собственное ядро)</phrase>. Поддержка как "
 "можно большего количества типов устройств в целом желательна, так как это "
 "даёт уверенность в том, что &debian; сможет быть установлен на широком "
-"спектре "
-"оборудования."
+"спектре оборудования."
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
-#| msgid ""
-#| "Generally, the Debian installation system includes support for floppies, "
-#| "IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, "
-#| "SATA and SCSI controllers and drives, USB, and FireWire. The supported "
-#| "file systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
 "IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, "
@@ -3132,11 +2888,11 @@ msgid ""
 msgstr ""
 "Система установки &debian; включает поддержку дискет, дисков IDE (также "
 "известных как PATA), дискет IDE, устройств IDE, подключаемых к параллельному "
-"порту, контроллеров/дисков SATA и SCSI, USB и FireWire. "
-"Поддерживаются файловые системы FAT, Win-32 расширения FAT (VFAT) и NTFS."
+"порту, контроллеров/дисков SATA и SCSI, USB и FireWire. Поддерживаются "
+"файловые системы FAT, Win-32 расширения FAT (VFAT) и NTFS."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -3152,7 +2908,7 @@ msgstr ""
 "Hardware Compatibility HOWTO</ulink>."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3176,7 +2932,7 @@ msgstr ""
 "SPARC</ulink>."
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3188,7 +2944,7 @@ msgstr ""
 "поддерживает гибкие диски на системах CHRP вообще."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3200,7 +2956,7 @@ msgstr ""
 "поддерживает дисководы."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3210,7 +2966,7 @@ msgstr ""
 "также системой загрузки."
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3222,13 +2978,13 @@ msgstr ""
 "старой схемой дисков Linux (ldl) и новой общей схемой дисков S/390 (cdl)."
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Требования к памяти и дисковому пространству"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3242,7 +2998,7 @@ msgstr ""
 "смотрите в <xref linkend=\"minimum-hardware-reqts\"/>."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -3262,3 +3018,23 @@ msgstr ""
 "обычная. </para> </footnote> или дискового пространства может быть возможна, "
 "но только для опытных пользователей."
 
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "Полную информацию относительно поддерживаемых машин S/390 и zSeries можно "
+#~ "найти в IBM Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
+#~ "redbooks/sg246264.pdf\"> Linux для IBM eServer zSeries и S/390: "
+#~ "Distributions</ulink> в главе 2.1 или на <ulink url=\"http://www-128.ibm."
+#~ "com/developerworks/linux/linux390/index.html\">zSeries page at the "
+#~ "developerWorks</ulink>. Вкратце, G5, Multiprise 3000, G6 и все zSeries "
+#~ "полностью поддерживаются; машины Multiprise 2000, G3 и G4 поддерживаются "
+#~ "с эмуляцией плавающей точки IEEE, и из-за этого работают с пониженной "
+#~ "производительностью."
diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index d86f6bdfb..bfdc2b02c 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-25 10:31+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: install-methods.xml:5
@@ -34,20 +34,6 @@ msgstr "Официальный набор компакт-дисков &debian-gn
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official Debian "
-#| "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-#| "debian-cd-vendors;\">CD vendors page</ulink>). You may also download the "
-#| "CD-ROM images from a Debian mirror and make your own set, if you have a "
-#| "fast network connection and a CD burner (see the <ulink url=\"&url-debian-"
-#| "cd;\">Debian CD page</ulink> for detailed instructions). If you have a "
-#| "Debian CD set and CDs are bootable on your machine, you can skip right to "
-#| "<xref linkend=\"boot-installer\"/>; much effort has been expended to "
-#| "ensure the files most people need are there on the CD. Although a full "
-#| "set of binary packages requires several CDs, it is unlikely you will need "
-#| "packages on the third CD and above. You may also consider using the DVD "
-#| "version, which saves a lot of space on your shelf and you avoid the CD "
-#| "shuffling marathon."
 msgid ""
 "By far the easiest way to install &debian-gnu; is from an Official &debian; "
 "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
@@ -81,18 +67,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:30
 #, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the Debian network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
 msgid ""
 "If your machine doesn't support CD booting, but you do have a CD set, you "
 "can use an alternative strategy such as <phrase condition=\"supports-floppy-"
@@ -150,16 +124,12 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:83
 #, no-c-format
-#| msgid "Downloading Files from Debian Mirrors"
 msgid "Downloading Files from &debian; Mirrors"
 msgstr "Скачивание файлов с серверов-зеркал &debian;"
 
 #. Tag: para
 #: install-methods.xml:85
 #, no-c-format
-#| msgid ""
-#| "To find the nearest (and thus probably the fastest) mirror, see the "
-#| "<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</ulink>."
 msgid ""
 "To find the nearest (and thus probably the fastest) mirror, see the <ulink "
 "url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
@@ -171,17 +141,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:90
 #, no-c-format
-#| msgid ""
-#| "When downloading files from a Debian mirror using FTP, be sure to "
-#| "download the files in <emphasis>binary</emphasis> mode, not text or "
-#| "automatic mode."
 msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
 msgstr ""
 "При скачивании файлов с сервера-зеркала &debian; по протоколу FTP проверьте, "
-"что "
-"загружаете файлы в <emphasis>двоичном</emphasis>, а не текстовом или "
+"что загружаете файлы в <emphasis>двоичном</emphasis>, а не текстовом или "
 "автоматическом режиме."
 
 #. Tag: title
@@ -193,12 +158,6 @@ msgstr "Где искать установочные образы"
 #. Tag: para
 #: install-methods.xml:100
 #, no-c-format
-#| msgid ""
-#| "The installation images are located on each Debian mirror in the "
-#| "directory <ulink url=\"&url-debian-installer;images\">debian/dists/"
-#| "&releasename;/main/installer-&architecture;/current/images/</ulink> "
-#| "&mdash; the <ulink url=\"&url-debian-installer;images/MANIFEST"
-#| "\">MANIFEST</ulink> lists each image and its purpose."
 msgid ""
 "The installation images are located on each &debian; mirror in the directory "
 "<ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/"
@@ -261,10 +220,6 @@ msgstr "Файлы установки для GLAN Tank"
 #. Tag: para
 #: install-methods.xml:139
 #, no-c-format
-#| msgid ""
-#| "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &glantank-firmware-img;."
 msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
 "on which you intend to install &debian;. These images can be obtained from "
@@ -283,10 +238,6 @@ msgstr "Файлы установки для Kurobox Pro"
 #. Tag: para
 #: install-methods.xml:150
 #, no-c-format
-#| msgid ""
-#| "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &kuroboxpro-firmware-img;."
 msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
 "disk on which you intend to install &debian;. These images can be obtained "
@@ -448,12 +399,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:291
 #, no-c-format
-#| msgid ""
-#| "Before you can create the floppies, you will first need to download them "
-#| "from one of the Debian mirrors, as explained in <xref linkend="
-#| "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
-#| "installation CD-ROM or DVD, the floppy images may also be included on the "
-#| "CD/DVD.</phrase>"
 msgid ""
 "Before you can create the floppies, you will first need to download them "
 "from one of the &debian; mirrors, as explained in <xref linkend="
@@ -461,9 +406,8 @@ msgid ""
 "installation CD-ROM or DVD, the floppy images may also be included on the CD/"
 "DVD.</phrase>"
 msgstr ""
-"Перед тем как сделать установочные дискеты, вам нужно скачать их с одного "
-"из серверов-зеркал &debian; (смотрите <xref linkend=\"downloading-files\"/>)."
-" "
+"Перед тем как сделать установочные дискеты, вам нужно скачать их с одного из "
+"серверов-зеркал &debian; (смотрите <xref linkend=\"downloading-files\"/>). "
 "<phrase arch=\"i386\">Если у вас уже есть установочный CD-ROM или DVD, то "
 "образы дискет могут быть уже на этих CD/DVD.</phrase>"
 
@@ -615,15 +559,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:389
 #, no-c-format
-#| msgid ""
-#| "These tools can be found on the Official Debian CD-ROMs under the "
-#| "<filename>/tools</filename> directory."
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
 "<filename>/tools</filename> directory."
 msgstr ""
-"Эти утилиты можно найти на официальных компакт-дисках &debian; в "
-"каталоге <filename>/tools</filename>."
+"Эти утилиты можно найти на официальных компакт-дисках &debian; в каталоге "
+"<filename>/tools</filename>."
 
 #. Tag: title
 #: install-methods.xml:402
@@ -634,15 +575,6 @@ msgstr "Запись образов дисков из MacOS"
 #. Tag: para
 #: install-methods.xml:403
 #, no-c-format
-#| msgid ""
-#| "An AppleScript, <application>Make Debian Floppy</application>, is "
-#| "available for burning floppies from the provided disk image files. It can "
-#| "be downloaded from <ulink url=\"ftp://ftp2.sourceforge.net/pub/"
-#| "sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink>. To use it, "
-#| "just unstuff it on your desktop, and then drag any floppy image file to "
-#| "it. You must have Applescript installed and enabled in your extensions "
-#| "manager. Disk Copy will ask you to confirm that you wish to erase the "
-#| "floppy and proceed to write the file image to it."
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
 "available for burning floppies from the provided disk image files. It can be "
@@ -658,8 +590,7 @@ msgstr ""
 "sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></"
 "ulink>. Просто поместите его на рабочий стол, затем перетащите на него любой "
 "файл образа дискеты. У вас должен быть установлен Applescript и включён в "
-"менеджере "
-"расширений. Disk Copy попросит вас подтвердить, что вы хотите "
+"менеджере расширений. Disk Copy попросит вас подтвердить, что вы хотите "
 "стереть дискету и записать на неё образ файла."
 
 #. Tag: para
@@ -685,11 +616,6 @@ msgstr "Запись образов дисков с помощью <command>Disk
 #. Tag: para
 #: install-methods.xml:426
 #, no-c-format
-#| msgid ""
-#| "If you are creating the floppy image from files which were originally on "
-#| "the official &debian-gnu; CD, then the Type and Creator are already set "
-#| "correctly. The following <command>Creator-Changer</command> steps are "
-#| "only necessary if you downloaded the image files from a Debian mirror."
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
 "official &debian-gnu; CD, then the Type and Creator are already set "
@@ -698,9 +624,8 @@ msgid ""
 msgstr ""
 "Если вы создаёте дискету из образа файла, который взят с официального "
 "&debian-gnu; CD, то Тип и Создатель уже установлены правильно. Следующие "
-"шаги "
-"<command>Creator-Changer</command> необходимы только если вы скачали файлы "
-"образов с сервера-зеркала &debian;."
+"шаги <command>Creator-Changer</command> необходимы только если вы скачали "
+"файлы образов с сервера-зеркала &debian;."
 
 #. Tag: para
 #: install-methods.xml:435
@@ -837,12 +762,6 @@ msgstr "Подготовка файлов для загрузки с карты
 #. Tag: para
 #: install-methods.xml:532
 #, no-c-format
-#| msgid ""
-#| "There are two installation methods possible when booting from USB stick. "
-#| "The first is to install completely from the network. The second is to "
-#| "also copy a CD image onto the USB stick and use that as a source for "
-#| "packages, possibly in combination with a mirror. This second method is "
-#| "the more common."
 msgid ""
 "There are two installation methods possible when booting from USB stick. The "
 "first is to only use the USB stick to boot the installer, and then install "
@@ -851,10 +770,9 @@ msgid ""
 "with a mirror."
 msgstr ""
 "Есть два способа установки при загрузке с карты памяти USB. Первый "
-"предназначен для установки полностью из сети. Во втором "
-"на карту памяти USB также копируется образ CD "
-"и используется как источник пакетов, возможно совместно с "
-"сервером-зеркалом."
+"предназначен для установки полностью из сети. Во втором на карту памяти USB "
+"также копируется образ CD и используется как источник пакетов, возможно "
+"совместно с сервером-зеркалом."
 
 #. Tag: para
 #: install-methods.xml:540
@@ -896,11 +814,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:560
 #, no-c-format
-#| msgid ""
-#| "For the first installation method you'll need to download an installer "
-#| "image from the <filename>netboot</filename> directory (at the location "
-#| "mentioned in <xref linkend=\"where-files\"/>) and use the <quote>flexible "
-#| "way</quote> explained below to copy the files to the USB stick."
 msgid ""
 "To prepare a USB stick that only boots the installer, which then proceeds to "
 "install entirely from the network, you'll need to download the "
@@ -911,14 +824,12 @@ msgid ""
 "megabytes in size."
 msgstr ""
 "Для подготовки карты памяти USB, которая используется только для загрузки "
-"программы установки, а всё остальное скачивает из сети, "
-"вам нужно скачать образ <filename>mini.iso</filename> из "
-"каталога <filename>netboot</filename> (о том, где этот каталог "
-"см. <xref linkend=\"where-files\"/>) записать этот файл напрямую на карту "
-"памяти USB, "
-"перезаписывая её текущее содержимое. Этот способ удобен при "
-"использовании карт памяти USB очень маленького размера (достаточно "
-"нескольких мегабайт)."
+"программы установки, а всё остальное скачивает из сети, вам нужно скачать "
+"образ <filename>mini.iso</filename> из каталога <filename>netboot</filename> "
+"(о том, где этот каталог см. <xref linkend=\"where-files\"/>) записать этот "
+"файл напрямую на карту памяти USB, перезаписывая её текущее содержимое. Этот "
+"способ удобен при использовании карт памяти USB очень маленького размера "
+"(достаточно нескольких мегабайт)."
 
 #. Tag: para
 #: install-methods.xml:570
@@ -935,18 +846,15 @@ msgid ""
 "two partitions should now be visible on it. You should mount the second of "
 "the two partitions, and unpack the firmware onto it."
 msgstr ""
-"Например, используя имеющуюся систему GNU/Linux, файл "
-"<filename>mini.iso</filename> можно записать на карту памяти USB так: "
-"<informalexample><screen>\n"
+"Например, используя имеющуюся систему GNU/Linux, файл <filename>mini.iso</"
+"filename> можно записать на карту памяти USB так: <informalexample><screen>\n"
 "# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
 "# sync\n"
-"</screen></informalexample> Чтобы добавить на созданную таким "
-"образом карту памяти USB, сначала нужно их получить. "
-"Подробности смотрите в <xref linkend=\"loading-"
-"firmware\"/>. Сейчас выдерните и снова вставьте карту памяти USB, "
-"теперь на ней должно появиться два раздела. "
-"Вам нужно смонтировать второй и распаковать микропрограмму "
-"на него."
+"</screen></informalexample> Чтобы добавить на созданную таким образом карту "
+"памяти USB, сначала нужно их получить. Подробности смотрите в <xref linkend="
+"\"loading-firmware\"/>. Сейчас выдерните и снова вставьте карту памяти USB, "
+"теперь на ней должно появиться два раздела. Вам нужно смонтировать второй и "
+"распаковать микропрограмму на него."
 
 #. Tag: screen
 #: install-methods.xml:582
@@ -967,18 +875,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:584
 #, no-c-format
-#| msgid ""
-#| "Installation images for the second installation method can be found in "
-#| "the <filename>hd-media</filename> directory and either the <quote>easy "
-#| "way</quote> or the <quote>flexible way</quote> can be used to copy the "
-#| "image to the USB stick. For this installation method you will also need "
-#| "to download a CD image. The installation image and the CD image must be "
-#| "based on the same release of &d-i;. If they do not match you are likely "
-#| "to get errors<footnote> <para> The error message that is most likely to "
-#| "be displayed is that no kernel modules can be found. This means that the "
-#| "version of the kernel module udebs included on the CD image is different "
-#| "from the version of the running kernel. </para> </footnote> during the "
-#| "installation."
 msgid ""
 "To prepare a USB stick that installs packages from a CD image included on "
 "the stick, use the installer images found in the <filename>hd-media</"
@@ -992,18 +888,16 @@ msgid ""
 "included on the CD image is different from the version of the running "
 "kernel. </para> </footnote> during the installation."
 msgstr ""
-"Для подготовки карты памяти USB, которая устанавливает пакеты из "
-"образа CD, имеющегося на карте, используйте образы из каталога "
-"<filename>hd-media</filename>. "
-"Для копирования образа на карту можно использовать или "
-"<quote>простой способ</quote>, или <quote>гибкий способ</quote>. "
-"Для этого способа установки также потребуется скачать CD-образ. Установочный "
-"образ и "
+"Для подготовки карты памяти USB, которая устанавливает пакеты из образа CD, "
+"имеющегося на карте, используйте образы из каталога <filename>hd-media</"
+"filename>. Для копирования образа на карту можно использовать или "
+"<quote>простой способ</quote>, или <quote>гибкий способ</quote>. Для этого "
+"способа установки также потребуется скачать CD-образ. Установочный образ и "
 "CD-образ должны быть одного выпуска &d-i;. Если они разных выпусков то, "
-"вероятно, вы получите ошибки <footnote> <para>Сообщение об ошибке "
-"будет, скорее всего, говорить о ненайденных модулях ядра. Это означает, что "
-"версия модулей ядра udeb с образа CD отличается от версии запущенного ядра.</"
-"para> </footnote> при установке."
+"вероятно, вы получите ошибки <footnote> <para>Сообщение об ошибке будет, "
+"скорее всего, говорить о ненайденных модулях ядра. Это означает, что версия "
+"модулей ядра udeb с образа CD отличается от версии запущенного ядра.</para> "
+"</footnote> при установке."
 
 #. Tag: para
 #: install-methods.xml:604
@@ -1025,12 +919,6 @@ msgstr "Копирование файлов &mdash; лёгкий путь"
 #. Tag: para
 #: install-methods.xml:613
 #, no-c-format
-#| msgid ""
-#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
-#| "which contains all the installer files (including the kernel) <phrase "
-#| "arch=\"x86\">as well as <classname>syslinux</classname> and its "
-#| "configuration file.</phrase> <phrase arch=\"powerpc\">as well as "
-#| "<classname>yaboot</classname> and its configuration file.</phrase>"
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
 "contains all the installer files (including the kernel) <phrase arch="
@@ -1039,11 +927,10 @@ msgid ""
 "classname> and its configuration file</phrase>."
 msgstr ""
 "Существует файл \"всё-в-одном\" &mdash; <filename>hd-media/boot.img.gz</"
-"filename>, который содержит все файлы программы установки (включая ядро) <"
-"phrase arch="
-"\"x86\">, а также <command>syslinux</command> и его файл настройки</phrase> "
-"<phrase arch=\"powerpc\">, а также <classname>yaboot</classname> и его файл "
-"настройки</phrase>."
+"filename>, который содержит все файлы программы установки (включая ядро) "
+"<phrase arch=\"x86\">, а также <command>syslinux</command> и его файл "
+"настройки</phrase> <phrase arch=\"powerpc\">, а также <classname>yaboot</"
+"classname> и его файл настройки</phrase>."
 
 #. Tag: para
 #: install-methods.xml:622
@@ -1099,15 +986,6 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 #. Tag: para
 #: install-methods.xml:646
 #, no-c-format
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
-#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
-#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a Debian netinst "
-#| "or businesscard ISO image to it. Unmount the stick (<userinput>umount /"
-#| "mnt</userinput>) and you are done."
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -1121,8 +999,7 @@ msgstr ""
 "После этого, смонтируйте карту памяти USB <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
 "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</"
-"replaceable> /mnt</userinput>), "
-"</phrase> которая теперь имеет <phrase arch="
+"replaceable> /mnt</userinput>), </phrase> которая теперь имеет <phrase arch="
 "\"x86\">файловую систему FAT</phrase> <phrase arch=\"powerpc\">файловую "
 "систему HFS</phrase> и скопируйте на неё ISO-образ &debian; netinst или "
 "businesscard. Размонтируйте устройство (<userinput>umount /mnt</userinput>) "
@@ -1169,18 +1046,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:685
 #, no-c-format
-#| msgid ""
-#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
-#| "you probably won't have to repartition or reformat the stick. If you have "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition<footnote> <para> Don't "
-#| "forget to set the <quote>bootable</quote> bootable flag. </para> </"
-#| "footnote>, and then create the filesystem using: "
-#| "<informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> Debian package."
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -1300,20 +1165,11 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> Для графической версии программы установки нужно "
-"добавить <userinput>vga=788</userinput> во вторую "
-"строку."
+"добавить <userinput>vga=788</userinput> во вторую строку."
 
 #. Tag: para
 #: install-methods.xml:768
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image<footnote> <para> You can use either a businesscard, a "
-#| "netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
-#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
-#| "iso</filename></quote> image is not usable for this purpose. </para> </"
-#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
-#| "(<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1334,19 +1190,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:792
 #, no-c-format
-#| msgid ""
-#| "Most USB sticks do not come pre-configured in such a way that Open "
-#| "Firmware can boot from them, so you will need to repartition the stick. "
-#| "On Mac systems, run <userinput>mac-fdisk /dev/<replaceable>sdX</"
-#| "replaceable></userinput>, initialise a new partition map using the "
-#| "<userinput>i</userinput> command, and create a new partition of type "
-#| "Apple_Bootstrap using the <userinput>C</userinput> command. (Note that "
-#| "the first \"partition\" will always be the partition map itself.) Then "
-#| "type <informalexample><screen>\n"
-#| "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>hformat</command> command is "
-#| "contained in the <classname>hfsutils</classname> Debian package."
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
 "can boot from them, so you will need to repartition the stick. On Mac "
@@ -1499,11 +1342,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:878
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image (businesscard, netinst or full CD image; be sure to "
-#| "select one that fits) onto the stick. When you are done, unmount the USB "
-#| "memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
@@ -1640,18 +1478,14 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:960
 #, no-c-format
-#| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
-#| "filename>."
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
 "on your hard drive (note that LILO can not boot from files on an NTFS file "
 "system), for instance to <filename>/boot/newinstall/</filename>."
 msgstr ""
-"Скопируйте следующие файлы из архива &debian; в любое место на жёстком "
-"диске (заметим, что загрузчик LILO не способен загружать файлы из "
-"файловой системы NTFS), например, в <filename>/boot/newinstall/</filename>."
+"Скопируйте следующие файлы из архива &debian; в любое место на жёстком диске "
+"(заметим, что загрузчик LILO не способен загружать файлы из файловой системы "
+"NTFS), например, в <filename>/boot/newinstall/</filename>."
 
 #. Tag: para
 #: install-methods.xml:968
@@ -1678,46 +1512,37 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:990
 #, no-c-format
-#| msgid ""
-#| "Hard disk installer booting using <command>LILO</command> or "
-#| "<command>GRUB</command>"
 msgid "Hard disk installer booting using <command>loadlin</command>"
 msgstr ""
-"Загрузка программы установки с жёсткого диска с помощью <command>loadlin<"
-"/command>"
+"Загрузка программы установки с жёсткого диска с помощью <command>loadlin</"
+"command>"
 
 #. Tag: para
 #: install-methods.xml:991
 #, no-c-format
-#| msgid ""
-#| "This section explains how to add to or even replace an existing linux "
-#| "installation using either <command>LILO</command> or <command>GRUB</"
-#| "command>."
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
 "installer from DOS using <command>loadlin</command>."
 msgstr ""
-"Этот раздел описывает как подготовить жёсткий диск для загрузки "
-"программы установки из DOS с помощью <command>loadlin</command>."
+"Этот раздел описывает как подготовить жёсткий диск для загрузки программы "
+"установки из DOS с помощью <command>loadlin</command>."
 
 #. Tag: para
 #: install-methods.xml:996
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
+#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
-"Скопируйте следующие файлы из образа &debian; CD на <filename>c:\\</filename>"
-"."
+"Скопируйте следующие файлы из образа &debian; CD на <filename>c:\\</"
+"filename>."
 
 #. Tag: para
 #: install-methods.xml:1001
 #, no-c-format
-#| msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr "<filename>/&x86-install-dir;</filename> (файл ядра и образ ramdisk)"
@@ -1725,7 +1550,6 @@ msgstr "<filename>/&x86-install-dir;</filename> (файл ядра и образ
 #. Tag: para
 #: install-methods.xml:1006
 #, no-c-format
-#| msgid "<filename>boot.msg</filename> (optional boot message)"
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (утилита loadlin)"
 
@@ -1738,16 +1562,6 @@ msgstr "Загрузка программы установки с жёстког
 #. Tag: para
 #: install-methods.xml:1020
 #, no-c-format
-#| msgid ""
-#| "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
-#| "application> to launch Linux installation, but <application>miBoot</"
-#| "application> cannot easily be used for hard disk booting. "
-#| "<application>BootX</application>, launched from MacOS, supports booting "
-#| "from files placed on the hard disk. <application>BootX</application> can "
-#| "also be used to dual-boot MacOS and Linux after your Debian installation "
-#| "is complete. For the Performa 6360, it appears that <command>quik</"
-#| "command> cannot make the hard disk bootable. So <application>BootX</"
-#| "application> is required on that model."
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
 "application> to launch Linux installation, but <application>miBoot</"
@@ -1772,18 +1586,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1033
 #, no-c-format
-#| msgid ""
-#| "Download and unstuff the <application>BootX</application> distribution, "
-#| "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
-#| "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-#| "directory on Debian http/ftp mirrors and official Debian CDs. Use "
-#| "<application>Stuffit Expander</application> to extract it from its "
-#| "archive. Within the package, there is an empty folder called "
-#| "<filename>Linux Kernels</filename>. Download <filename>linux.bin</"
-#| "filename> and <filename>ramdisk.image.gz</filename> from the "
-#| "<filename>disks-powerpc/current/powermac</filename> folder, and place "
-#| "them in the <filename>Linux Kernels</filename> folder. Then place the "
-#| "<filename>Linux Kernels</filename> folder in the active System Folder."
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
 "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
@@ -1798,19 +1600,16 @@ msgid ""
 "active System Folder."
 msgstr ""
 "Скачайте и распакуйте дистрибутив <application>BootX</application>, "
-"доступный из <ulink url=\"&url-powerpc-bootx;\"></ulink>, или в "
-"каталоге <filename>dists/woody/main/disks-powerpc/current/powermac</filename>"
-" "
-"на серверах-зеркалах &debian; http/ftp и официальных &debian; CD. "
+"доступный из <ulink url=\"&url-powerpc-bootx;\"></ulink>, или в каталоге "
+"<filename>dists/woody/main/disks-powerpc/current/powermac</filename> на "
+"серверах-зеркалах &debian; http/ftp и официальных &debian; CD. "
 "Воспользуйтесь <application>Stuffit Expander</application>, чтобы "
-"распаковать "
-"его из архива. Внутри пакета есть пустой каталог с именем "
-"<filename>Linux Kernels</filename>. Скачайте "
-"<filename>linux.bin</filename> "
-"и <filename>ramdisk.image.gz</filename> из <filename>disks-powerpc/"
-"current/powermac</filename>, и поместите их в каталог <filename>Linux "
-"Kernels</filename>. Затем переместите каталог <filename>Linux Kernels</"
-"filename> в активный System Folder."
+"распаковать его из архива. Внутри пакета есть пустой каталог с именем "
+"<filename>Linux Kernels</filename>. Скачайте <filename>linux.bin</filename> "
+"и <filename>ramdisk.image.gz</filename> из <filename>disks-powerpc/current/"
+"powermac</filename>, и поместите их в каталог <filename>Linux Kernels</"
+"filename>. Затем переместите каталог <filename>Linux Kernels</filename> в "
+"активный System Folder."
 
 #. Tag: title
 #: install-methods.xml:1053
@@ -1842,11 +1641,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1065
 #, no-c-format
-#| msgid ""
-#| "<emphasis>Copy</emphasis> (not move) the following four files which you "
-#| "downloaded earlier from the Debian archives, onto the root level of your "
-#| "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
-#| "each file to the hard drive icon)."
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
 "downloaded earlier from the &debian; archives, onto the root level of your "
@@ -1975,9 +1769,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1152
 #, no-c-format
-#| msgid ""
-#| "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. "
-#| "There is an <classname>rbootd</classname> package available in Debian."
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
 "is an <classname>rbootd</classname> package available in &debian;."
@@ -2258,37 +2049,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1273
 #, no-c-format
-#| msgid ""
-#| "To use CMU <command>bootpd</command>, you must first uncomment (or add) "
-#| "the relevant line in <filename>/etc/inetd.conf</filename>. On &debian-"
-#| "gnu;, you can run <userinput>update-inetd --enable bootps</userinput>, "
-#| "then <userinput>/etc/init.d/inetd reload</userinput> to do so. Just in "
-#| "case your BOOTP server does not run Debian, the line in question should "
-#| "look like: <informalexample><screen>\n"
-#| "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-#| "</screen></informalexample> Now, you must create an <filename>/etc/"
-#| "bootptab</filename> file. This has the same sort of familiar and cryptic "
-#| "format as the good old BSD <filename>printcap</filename>, "
-#| "<filename>termcap</filename>, and <filename>disktab</filename> files. See "
-#| "the <filename>bootptab</filename> manual page for more information. For "
-#| "CMU <command>bootpd</command>, you will need to know the hardware (MAC) "
-#| "address of the client. Here is an example <filename>/etc/bootptab</"
-#| "filename>: <informalexample><screen>\n"
-#| "client:\\\n"
-#| "  hd=/tftpboot:\\\n"
-#| "  bf=tftpboot.img:\\\n"
-#| "  ip=192.168.1.90:\\\n"
-#| "  sm=255.255.255.0:\\\n"
-#| "  sa=192.168.1.1:\\\n"
-#| "  ha=0123456789AB:\n"
-#| "</screen></informalexample> You will need to change at least the "
-#| "<quote>ha</quote> option, which specifies the hardware address of the "
-#| "client. The <quote>bf</quote> option specifies the file a client should "
-#| "retrieve via TFTP; see <xref linkend=\"tftp-images\"/> for more details. "
-#| "<phrase arch=\"mips\"> On SGI machines you can just enter the command "
-#| "monitor and type <userinput>printenv</userinput>. The value of the "
-#| "<userinput>eaddr</userinput> variable is the machine's MAC address. </"
-#| "phrase>"
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
 "relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you "
@@ -2333,8 +2093,7 @@ msgstr ""
 "<filename>termcap</filename> и <filename>disktab</filename>. Подробности "
 "смотрите в справочной странице <filename>bootptab</filename>. Для CMU "
 "<command>bootpd</command> вам нужно знать аппаратный адрес (MAC) клиента. "
-"Вот пример <filename>/etc/bootptab</filename>: "
-"<informalexample><screen>\n"
+"Вот пример <filename>/etc/bootptab</filename>: <informalexample><screen>\n"
 "client:\\\n"
 "  hd=/tftpboot:\\\n"
 "  bf=tftpboot.img:\\\n"
@@ -2427,12 +2186,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1350
 #, no-c-format
-#| msgid ""
-#| "All <command>in.tftpd</command> alternatives available in Debian should "
-#| "log TFTP requests to the system logs by default. Some of them support a "
-#| "<userinput>-v</userinput> argument to increase verbosity. It is "
-#| "recommended to check these log messages in case of boot problems as they "
-#| "are a good starting point for diagnosing the cause of errors."
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
 "log TFTP requests to the system logs by default. Some of them support a "
@@ -2442,28 +2195,14 @@ msgid ""
 msgstr ""
 "По умолчанию, все альтернативные программы <command>in.tftpd</command>, "
 "доступные в &debian;, протоколируют запросы TFTP в системный журнал. "
-"Некоторые "
-"из них имеют параметр <userinput>-v</userinput>, позволяющий включить более "
-"подробный протокол. Рекомендуется проверить эти сообщения в журнале в случае "
-"возникновения проблем с загрузкой; это хорошая отправная точка при поиске "
-"причин ошибок."
+"Некоторые из них имеют параметр <userinput>-v</userinput>, позволяющий "
+"включить более подробный протокол. Рекомендуется проверить эти сообщения в "
+"журнале в случае возникновения проблем с загрузкой; это хорошая отправная "
+"точка при поиске причин ошибок."
 
 #. Tag: para
 #: install-methods.xml:1358
 #, no-c-format
-#| msgid ""
-#| "If you intend to install Debian on an SGI machine and your TFTP server is "
-#| "a GNU/Linux box running Linux 2.4, you'll need to set the following on "
-#| "your server: <informalexample><screen>\n"
-#| "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-#| "</screen></informalexample> to turn off Path MTU discovery, otherwise the "
-#| "SGI's PROM can't download the kernel. Furthermore, make sure TFTP packets "
-#| "are sent from a source port no greater than 32767, or the download will "
-#| "stall after the first packet. Again, it's Linux 2.4.X tripping this bug "
-#| "in the PROM, and you can avoid it by setting <informalexample><screen>\n"
-#| "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-#| "</screen></informalexample> to adjust the range of source ports the Linux "
-#| "TFTP server uses."
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
 "a GNU/Linux box running Linux 2.4, you'll need to set the following on your "
@@ -2660,12 +2399,6 @@ msgstr "Автоматическая установка"
 #. Tag: para
 #: install-methods.xml:1591
 #, no-c-format
-#| msgid ""
-#| "For installing on multiple computers it's possible to do fully automatic "
-#| "installations. Debian packages intended for this include <classname>fai</"
-#| "classname> (which uses an install server), <classname>replicator</"
-#| "classname>, <classname>systemimager</classname>, <classname>autoinstall</"
-#| "classname>, and the Debian Installer itself."
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
 "installations. &debian; packages intended for this include <classname>fai-"
@@ -2673,27 +2406,21 @@ msgid ""
 "Installer itself. Have a look at the <ulink url=\"http://fai-project.org"
 "\">FAI home page</ulink> for detailed information."
 msgstr ""
-"Для установки на несколько компьютеров можно воспользоваться "
-"полностью автоматической установкой. Необходимые пакеты &debian;: "
-"<classname>fai-quickstart</classname> (используется сервером установки) "
-"и сама программа установки &debian;. Подробная информация представлена "
-"на <ulink url=\"http://fai-project.org\">домашней странице FAI</ulink>."
+"Для установки на несколько компьютеров можно воспользоваться полностью "
+"автоматической установкой. Необходимые пакеты &debian;: <classname>fai-"
+"quickstart</classname> (используется сервером установки) и сама программа "
+"установки &debian;. Подробная информация представлена на <ulink url=\"http://"
+"fai-project.org\">домашней странице FAI</ulink>."
 
 #. Tag: title
 #: install-methods.xml:1603
 #, no-c-format
-#| msgid "Automatic Installation Using the Debian Installer"
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Автоматическая установка с помощью программы установки &debian;"
 
 #. Tag: para
 #: install-methods.xml:1604
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer supports automating installs via preconfiguration "
-#| "files. A preconfiguration file can be loaded from the network or from "
-#| "removable media, and used to fill in answers to questions asked during "
-#| "the installation process."
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
 "files. A preconfiguration file can be loaded from the network or from "
@@ -2701,10 +2428,9 @@ msgid ""
 "installation process."
 msgstr ""
 "Программа установки &debian; поддерживает автоматическую установку через "
-"файлы "
-"автоматической установки. Файл автоматической установки может быть загружен "
-"по сети или со сменного носителя, и используется для ответов на вопросы, "
-"задаваемые во время процесса установки."
+"файлы автоматической установки. Файл автоматической установки может быть "
+"загружен по сети или со сменного носителя, и используется для ответов на "
+"вопросы, задаваемые во время процесса установки."
 
 #. Tag: para
 #: install-methods.xml:1611
diff --git a/po/ru/installation-howto.po b/po/ru/installation-howto.po
index 3f4fdf3d6..8dd702d09 100644
--- a/po/ru/installation-howto.po
+++ b/po/ru/installation-howto.po
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: installation-howto.xml:5
@@ -92,11 +92,6 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:47
 #, no-c-format
-#| msgid ""
-#| "Some installation methods require other images than CD images. <phrase "
-#| "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
-#| "page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
-#| "files\"/> explains how to find images on Debian mirrors."
 msgid ""
 "Some installation methods require other images than CD images. <phrase "
 "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
@@ -173,10 +168,6 @@ msgstr "Загрузка с дискет"
 #. Tag: para
 #: installation-howto.xml:93
 #, no-c-format
-#| msgid ""
-#| "If you can't boot from CD, you can download floppy images to install "
-#| "Debian. You need the <filename>floppy/boot.img</filename>, the "
-#| "<filename>floppy/root.img</filename> and one or more of the driver disks."
 msgid ""
 "If you can't boot from CD, you can download floppy images to install "
 "&debian;. You need the <filename>floppy/boot.img</filename>, the "
@@ -252,10 +243,6 @@ msgstr "Загрузка с карты памяти USB"
 #. Tag: para
 #: installation-howto.xml:132
 #, no-c-format
-#| msgid ""
-#| "It's also possible to install from removable USB storage devices. For "
-#| "example a USB keychain can make a handy Debian install medium that you "
-#| "can take with you anywhere."
 msgid ""
 "It's also possible to install from removable USB storage devices. For "
 "example a USB keychain can make a handy &debian; install medium that you can "
@@ -263,21 +250,11 @@ msgid ""
 msgstr ""
 "Также возможна установка со съёмных USB устройств хранения. Например, из USB-"
 "брелка можно сделать удобный носитель установки &debian;, который можно "
-"взять "
-"с собой куда угодно."
+"взять с собой куда угодно."
 
 #. Tag: para
 #: installation-howto.xml:138
 #, no-c-format
-#| msgid ""
-#| "The easiest way to prepare your USB memory stick is to download "
-#| "<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the "
-#| "256 MB image from that file. Write this image directly to your memory "
-#| "stick, which must be at least 256 mb in size. Of course this will destroy "
-#| "anything already on the memory stick. Then mount the memory stick, which "
-#| "will now have a FAT filesystem on it. Next, download a Debian netinst CD "
-#| "image, and copy that file to the memory stick; any filename is ok as long "
-#| "as it ends in <literal>.iso</literal>."
 msgid ""
 "The easiest way to prepare your USB memory stick is to download <filename>hd-"
 "media/boot.img.gz</filename>, and use gunzip to extract the 256 MB image "
@@ -293,10 +270,9 @@ msgstr ""
 "распаковки 256 МБ образа этого файла. Запишите этот образ прямо на карту "
 "памяти, которая должна быть, по крайней мере, 256 МБ. Естественно, эта "
 "операция уничтожит все имеющиеся на ней данные. Затем смонтируйте карту "
-"памяти, которая теперь содержит файловую систему FAT. Далее, загрузите "
-"образ &debian; netinst CD и скопируйте его на карту памяти; файл может "
-"называться как угодно, главное чтобы имя заканчивалось на <literal>.iso</"
-"literal>."
+"памяти, которая теперь содержит файловую систему FAT. Далее, загрузите образ "
+"&debian; netinst CD и скопируйте его на карту памяти; файл может называться "
+"как угодно, главное чтобы имя заканчивалось на <literal>.iso</literal>."
 
 #. Tag: para
 #: installation-howto.xml:149
@@ -380,15 +356,6 @@ msgstr "Загрузка с жёсткого диска"
 #. Tag: para
 #: installation-howto.xml:193
 #, no-c-format
-#| msgid ""
-#| "It's possible to boot the installer using no removable media, but just an "
-#| "existing hard disk, which can have a different OS on it. Download "
-#| "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-#| "filename>, and a Debian CD image to the top-level directory of the hard "
-#| "disk. Make sure that the CD image has a filename ending in <literal>.iso</"
-#| "literal>. Now it's just a matter of booting linux with the initrd. "
-#| "<phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to "
-#| "do it. </phrase>"
 msgid ""
 "It's possible to boot the installer using no removable media, but just an "
 "existing hard disk, which can have a different OS on it. Download "
@@ -508,12 +475,6 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:256
 #, no-c-format
-#| msgid ""
-#| "If you have an existing DOS or Windows partition that you want to "
-#| "preserve, be very careful with automatic partitioning. If you choose "
-#| "manual partitioning, you can use the installer to resize existing FAT or "
-#| "NTFS partitions to create room for the Debian install: simply select the "
-#| "partition and specify its new size."
 msgid ""
 "If you have an existing DOS or Windows partition that you want to preserve, "
 "be very careful with automatic partitioning. If you choose manual "
@@ -690,9 +651,6 @@ msgstr "И напоследок&hellip;"
 #. Tag: para
 #: installation-howto.xml:350
 #, no-c-format
-#| msgid ""
-#| "We hope that your Debian installation is pleasant and that you find "
-#| "Debian useful. You might want to read <xref linkend=\"post-install\"/>."
 msgid ""
 "We hope that your &debian; installation is pleasant and that you find "
 "&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
@@ -700,4 +658,3 @@ msgstr ""
 "Мы надеемся, что установка &debian; была несложной и что вы найдёте &debian; "
 "полезным. Вероятно, вам пригодится информация из <xref linkend=\"post-install"
 "\"/>."
-
diff --git a/po/ru/partitioning.po b/po/ru/partitioning.po
index 355c0cf93..796917efe 100644
--- a/po/ru/partitioning.po
+++ b/po/ru/partitioning.po
@@ -16,20 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: partitioning.xml:5
 #, no-c-format
-#| msgid "Partitioning for Debian"
 msgid "Partitioning for &debian;"
 msgstr "Разметка дисков в &debian;"
 
 #. Tag: title
 #: partitioning.xml:13
 #, no-c-format
-#| msgid "Deciding on Debian Partitions and Sizes"
 msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Дисковые разделы &debian; и их размеры"
 
@@ -129,13 +127,6 @@ msgstr "Структура каталогов"
 #. Tag: para
 #: partitioning.xml:68
 #, no-c-format
-#| msgid ""
-#| "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
-#| "Hierarchy Standard</ulink> for directory and file naming. This standard "
-#| "allows users and software programs to predict the location of files and "
-#| "directories. The root level directory is represented simply by the slash "
-#| "<filename>/</filename>. At the root level, all Debian systems include "
-#| "these directories:"
 msgid ""
 "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
 "Hierarchy Standard</ulink> for directory and file naming. This standard "
@@ -421,19 +412,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:174
 #, no-c-format
-#| msgid ""
-#| "<filename>/var</filename>: variable data like news articles, e-mails, web "
-#| "sites, databases, the packaging system cache, etc. will be placed under "
-#| "this directory. The size of this directory depends greatly on the usage "
-#| "of your system, but for most people will be dictated by the package "
-#| "management tool's overhead. If you are going to do a full installation of "
-#| "just about everything Debian has to offer, all in one session, setting "
-#| "aside 2 or 3 GB of space for <filename>/var</filename> should be "
-#| "sufficient. If you are going to install in pieces (that is to say, "
-#| "install services and utilities, followed by text stuff, then X, ...), you "
-#| "can get away with 300&ndash;500 MB. If hard drive space is at a premium "
-#| "and you don't plan on doing major system updates, you can get by with as "
-#| "little as 30 or 40 MB."
 msgid ""
 "<filename>/var</filename>: variable data like news articles, e-mails, web "
 "sites, databases, the packaging system cache, etc. will be placed under this "
@@ -508,13 +486,6 @@ msgstr "Рекомендуемые схемы разметки"
 #. Tag: para
 #: partitioning.xml:223
 #, no-c-format
-#| msgid ""
-#| "For new users, personal Debian boxes, home systems, and other single-user "
-#| "setups, a single <filename>/</filename> partition (plus swap) is probably "
-#| "the easiest, simplest way to go. However, if your partition is larger "
-#| "than around 6GB, choose ext3 as your partition type. Ext2 partitions need "
-#| "periodic file system integrity checking, and this can cause delays during "
-#| "booting when the partition is large."
 msgid ""
 "For new users, personal &debian; boxes, home systems, and other single-user "
 "setups, a single <filename>/</filename> partition (plus swap) is probably "
@@ -547,16 +518,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:240
 #, no-c-format
-#| msgid ""
-#| "You might need a separate <filename>/usr/local</filename> partition if "
-#| "you plan to install many programs that are not part of the Debian "
-#| "distribution. If your machine will be a mail server, you might need to "
-#| "make <filename>/var/mail</filename> a separate partition. Often, putting "
-#| "<filename>/tmp</filename> on its own partition, for instance "
-#| "20&ndash;50MB, is a good idea. If you are setting up a server with lots "
-#| "of user accounts, it's generally good to have a separate, large "
-#| "<filename>/home</filename> partition. In general, the partitioning "
-#| "situation varies from computer to computer depending on its uses."
 msgid ""
 "You might need a separate <filename>/usr/local</filename> partition if you "
 "plan to install many programs that are not part of the &debian; "
@@ -864,18 +825,12 @@ msgstr ""
 #. Tag: title
 #: partitioning.xml:435
 #, no-c-format
-#| msgid "Debian Partitioning Programs"
 msgid "&debian; Partitioning Programs"
 msgstr "Программы разметки в &debian;"
 
 #. Tag: para
 #: partitioning.xml:436
 #, no-c-format
-#| msgid ""
-#| "Several varieties of partitioning programs have been adapted by Debian "
-#| "developers to work on various types of hard disks and computer "
-#| "architectures. Following is a list of the program(s) applicable for your "
-#| "architecture."
 msgid ""
 "Several varieties of partitioning programs have been adapted by &debian; "
 "developers to work on various types of hard disks and computer "
@@ -884,8 +839,8 @@ msgid ""
 msgstr ""
 "Для работы с различными типами жёстких дисков и компьютерных архитектур "
 "разработчиками &debian; были адаптированы несколько разновидностей программ "
-"разметки. "
-"На вашей машине могут работать программы, представленные в списке далее."
+"разметки. На вашей машине могут работать программы, представленные в списке "
+"далее."
 
 #. Tag: command
 #: partitioning.xml:448
@@ -896,11 +851,6 @@ msgstr "partman"
 #. Tag: para
 #: partitioning.xml:449
 #, no-c-format
-#| msgid ""
-#| "Recommended partitioning tool in Debian. This Swiss army knife can also "
-#| "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
-#| "(<quote>format</quote> in Windows speak)</phrase> and assign them to the "
-#| "mountpoints."
 msgid ""
 "Recommended partitioning tool in &debian;. This Swiss army knife can also "
 "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
@@ -1114,14 +1064,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:591
 #, no-c-format
-#| msgid ""
-#| "If you have an existing other operating system such as DOS or Windows and "
-#| "you want to preserve that operating system while installing Debian, you "
-#| "may need to resize its partition to free up space for the Debian "
-#| "installation. The installer supports resizing of both FAT and NTFS "
-#| "filesystems; when you get to the installer's partitioning step, select "
-#| "the option <guimenuitem>Manual</guimenuitem> and then simply select an "
-#| "existing partition and change its size."
 msgid ""
 "If you have an existing other operating system such as DOS or Windows and "
 "you want to preserve that operating system while installing &debian;, you "
@@ -1217,18 +1159,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:641
 #, no-c-format
-#| msgid ""
-#| "This restriction doesn't apply if you have a BIOS newer than around "
-#| "1995&ndash;98 (depending on the manufacturer) that supports the "
-#| "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-#| "Linux loader, and Debian's alternative <command>mbr</command> must use "
-#| "the BIOS to read the kernel from the disk into RAM. If the BIOS int 0x13 "
-#| "large disk access extensions are found to be present, they will be "
-#| "utilized. Otherwise, the legacy disk access interface is used as a fall-"
-#| "back, and it cannot be used to address any location on the disk higher "
-#| "than the 1023rd cylinder. Once &arch-kernel; is booted, no matter what "
-#| "BIOS your computer has, these restrictions no longer apply, since &arch-"
-#| "kernel; does not use the BIOS for disk access."
 msgid ""
 "This restriction doesn't apply if you have a BIOS newer than around "
 "1995&ndash;98 (depending on the manufacturer) that supports the "
@@ -1245,14 +1175,14 @@ msgstr ""
 "Этого ограничения нет в BIOS новее 1995&ndash;98 годов (зависит от "
 "производителя), которые поддерживают <quote>Enhanced Disk Drive Support "
 "Specification</quote>. И Lilo, Linux загрузчик, и альтернатива &debian; "
-"&mdash; "
-"<command>mbr</command>, должны использовать BIOS для чтения ядра с диска в "
-"оперативную память. Если будет найдено расширение прерывания BIOS int 0x13 "
-"доступа к диску, то оно будет использовано. Иначе, будет использован обычный "
-"старый интерфейс доступа к диску, и не будут использованы адреса, "
-"расположенные на диске за 1023-им цилиндром. После загрузки &arch-kernel;, "
-"неважно какой BIOS имеется в компьютере, эти ограничения больше не "
-"действуют, так как &arch-kernel; не использует BIOS для доступа к диску."
+"&mdash; <command>mbr</command>, должны использовать BIOS для чтения ядра с "
+"диска в оперативную память. Если будет найдено расширение прерывания BIOS "
+"int 0x13 доступа к диску, то оно будет использовано. Иначе, будет "
+"использован обычный старый интерфейс доступа к диску, и не будут "
+"использованы адреса, расположенные на диске за 1023-им цилиндром. После "
+"загрузки &arch-kernel;, неважно какой BIOS имеется в компьютере, эти "
+"ограничения больше не действуют, так как &arch-kernel; не использует BIOS "
+"для доступа к диску."
 
 #. Tag: para
 #: partitioning.xml:655
diff --git a/po/ru/post-install.po b/po/ru/post-install.po
index 331cb16c9..5c9801c8c 100644
--- a/po/ru/post-install.po
+++ b/po/ru/post-install.po
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: post-install.xml:5
@@ -96,15 +96,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:55
 #, no-c-format
-#| msgid ""
-#| "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
-#| "Documentation Project (LDP)</ulink> collects a number of HOWTOs and "
-#| "online books relating to Linux. Most of these documents can be installed "
-#| "locally; just install the <classname>doc-linux-html</classname> package "
-#| "(HTML versions) or the <classname>doc-linux-text</classname> package "
-#| "(ASCII versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
-#| "International versions of the LDP HOWTOs are also available as Debian "
-#| "packages."
 msgid ""
 "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
 "Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
@@ -126,20 +117,12 @@ msgstr ""
 #. Tag: title
 #: post-install.xml:76
 #, no-c-format
-#| msgid "Orienting Yourself to Debian"
 msgid "Orienting Yourself to &debian;"
 msgstr "Самостоятельное ориентирование в &debian;"
 
 #. Tag: para
 #: post-install.xml:77
 #, no-c-format
-#| msgid ""
-#| "Debian is a little different from other distributions. Even if you're "
-#| "familiar with Linux in other distributions, there are things you should "
-#| "know about Debian to help you to keep your system in a good, clean state. "
-#| "This chapter contains material to help you get oriented; it is not "
-#| "intended to be a tutorial for how to use Debian, but just a very brief "
-#| "glimpse of the system for the very rushed."
 msgid ""
 "&debian; is a little different from other distributions. Even if you're "
 "familiar with Linux in other distributions, there are things you should know "
@@ -153,34 +136,17 @@ msgstr ""
 "чтобы поддерживать систему в рабочем состоянии. Эта глава содержит "
 "материалы, которые помогут вам ориентироваться; она не является руководством "
 "по использованию &debian;, она всего лишь кратко описывает систему для "
-"занятых "
-"людей."
+"занятых людей."
 
 #. Tag: title
 #: post-install.xml:88
 #, no-c-format
-#| msgid "Debian Packaging System"
 msgid "&debian; Packaging System"
 msgstr "Система управления пакетами &debian;"
 
 #. Tag: para
 #: post-install.xml:89
 #, no-c-format
-#| msgid ""
-#| "The most important concept to grasp is the Debian packaging system. In "
-#| "essence, large parts of your system should be considered under the "
-#| "control of the packaging system. These include: <itemizedlist> "
-#| "<listitem><para> <filename>/usr</filename> (excluding <filename>/usr/"
-#| "local</filename>) </para></listitem> <listitem><para> <filename>/var</"
-#| "filename> (you could make <filename>/var/local</filename> and be safe in "
-#| "there) </para></listitem> <listitem><para> <filename>/bin</filename> </"
-#| "para></listitem> <listitem><para> <filename>/sbin</filename> </para></"
-#| "listitem> <listitem><para> <filename>/lib</filename> </para></listitem> </"
-#| "itemizedlist> For instance, if you replace <filename>/usr/bin/perl</"
-#| "filename>, that will work, but then if you upgrade your <classname>perl</"
-#| "classname> package, the file you put there will be replaced. Experts can "
-#| "get around this by putting packages on <quote>hold</quote> in "
-#| "<command>aptitude</command>."
 msgid ""
 "The most important concept to grasp is the &debian; packaging system. In "
 "essence, large parts of your system should be considered under the control "
@@ -198,20 +164,19 @@ msgid ""
 "command>."
 msgstr ""
 "Наиболее важно разобраться в системе управления пакетами &debian;. В "
-"сущности, "
-"большая часть системы находится под контролем системы управления пакетами. "
-"Сюда входят: <itemizedlist> <listitem><para> <filename>/usr</filename> "
-"(кроме <filename>/usr/local</filename>) </para></listitem> <listitem><para> "
-"<filename>/var</filename> (вы можете сделать <filename>/var/local</"
-"filename>, там меняться ничего не будет) "
-"</para></listitem> <listitem><para> <filename>/bin</filename> </"
-"para></listitem> <listitem><para> <filename>/sbin</filename> </para></"
-"listitem> <listitem><para> <filename>/lib</filename> </para></listitem> </"
-"itemizedlist> Например, если вы замените <filename>/usr/bin/perl</"
-"filename>, он будет работать, но позже, если вы обновите пакет "
-"<classname>perl</classname>, файл, который вы положили будет заменён. "
-"Эксперты могут обойти это, установив на пакеты флаг <quote>hold</quote> в "
-"<command>aptitude</command>."
+"сущности, большая часть системы находится под контролем системы управления "
+"пакетами. Сюда входят: <itemizedlist> <listitem><para> <filename>/usr</"
+"filename> (кроме <filename>/usr/local</filename>) </para></listitem> "
+"<listitem><para> <filename>/var</filename> (вы можете сделать <filename>/var/"
+"local</filename>, там меняться ничего не будет) </para></listitem> "
+"<listitem><para> <filename>/bin</filename> </para></listitem> "
+"<listitem><para> <filename>/sbin</filename> </para></listitem> "
+"<listitem><para> <filename>/lib</filename> </para></listitem> </"
+"itemizedlist> Например, если вы замените <filename>/usr/bin/perl</filename>, "
+"он будет работать, но позже, если вы обновите пакет <classname>perl</"
+"classname>, файл, который вы положили будет заменён. Эксперты могут обойти "
+"это, установив на пакеты флаг <quote>hold</quote> в <command>aptitude</"
+"command>."
 
 #. Tag: para
 #: post-install.xml:130
@@ -324,14 +289,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:193
 #, no-c-format
-#| msgid ""
-#| "There is lots of useful documentation in <filename>/usr/share/doc</"
-#| "filename> as well. In particular, <filename>/usr/share/doc/HOWTO</"
-#| "filename> and <filename>/usr/share/doc/FAQ</filename> contain lots of "
-#| "interesting information. To submit bugs, look at <filename>/usr/share/doc/"
-#| "debian/bug*</filename>. To read about Debian-specific issues for "
-#| "particular programs, look at <filename>/usr/share/doc/(package name)/"
-#| "README.Debian</filename>."
 msgid ""
 "There is lots of useful documentation in <filename>/usr/share/doc</filename> "
 "as well. In particular, <filename>/usr/share/doc/HOWTO</filename> and "
@@ -343,28 +300,14 @@ msgstr ""
 "Также, есть много полезной документации в каталоге <filename>/usr/share/doc</"
 "filename>. В частности, в каталогах <filename>/usr/share/doc/HOWTO</"
 "filename> и <filename>/usr/share/doc/FAQ</filename> содержится море "
-"интересных сведений. Информацию об ошибках смотрите в <filename>/usr/"
-"share/doc/debian/bug*</filename>. Отличия в работе определённой "
-"программы, касающиеся &debian;, смотрите в файле <filename>"
-"/usr/share/doc/(имя пакета )/"
+"интересных сведений. Информацию об ошибках смотрите в <filename>/usr/share/"
+"doc/debian/bug*</filename>. Отличия в работе определённой программы, "
+"касающиеся &debian;, смотрите в файле <filename>/usr/share/doc/(имя пакета )/"
 "README.Debian</filename>."
 
 #. Tag: para
 #: post-install.xml:204
 #, no-c-format
-#| msgid ""
-#| "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> "
-#| "contains a large quantity of documentation about Debian. In particular, "
-#| "see the <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux "
-#| "FAQ</ulink> and the <ulink url=\"http://www.debian.org/doc/user-"
-#| "manuals#quick-reference\">Debian Reference</ulink>. An index of more "
-#| "Debian documentation is available from the <ulink url=\"http://www.debian."
-#| "org/doc/ddp\">Debian Documentation Project</ulink>. The Debian community "
-#| "is self-supporting; to subscribe to one or more of the Debian mailing "
-#| "lists, see the <ulink url=\"http://www.debian.org/MailingLists/subscribe"
-#| "\"> Mail List Subscription</ulink> page. Last, but not least, the <ulink "
-#| "url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> "
-#| "contain a wealth of information on Debian."
 msgid ""
 "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
 "large quantity of documentation about &debian;. In particular, see the "
@@ -414,11 +357,6 @@ msgstr "Настройка почты"
 #. Tag: para
 #: post-install.xml:239
 #, no-c-format
-#| msgid ""
-#| "Today, email is an important part of many people's life. As there are "
-#| "many options as to how to set it up, and as having it set up correctly is "
-#| "important for some Debian utilities, we will try to cover the basics in "
-#| "this section."
 msgid ""
 "Today, email is an important part of many people's life. As there are many "
 "options as to how to set it up, and as having it set up correctly is "
@@ -480,17 +418,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:269
 #, no-c-format
-#| msgid ""
-#| "With the increasing popularity of graphical desktop systems, the use of "
-#| "graphical e-mail programs like GNOME's <command>evolution</command>, "
-#| "KDE's <command>kmail</command> or Mozilla's <command>thunderbird</"
-#| "command> (in Debian available as <command>icedove</command><footnote> "
-#| "<para> The reason that <command>thunderbird</command> has been renamed to "
-#| "<command>icedove</command> in Debian has to do with licensing issues. "
-#| "Details are outside the scope of this manual. </para> </footnote>) is "
-#| "becoming more popular. These programs combine the function of a MUA, MTA "
-#| "and MDA, but can &mdash; and often are &mdash; also be used in "
-#| "combination with the traditional Linux tools."
 msgid ""
 "With the increasing popularity of graphical desktop systems, the use of "
 "graphical e-mail programs like GNOME's <command>evolution</command>, KDE's "
@@ -507,8 +434,7 @@ msgstr ""
 "становятся более востребованными почтовые программы с графическим "
 "интерфейсом типа GNOME <command>evolution</command>, KDE <command>kmail</"
 "command> или Mozilla <command>thunderbird</command> (в &debian; имеет "
-"название "
-"<command>icedove</command><footnote> <para> Причиной переименования "
+"название <command>icedove</command><footnote> <para> Причиной переименования "
 "<command>thunderbird</command> в <command>icedove</command> стала проблема с "
 "лицензией. Подробности выходят за рамки этого руководства. </para> </"
 "footnote>). В этих программах объединены функции MUA, MTA и MDA, но они "
@@ -592,10 +518,6 @@ msgstr "Отправка почты из системы"
 #. Tag: para
 #: post-install.xml:335
 #, no-c-format
-#| msgid ""
-#| "As mentioned earlier, the installed Debian system is only set up to "
-#| "handle e-mail local to the system, not for sending mail to others nor for "
-#| "receiving mail from others."
 msgid ""
 "As mentioned earlier, the installed &debian; system is only set up to handle "
 "e-mail local to the system, not for sending mail to others nor for receiving "
@@ -637,12 +559,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:356
 #, no-c-format
-#| msgid ""
-#| "However, in that case you may need to configure individual utilities to "
-#| "correctly send e-mails. One such utility is <command>reportbug</command>, "
-#| "a program that facilitates submitting bug reports against Debian "
-#| "packages. By default it expects to be able to use <classname>exim4</"
-#| "classname> to submit bug reports."
 msgid ""
 "However, in that case you may need to configure individual utilities to "
 "correctly send e-mails. One such utility is <command>reportbug</command>, a "
@@ -876,13 +792,6 @@ msgstr "Сборка нового ядра"
 #. Tag: para
 #: post-install.xml:501
 #, no-c-format
-#| msgid ""
-#| "Why would someone want to compile a new kernel? It is often not necessary "
-#| "since the default kernel shipped with Debian handles most configurations. "
-#| "Also, Debian often offers several alternative kernels. So you may want to "
-#| "check first if there is an alternative kernel image package that better "
-#| "corresponds to your hardware. However, it can be useful to compile a new "
-#| "kernel in order to:"
 msgid ""
 "Why would someone want to compile a new kernel? It is often not necessary "
 "since the default kernel shipped with &debian; handles most configurations. "
@@ -893,9 +802,9 @@ msgid ""
 msgstr ""
 "Зачем пересобирать ядро? Обычно этого делать не нужно, так как ядро, "
 "устанавливаемое по умолчанию в &debian;, подходит для многих конфигураций. "
-"Кроме этого, в &debian; есть ещё несколько сборок ядра. Поэтому, "
-"сначала проверьте, может другой пакет с ядром лучше подходит для вашего "
-"компьютера. Однако, полезно пересобрать ядро в следующих случаях:"
+"Кроме этого, в &debian; есть ещё несколько сборок ядра. Поэтому, сначала "
+"проверьте, может другой пакет с ядром лучше подходит для вашего компьютера. "
+"Однако, полезно пересобрать ядро в следующих случаях:"
 
 #. Tag: para
 #: post-install.xml:511
@@ -958,12 +867,6 @@ msgstr "Не бойтесь пересобирать ядро. Это забав
 #. Tag: para
 #: post-install.xml:552
 #, no-c-format
-#| msgid ""
-#| "To compile a kernel the Debian way, you need some packages: "
-#| "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
-#| "<classname>linux-source-2.6</classname> and a few others which are "
-#| "probably already installed (see <filename>/usr/share/doc/kernel-package/"
-#| "README.gz</filename> for the complete list)."
 msgid ""
 "To compile a kernel the &debian; way, you need some packages: "
 "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
@@ -995,13 +898,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:569
 #, no-c-format
-#| msgid ""
-#| "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
-#| "<quote>Debian way</quote>; but we find that using the packaging system to "
-#| "manage your kernel is actually safer and easier. In fact, you can get "
-#| "your kernel sources right from Linus instead of <classname>linux-"
-#| "source-2.6</classname>, yet still use the <classname>kernel-package</"
-#| "classname> compilation method."
 msgid ""
 "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
 "<quote>&debian; way</quote>; but we find that using the packaging system to "
@@ -1058,19 +954,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:605
 #, no-c-format
-#| msgid ""
-#| "Now, you can configure your kernel. Run <userinput>make xconfig</"
-#| "userinput> if X11 is installed, configured and being run; run "
-#| "<userinput>make menuconfig</userinput> otherwise (you'll need "
-#| "<classname>libncurses5-dev</classname> installed). Take the time to read "
-#| "the online help and choose carefully. When in doubt, it is typically "
-#| "better to include the device driver (the software which manages hardware "
-#| "peripherals, such as Ethernet cards, SCSI controllers, and so on) you are "
-#| "unsure about. Be careful: other options, not related to a specific "
-#| "hardware, should be left at the default value if you do not understand "
-#| "them. Do not forget to select <quote>Kernel module loader</quote> in "
-#| "<quote>Loadable module support</quote> (it is not selected by default). "
-#| "If not included, your Debian installation will experience problems."
 msgid ""
 "Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
 "if X11 is installed, configured and being run; run <userinput>make "
@@ -1176,12 +1059,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:660
 #, no-c-format
-#| msgid ""
-#| "For more information on Debian kernels and kernel compilation, see the "
-#| "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</"
-#| "ulink>. For more information on <classname>kernel-package</classname>, "
-#| "read the fine documentation in <filename>/usr/share/doc/kernel-package</"
-#| "filename>."
 msgid ""
 "For more information on &debian; kernels and kernel compilation, see the "
 "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink>. "
@@ -1259,13 +1136,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:710
 #, no-c-format
-#| msgid ""
-#| "If possible, the installer will now present you with a shell prompt in "
-#| "the file system you selected, which you can use to perform any necessary "
-#| "repairs. <phrase arch=\"x86\"> For example, if you need to reinstall the "
-#| "GRUB boot loader into the master boot record of the first hard disk, you "
-#| "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
-#| "so. </phrase>"
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
 "file system you selected, which you can use to perform any necessary "
@@ -1319,4 +1189,3 @@ msgstr ""
 "очень трудным делом, и это руководство не пытается описать все возможные "
 "случаи, которые могут произойти и способы их решения. Если у вас есть "
 "проблемы &mdash; обратитесь к профессионалам."
-
diff --git a/po/ru/preface.po b/po/ru/preface.po
index e3700f909..af902814c 100644
--- a/po/ru/preface.po
+++ b/po/ru/preface.po
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: preface.xml:5
@@ -27,12 +27,6 @@ msgstr "Установка &debian-gnu; &release; на &architecture;"
 #. Tag: para
 #: preface.xml:6
 #, no-c-format
-#| msgid ""
-#| "We are delighted that you have decided to try Debian, and are sure that "
-#| "you will find that Debian's GNU/&arch-kernel; distribution is unique. "
-#| "&debian-gnu; brings together high-quality free software from around the "
-#| "world, integrating it into a coherent whole. We believe that you will "
-#| "find that the result is truly more than the sum of the parts."
 msgid ""
 "We are delighted that you have decided to try &debian;, and are sure that "
 "you will find that &debian;'s GNU/&arch-kernel; distribution is unique. "
@@ -42,22 +36,13 @@ msgid ""
 msgstr ""
 "Мы рады, что вы решили попробовать &debian;. Мы уверены, что дистрибутив "
 "&debian; GNU/&arch-kernel; покажется вам замечательным. &debian-gnu; "
-"собирает "
-"высококачественное свободное ПО со всего света, объединяя его в единое "
-"целое. Мы верим, вы признаете, что получившийся результат &mdash; это "
+"собирает высококачественное свободное ПО со всего света, объединяя его в "
+"единое целое. Мы верим, вы признаете, что получившийся результат &mdash; это "
 "действительно больше, чем сумма частей."
 
 #. Tag: para
 #: preface.xml:15
 #, no-c-format
-#| msgid ""
-#| "We understand that many of you want to install Debian without reading "
-#| "this manual, and the Debian installer is designed to make this possible. "
-#| "If you don't have time to read the whole Installation Guide right now, we "
-#| "recommend that you read the Installation Howto, which will walk you "
-#| "through the basic installation process, and links to the manual for more "
-#| "advanced topics or for when things go wrong. The Installation Howto can "
-#| "be found in <xref linkend=\"installation-howto\"/>."
 msgid ""
 "We understand that many of you want to install &debian; without reading this "
 "manual, and the &debian; installer is designed to make this possible. If you "
@@ -87,4 +72,3 @@ msgstr ""
 "Тем не менее, мы надеемся, что у вас найдётся время на чтение большей части "
 "этого руководства, так как прочитав его, вы сможете более умело и успешно "
 "установить систему."
-
diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 8ceb56c88..098752c98 100644
--- a/po/ru/preparing.po
+++ b/po/ru/preparing.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 20:40+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: preparing.xml:5
@@ -28,10 +28,6 @@ msgstr "Перед установкой &debian-gnu;"
 #. Tag: para
 #: preparing.xml:6
 #, no-c-format
-#| msgid ""
-#| "This chapter deals with the preparation for installing Debian before you "
-#| "even boot the installer. This includes backing up your data, gathering "
-#| "information about your hardware, and locating any necessary information."
 msgid ""
 "This chapter deals with the preparation for installing &debian; before you "
 "even boot the installer. This includes backing up your data, gathering "
@@ -39,8 +35,7 @@ msgid ""
 msgstr ""
 "В этой главе рассказывается о том, что нужно сделать перед запуском "
 "программы установки &debian;: резервное копирование данных, сбор информации "
-"об "
-"оборудовании и поиск необходимой информации."
+"об оборудовании и поиск необходимой информации."
 
 #. Tag: title
 #: preparing.xml:19
@@ -51,10 +46,6 @@ msgstr "Обзор процесса установки"
 #. Tag: para
 #: preparing.xml:20
 #, no-c-format
-#| msgid ""
-#| "First, just a note about re-installations. With Debian, a circumstance "
-#| "that will require a complete re-installation of your system is very rare; "
-#| "perhaps mechanical failure of the hard disk would be the most common case."
 msgid ""
 "First, just a note about re-installations. With &debian;, a circumstance "
 "that will require a complete re-installation of your system is very rare; "
@@ -81,17 +72,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:35
 #, no-c-format
-#| msgid ""
-#| "Under &debian-gnu;, it is much more likely that your OS can be repaired "
-#| "rather than replaced if things go wrong. Upgrades never require a "
-#| "wholesale installation; you can always upgrade in-place. And the programs "
-#| "are almost always compatible with successive OS releases. If a new "
-#| "program version requires newer supporting software, the Debian packaging "
-#| "system ensures that all the necessary software is automatically "
-#| "identified and installed. The point is, much effort has been put into "
-#| "avoiding the need for re-installation, so think of it as your very last "
-#| "option. The installer is <emphasis>not</emphasis> designed to re-install "
-#| "over an existing system."
 msgid ""
 "Under &debian-gnu;, it is much more likely that your OS can be repaired "
 "rather than replaced if things go wrong. Upgrades never require a wholesale "
@@ -109,12 +89,11 @@ msgstr ""
 "Все программы почти всегда совместимы с новыми версиями операционной "
 "системы. Если новая версия программы требует более нового программного "
 "обеспечения, система управления пакетами &debian; обеспечивает "
-"автоматическое "
-"обнаружение и установку всего необходимого программного обеспечения. Много "
-"труда было вложено именно в то, чтобы избежать переустановки, поэтому "
-"думайте об этом как о последней причине вашего выбора. Программа установки "
-"<emphasis>не</emphasis> разрабатывалась для переустановки поверх "
-"существующей системы."
+"автоматическое обнаружение и установку всего необходимого программного "
+"обеспечения. Много труда было вложено именно в то, чтобы избежать "
+"переустановки, поэтому думайте об этом как о последней причине вашего "
+"выбора. Программа установки <emphasis>не</emphasis> разрабатывалась для "
+"переустановки поверх существующей системы."
 
 #. Tag: para
 #: preparing.xml:48
@@ -147,16 +126,12 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:68
 #, no-c-format
-#| msgid "Create partitionable space for Debian on your hard disk."
 msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "Выделить место под &debian; на жёстком диске."
 
 #. Tag: para
 #: preparing.xml:73
 #, no-c-format
-#| msgid ""
-#| "Locate and/or download the installer software and any specialized driver "
-#| "files your machine requires (except Debian CD users)."
 msgid ""
 "Locate and/or download the installer software and any specialized driver "
 "files your machine requires (except &debian; CD users)."
@@ -168,17 +143,13 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:79
 #, no-c-format
-#| msgid ""
-#| "Set up boot tapes/floppies/USB sticks, or place boot files (most Debian "
-#| "CD users can boot from one of the CDs)."
 msgid ""
 "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Создать ленты/дискеты/USB-карты памяти или разместить загрузочные файлы "
 "(большинство пользователей компакт-дисков &debian; могут загрузиться с "
-"одного "
-"из компакт-дисков)."
+"одного из компакт-дисков)."
 
 #. Tag: para
 #: preparing.xml:85
@@ -222,7 +193,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:117
 #, no-c-format
-#| msgid "Create and mount the partitions on which Debian will be installed."
 msgid "Create and mount the partitions on which &debian; will be installed."
 msgstr "Создать и смонтировать разделы, на которые будет установлен &debian;."
 
@@ -255,20 +225,14 @@ msgstr "Загрузить только что установленную сис
 #. Tag: para
 #: preparing.xml:141
 #, no-c-format
-#| msgid ""
-#| "For &arch-title; you have the option of using <phrase arch=\"x86\">a</"
-#| "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical "
-#| "version of the installation system. For more information about this "
-#| "graphical installer, see <xref linkend=\"graphical\"/>."
 msgid ""
 "For &arch-title; you have the option of using <phrase arch=\"any-x86\">a</"
 "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical version "
 "of the installation system. For more information about this graphical "
 "installer, see <xref linkend=\"graphical\"/>."
 msgstr ""
-"Для &arch-title; доступна "
-"<phrase arch=\"powerpc\">экспериментальная</phrase> "
-"версия системы установки с графическим интерфейсом. Подробней, "
+"Для &arch-title; доступна <phrase arch=\"powerpc\">экспериментальная</"
+"phrase> версия системы установки с графическим интерфейсом. Подробней, "
 "смотрите <xref linkend=\"graphical\"/>."
 
 #. Tag: para
@@ -437,11 +401,6 @@ msgstr "&list-install-manual-files;"
 #. Tag: para
 #: preparing.xml:252
 #, no-c-format
-#| msgid ""
-#| "The document you are now reading, which is the official version of the "
-#| "Installation Guide for the &releasename; release of Debian; available in "
-#| "<ulink url=\"&url-release-area;/installmanual\">various formats and "
-#| "translations</ulink>."
 msgid ""
 "The document you are now reading, which is the official version of the "
 "Installation Guide for the &releasename; release of &debian;; available in "
@@ -449,17 +408,13 @@ msgid ""
 "translations</ulink>."
 msgstr ""
 "Документ, который вы сейчас читаете, является официальной версией "
-"руководства по установке &debian; &releasename; и доступен в <ulink "
-"url=\"&url-"
-"release-area;/installmanual\">различных форматах и на разных языках</ulink>."
+"руководства по установке &debian; &releasename; и доступен в <ulink url="
+"\"&url-release-area;/installmanual\">различных форматах и на разных языках</"
+"ulink>."
 
 #. Tag: para
 #: preparing.xml:261
 #, no-c-format
-#| msgid ""
-#| "The document you are now reading, which is a development version of the "
-#| "Installation Guide for the next release of Debian; available in <ulink "
-#| "url=\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgid ""
 "The document you are now reading, which is a development version of the "
 "Installation Guide for the next release of &debian;; available in <ulink url="
@@ -512,20 +467,18 @@ msgstr "Справочники по аппаратному обеспечени�
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Инструкции по установке и драйверам устройств (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network)для Linux на &arch-title; с ядром 2.4"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Драйвера устройств и команды установки"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -535,18 +488,14 @@ msgstr ""
 "title; аппаратным обеспечением."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux на &arch-title;"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
-#| msgid ""
-#| "IBM Redbook describing the Linux distributions available for the "
-#| "mainframe. It has no chapter about Debian but the basic installation "
-#| "concepts are the same across all &arch-title; distributions."
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
 "It has no chapter about &debian; but the basic installation concepts are the "
@@ -554,23 +503,22 @@ msgid ""
 msgstr ""
 "IBM Redbook описывает дистрибутивы Linux, работающие на мэйнфреймах. В нём "
 "нет главы про &debian;, но основные концепции установки подходят от всех "
-"&arch-"
-"title; дистрибутивов."
+"&arch-title; дистрибутивов."
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux на IBM eServer zSeries и &arch-title;: дистрибутивы"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Поиск источников технической информации"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -582,20 +530,20 @@ msgstr ""
 "самостоятельно ознакомиться с имеющимся оборудованием."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "Информацию по аппаратному обеспечению можно найти:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr ""
 "В руководствах, которые были вместе с приобретённым аппаратным обеспечением."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -607,19 +555,19 @@ msgstr ""
 "комбинацию. Часто это клавиша <keycap>Delete</keycap>."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "На коробках и ящиках от аппаратного обеспечения."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Щёлкнув на значке \"Система\" в панели управления Windows."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -631,7 +579,7 @@ msgstr ""
 "оперативной памяти и жёстких дисках."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -641,179 +589,179 @@ msgstr ""
 "могут рассказать вам о настройках почты и подключении к сети."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Информация об аппаратном обеспечении, требуемая для установки"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "Аппаратное обеспечение"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "Информация, которая может потребоваться"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "Жёсткие диски"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "Количество дисков."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "Их порядок в системе."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "IDE (тн. PATA), SATA или SCSI."
 
 # index.docbook:455, index.docbook:507
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "Доступное дисковое пространство."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "Разделы."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "Разделы, на которых установлены операционные системы."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "Монитор"
 
 # index.docbook:463, index.docbook:483, index.docbook:489, index.docbook:495
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "Модель и производитель."
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "Поддерживаемые разрешения."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Частота горизонтальной развёртки."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Частота вертикальной развёртки."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Поддерживаемая глубина цвета (число цветов)."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "Размер экрана."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "Мышь"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Тип интерфейса: последовательный, PS/2 или USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "Порт."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "Производитель."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "Число кнопок."
 
 # index.docbook:482, index.docbook:510
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "Сеть"
 
 # index.docbook:485, index.docbook:511
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "Тип адаптера."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "Принтер"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Поддерживаемое разрешение печати."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "Видеокарта"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "Размер видеопамяти."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -823,37 +771,37 @@ msgstr ""
 "с возможностями монитора)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "Номер устройства(в)."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "Номера устройств."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "Относительный номер адаптера OSA карт."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Совместимость аппаратного обеспечения"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -868,7 +816,7 @@ msgstr ""
 "системами."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -878,7 +826,7 @@ msgstr ""
 "которого требуется работающая версия Windows."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -893,7 +841,7 @@ msgstr ""
 "ядра. Поэтому, они могут быстро устареть."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -904,19 +852,19 @@ msgstr ""
 "оказаться Windows-специфичным."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "Вы можете проверить совместимость аппаратного обеспечения:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "Поискав новые драйверы на веб сайте производителя."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -927,7 +875,7 @@ msgstr ""
 "более известных."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -937,7 +885,7 @@ msgstr ""
 "посвящённых архитектуре вашей машины."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr ""
@@ -945,13 +893,13 @@ msgstr ""
 "оборудования."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "Настройки сети"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -963,31 +911,31 @@ msgstr ""
 "вашего сетевого системного администратора следующую информацию:"
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "Имя вашей машины (возможно вы можете выбрать его самостоятельно)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "Имя домена."
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "IP-адрес компьютера."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "Маска сети."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -997,7 +945,7 @@ msgstr ""
 "такой шлюз."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -1006,7 +954,7 @@ msgstr ""
 "Система в сети, которая используется как DNS (Domain Name Service) сервер."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -1020,31 +968,31 @@ msgstr ""
 "во время процесса установки."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Если вы используете беспроводную сеть, то также нужно выяснить:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "ESSID беспроводной сети."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEP ключ безопасности (если он применяется)."
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Минимальные требования к аппаратному обеспечению"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -1055,7 +1003,7 @@ msgstr ""
 "аппаратное обеспечение соответствует требованиям желаемого типа установки."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -1067,7 +1015,7 @@ msgstr ""
 "пользователей рискуют оказаться расстроенными, если проигнорируют эти советы."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
@@ -1076,7 +1024,7 @@ msgstr ""
 "машина с процессором Pentium 4, 1 ГГц."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
@@ -1084,106 +1032,104 @@ msgstr ""
 "настольной системы."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Рекомендуемые минимальные требования к системе"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "Тип установки"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "Память (минимум)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "Память (рекомендуется)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "Жёсткий диск"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "Без настольных приложений"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 мегабайта"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 мегабайт"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 гигабайт"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "С настольными приложениями"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 мегабайт"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 мегабайт"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 гигабайт"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
-#| msgid ""
-#| "The actual minimum memory requirements are a lot less then the numbers "
-#| "listed in this table. Depending on the architecture, it is possible to "
-#| "install Debian with as little as 20MB (for s390) to 60MB (for "
-#| "amd64). The same goes for the disk space requirements, especially if you "
-#| "pick and choose which applications to install; see <xref linkend="
-#| "\"tasksel-size-list\"/> for additional information on disk space "
-#| "requirements."
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "Реальное минимальное требование к размеру памяти намного меньше, чем указано "
 "в таблице. В зависимости от архитектуры, возможно установить &debian; на "
-"имеющихся от 20МБ (для s390) до 60МБ (для amd64). То же самое можно "
-"сказать о требовании к дисковому пространству, особенно, если вы выбираете "
-"сами, какие приложения устанавливать; дополнительную информацию о "
-"требованиях к дисковому пространству смотрите в <xref linkend=\"tasksel-size-"
-"list\"/>."
+"имеющихся от 20МБ (для s390) до 60МБ (для amd64). То же самое можно сказать "
+"о требовании к дисковому пространству, особенно, если вы выбираете сами, "
+"какие приложения устанавливать; дополнительную информацию о требованиях к "
+"дисковому пространству смотрите в <xref linkend=\"tasksel-size-list\"/>."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1200,7 +1146,7 @@ msgstr ""
 "classname> и <classname>wmaker</classname>, но есть и другие."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1212,7 +1158,7 @@ msgstr ""
 "выполняемых сервером."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1224,18 +1170,8 @@ msgstr ""
 "щедрым, когда подсчитываешь место для своих файлов и данных. "
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
-#| msgid ""
-#| "Disk space required for the smooth operation of the &debian-gnu; system "
-#| "itself is taken into account in these recommended system requirements. "
-#| "Notably, the <filename>/var</filename> partition contains a lot of state "
-#| "information specific to Debian in addition to its regular contents, like "
-#| "logfiles. The <command>dpkg</command> files (with information on all "
-#| "installed packages) can easily consume 40MB. Also, <command>apt-get</"
-#| "command> puts downloaded packages here before they are installed. You "
-#| "should usually allocate at least 200MB for <filename>/var</filename>, and "
-#| "a lot more if you install a graphical desktop environment."
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
 "itself is taken into account in these recommended system requirements. "
@@ -1250,22 +1186,21 @@ msgstr ""
 "Дисковое пространство, необходимое для гладкой работы в &debian-gnu; уже "
 "включено в рекомендуемые требования к системе. В частности, раздел "
 "<filename>/var</filename> содержит много специфичной для &debian; "
-"информации, "
-"а также обычные данные типа журнальных файлов. Файлы <command>dpkg</command> "
-"(с информацией о всех установленных пакетах) могут легко занять 40МБ. "
-"<command>apt-get</command> также помещает сюда скачанные файлы перед их "
-"установкой. Обычно, требуется выделить по крайней мере 200МБ для <filename>/"
-"var</filename> и гораздо больше, если вы планируете установку графического "
-"окружения рабочего стола."
+"информации, а также обычные данные типа журнальных файлов. Файлы "
+"<command>dpkg</command> (с информацией о всех установленных пакетах) могут "
+"легко занять 40МБ. <command>apt-get</command> также помещает сюда скачанные "
+"файлы перед их установкой. Обычно, требуется выделить по крайней мере 200МБ "
+"для <filename>/var</filename> и гораздо больше, если вы планируете установку "
+"графического окружения рабочего стола."
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Переразметка для мульти-загрузочных систем"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1279,7 +1214,7 @@ msgstr ""
 "повлияет на другие комнаты."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1291,49 +1226,32 @@ msgstr ""
 "означает LPAR или гостевую VM."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, no-c-format
-#| msgid ""
-#| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Debian on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Unix systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "Если у вас на машине уже установлена операционная система <phrase arch="
-"\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> и вы хотите добавить &debian; на тот же диск, то вам нужно его "
-"переразметить. Для &debian; нужно создать отдельные разделы на жёстком диске."
-" "
-"Он не может быть установлен на разделы Windows или MacOS. Он может совместно "
-"использовать некоторые разделы с другими системами Unix, но в этом "
-"руководстве это не описывается. Как минимум, вам нужно выделить место под "
-"корневой раздел &debian;."
+"\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> и вы хотите добавить &debian; на тот же диск, то вам "
+"нужно его переразметить. Для &debian; нужно создать отдельные разделы на "
+"жёстком диске. Он не может быть установлен на разделы Windows или MacOS. Он "
+"может совместно использовать некоторые разделы с другими системами Unix, но "
+"в этом руководстве это не описывается. Как минимум, вам нужно выделить место "
+"под корневой раздел &debian;."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, no-c-format
-#| msgid ""
-#| "You can find information about your current partition setup by using a "
-#| "partitioning tool for your current operating system<phrase arch=\"x86\">, "
-#| "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such "
-#| "as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, "
-#| "such as the VM diskmap</phrase>. Partitioning tools always provide a way "
-#| "to show existing partitions without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
@@ -1344,14 +1262,13 @@ msgid ""
 msgstr ""
 "Вы можете найти информацию об имеющихся разделах с помощью инструментов "
 "разметки из имеющейся операционной системы<phrase arch=\"any-x86\">, "
-"например, "
-"fdisk или PartitionMagic</phrase><phrase arch=\"powerpc\">, например, Drive "
-"Setup, HD Toolkit или MacTools</phrase><phrase arch=\"s390\">, например, VM "
-"diskmap</phrase>. Любая утилита разметки умеет показывать существующие "
-"разделы без их изменения."
+"например, fdisk или PartitionMagic</phrase><phrase arch=\"powerpc\">, "
+"например, Drive Setup, HD Toolkit или MacTools</phrase><phrase arch="
+"\"s390\">, например, VM diskmap</phrase>. Любая утилита разметки умеет "
+"показывать существующие разделы без их изменения."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1366,19 +1283,14 @@ msgstr ""
 "вынести всю мебель перед переносом стен или же вы рискуете попортить её."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: написать о дисках HP-UX?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
-#| msgid ""
-#| "If your computer has more than one hard disk, you may want to dedicate "
-#| "one of the hard disks completely to Debian. If so, you don't need to "
-#| "partition that disk before booting the installation system; the "
-#| "installer's included partitioning program can handle the job nicely."
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
 "of the hard disks completely to &debian;. If so, you don't need to partition "
@@ -1391,7 +1303,7 @@ msgstr ""
 "содержит утилиту разметки, которая хорошо справляется со своей работой."
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1418,15 +1330,8 @@ msgstr ""
 "например, с оригинальных системных установочных лент или CD."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
-#| msgid ""
-#| "If your machine already has multiple partitions, and enough space can be "
-#| "provided by deleting and replacing one or more of them, then you too can "
-#| "wait and use the Debian installer's partitioning program. You should "
-#| "still read through the material below, because there may be special "
-#| "circumstances like the order of the existing partitions within the "
-#| "partition map, that force you to partition before installing anyway."
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
 "provided by deleting and replacing one or more of them, then you too can "
@@ -1438,18 +1343,14 @@ msgstr ""
 "Если на машине уже есть несколько разделов, а достаточное место может быть "
 "получено удалением или замещением одного или двух из них, то вы также можете "
 "отложить разметку до процедуры установки &debian;. Тем не менее, вы всё "
-"равно "
-"должны дочитать этот материал до конца, так как могут встретиться необычные "
-"комбинации, типа соблюдения порядка существующих разделов в таблице "
-"разделов, что всё равно заставит вас переразмечать диск до запуска установки."
+"равно должны дочитать этот материал до конца, так как могут встретиться "
+"необычные комбинации, типа соблюдения порядка существующих разделов в "
+"таблице разделов, что всё равно заставит вас переразмечать диск до запуска "
+"установки."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
-#| msgid ""
-#| "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
-#| "you can wait and use Debian installer's partitioning program to resize "
-#| "the filesystem."
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
 "you can wait and use &debian; installer's partitioning program to resize the "
@@ -1460,17 +1361,8 @@ msgstr ""
 "установки &debian; для изменения размера файловой системы."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
-#| msgid ""
-#| "If none of the above apply, you'll need to partition your hard disk "
-#| "before starting the installation to create partitionable space for "
-#| "Debian. If some of the partitions will be owned by other operating "
-#| "systems, you should create those partitions using native operating system "
-#| "partitioning programs. We recommend that you do <emphasis>not</emphasis> "
-#| "attempt to create partitions for &debian-gnu; using another operating "
-#| "system's tools. Instead, you should just create the native operating "
-#| "system's partitions you will want to retain."
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
 "starting the installation to create partitionable space for &debian;. If "
@@ -1491,14 +1383,8 @@ msgstr ""
 "оставить."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
-#| msgid ""
-#| "If you are going to install more than one operating system on the same "
-#| "machine, you should install all other system(s) before proceeding with "
-#| "Debian installation. Windows and other OS installations may destroy your "
-#| "ability to start Debian, or encourage you to reformat non-native "
-#| "partitions."
 msgid ""
 "If you are going to install more than one operating system on the same "
 "machine, you should install all other system(s) before proceeding with "
@@ -1512,7 +1398,7 @@ msgstr ""
 "посоветовать вам переформатировать все неизвестные для них разделы."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1522,18 +1408,8 @@ msgstr ""
 "родной системы в первую очередь оградит вас от подобных проблем."
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, no-c-format
-#| msgid ""
-#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
-#| "parttype; partitions should appear before all other partitions on the "
-#| "disk, especially MacOS boot partitions. This should be kept in mind when "
-#| "pre-partitioning; you should create a &arch-parttype; placeholder "
-#| "partition to come <emphasis>before</emphasis> the other bootable "
-#| "partitions on the disk. (The small partitions dedicated to Apple disk "
-#| "drivers are not bootable.) You can delete the placeholder with the Debian "
-#| "partition tools later during the actual install, and replace it with "
-#| "&arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
@@ -1551,16 +1427,11 @@ msgstr ""
 "другими загрузочными разделами на диске. (Маленькие разделы, выделенные для "
 "дисковых драйверов Apple, не загрузочные.) Вы можете удалить раздел-пустышку "
 "с помощью утилит разметки &debian; позже во время установки, и заменить его "
-"на "
-"раздел &arch-parttype;."
+"на раздел &arch-parttype;."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
-#| msgid ""
-#| "If you currently have one hard disk with one partition (a common setup "
-#| "for desktop computers), and you want to multi-boot the native operating "
-#| "system and Debian, you will need to:"
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
 "desktop computers), and you want to multi-boot the native operating system "
@@ -1570,13 +1441,13 @@ msgstr ""
 "компьютеров) и вы хотите запускать родную систему и &debian;, то вам нужно:"
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Сделать резервную копию всех файлов компьютера."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1589,7 +1460,7 @@ msgstr ""
 "keycap>, пока не начнётся загрузка с CD, а не система MacOS.</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1599,17 +1470,14 @@ msgstr ""
 "Оставить или раздел-пустышку, или свободное место для &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "Установить родную операционную систему в её новый раздел."
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
-#| msgid ""
-#| "Boot back into the native system to verify everything's OK, and to "
-#| "download the Debian installer boot files."
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
 "the &debian; installer boot files."
@@ -1618,27 +1486,21 @@ msgstr ""
 "загрузить файлы программы установки &debian;."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
-#| msgid "Boot the Debian installer to continue installing Debian."
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
 "Загрузить программу установки &debian;, чтобы продолжить установку &debian;."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Разметка дисков из DOS или Windows"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
-#| msgid ""
-#| "If you are manipulating existing FAT or NTFS partitions, it is "
-#| "recommended that you either use the scheme below or native Windows or DOS "
-#| "tools. Otherwise, it is not really necessary to partition from DOS or "
-#| "Windows; the Debian partitioning tools will generally do a better job."
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
 "that you either use the scheme below or native Windows or DOS tools. "
@@ -1651,16 +1513,8 @@ msgstr ""
 "утилиты разметки &debian; обычно лучше подходят для этой работы."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
-#| msgid ""
-#| "But if you have a large IDE disk, and are not using LBA addressing, "
-#| "overlay drivers (sometimes provided by hard disk manufacturers), or a new "
-#| "(post 1998) BIOS that supports large disk access extensions, then you "
-#| "must locate your Debian boot partition carefully. In this case, you will "
-#| "have to put the boot partition into the first 1024 cylinders of your hard "
-#| "disk (usually around 524 megabytes, without BIOS translation). This may "
-#| "require that you move an existing FAT or NTFS partition."
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
 "drivers (sometimes provided by hard disk manufacturers), or a new (post "
@@ -1675,62 +1529,43 @@ msgstr ""
 "дисков ) или у вас не новый (после 1998 года) BIOS, который поддерживает "
 "расширенный доступ к большим дискам, то вы должны правильно разместить "
 "загрузочный раздел &debian;. В этом случае нужно разместить загрузочный "
-"раздел "
-"на первых 1024 цилиндрах жёсткого диска (обычно это первые 524 мегабайта без "
-"трансляции BIOS). Для этого может потребоваться перемещение существующего "
-"раздела FAT или NTFS."
+"раздел на первых 1024 цилиндрах жёсткого диска (обычно это первые 524 "
+"мегабайта без трансляции BIOS). Для этого может потребоваться перемещение "
+"существующего раздела FAT или NTFS."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "Переразметка без потерь при запуске из DOS, Win-32 или OS/2"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
-#| msgid ""
-#| "One of the most common installations is onto a system that already "
-#| "contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, "
-#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian onto the same "
-#| "disk without destroying the previous system. Note that the installer "
-#| "supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
-#| "Simply start the installer and when you get to the partitioning step, "
-#| "select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </"
-#| "menuchoice> partitioning, select the partition to resize, and specify its "
-#| "new size. So in most cases you should not need to use the method "
-#| "described below."
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "Одна из наиболее распространённых установок: на машину, которая уже содержит "
-"DOS (включая Windows 3.1), Win32 (все Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7) или "
-"OS/2, и желательно разместить &debian; на том же диске без уничтожения "
-"предыдущей системы. Заметим, что программа установки поддерживает изменение "
-"размера файловых систем FAT и NTFS, используемых DOS и Windows. Просто "
-"запустите программу установки, выберите <menuchoice> <guimenuitem>Вручную</"
-"guimenuitem> </menuchoice>, изменяемый раздел и задайте новый размер. "
-"Поэтому в большинстве случаев вы не должны использовать метод, описываемый "
-"ниже."
+"DOS (включая Windows 3.1), Win32 (все Windows 95, 98, Me, NT, 2000, XP, "
+"2003, Vista, 7) или OS/2, и желательно разместить &debian; на том же диске "
+"без уничтожения предыдущей системы. Заметим, что программа установки "
+"поддерживает изменение размера файловых систем FAT и NTFS, используемых DOS "
+"и Windows. Просто запустите программу установки, выберите <menuchoice> "
+"<guimenuitem>Вручную</guimenuitem> </menuchoice>, изменяемый раздел и "
+"задайте новый размер. Поэтому в большинстве случаев вы не должны "
+"использовать метод, описываемый ниже."
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
-#| msgid ""
-#| "Before going any further, you should have decided how you will be "
-#| "dividing up the disk. The method in this section will only split a "
-#| "partition into two pieces. One will contain the original OS and the other "
-#| "will be used for Debian. During the installation of Debian, you will be "
-#| "given the opportunity to use the Debian portion of the disk as you see "
-#| "fit, i.e., as swap or as a file system."
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
 "up the disk. The method in this section will only split a partition into two "
@@ -1746,7 +1581,7 @@ msgstr ""
 "диска &debian;, то есть, под раздел подкачки или в качестве файловой системы."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1763,12 +1598,12 @@ msgstr ""
 "уменьшает количество места, которое можно вычленить из раздела."
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
+#: preparing.xml:983
+#, fuzzy, no-c-format
 #| msgid ""
 #| "The first thing needed is a copy of <command>fips</command> which is "
 #| "available in the <filename>tools/</filename> directory on your nearest "
-#| "Debian mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
 #| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
 #| "filename> to a bootable floppy. A bootable floppy can be created using "
 #| "the command <filename>sys a:</filename> under DOS. <command>fips</"
@@ -1777,30 +1612,28 @@ msgstr ""
 #| "compression driver or a disk manager. Create the disk and read the "
 #| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "Во-первых, нужно скопировать <command>fips</command> из каталога "
 "<filename>tools/</filename> с ближайшего сервера-зеркала &debian;. "
-"Распакуйте "
-"архив и скопируйте файлы <filename>RESTORRB.EXE</filename>, <filename>FIPS."
-"EXE</filename> и <filename>ERRORS.TXT</filename> на загрузочную дискету. "
-"Загрузочную дискету можно создать с помощью команды <filename>sys a:</"
-"filename> из DOS. По <command>fips</command> есть хорошая документация, с "
-"которой не плохо было бы ознакомиться. Вам однозначно нужно прочитать её, "
-"если вы используете драйвер сжатия или дисковый менеджер. Создайте диск и "
-"прочитайте документацию <emphasis>перед</emphasis> дефрагментацией диска."
+"Распакуйте архив и скопируйте файлы <filename>RESTORRB.EXE</filename>, "
+"<filename>FIPS.EXE</filename> и <filename>ERRORS.TXT</filename> на "
+"загрузочную дискету. Загрузочную дискету можно создать с помощью команды "
+"<filename>sys a:</filename> из DOS. По <command>fips</command> есть хорошая "
+"документация, с которой не плохо было бы ознакомиться. Вам однозначно нужно "
+"прочитать её, если вы используете драйвер сжатия или дисковый менеджер. "
+"Создайте диск и прочитайте документацию <emphasis>перед</emphasis> "
+"дефрагментацией диска."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1820,7 +1653,7 @@ msgstr ""
 "длинных имён."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1832,7 +1665,7 @@ msgstr ""
 "<filename>a:\\fips</filename> и следуйте инструкциям."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1842,20 +1675,14 @@ msgstr ""
 "<command>fips</command> чем-то не подошёл вам."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Разметка для DOS"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
-#| msgid ""
-#| "If you are partitioning for DOS drives, or changing the size of DOS "
-#| "partitions, using Debian tools, many people experience problems working "
-#| "with the resulting FAT partitions. For instance, some have reported slow "
-#| "performance, consistent problems with <command>scandisk</command>, or "
-#| "other weird errors in DOS or Windows."
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
 "partitions, using &debian; tools, many people experience problems working "
@@ -1865,19 +1692,13 @@ msgid ""
 msgstr ""
 "Если вы делаете раздел для диска DOS или изменяете размер разделов DOS с "
 "помощью утилит &debian;, надо сказать, что много людей испытывали проблемы "
-"при "
-"работе с получившимися разделами FAT. Например, некоторые рассказывали о "
+"при работе с получившимися разделами FAT. Например, некоторые рассказывали о "
 "плохой производительности, проблемах целостности с <command>scandisk</"
 "command> и других странных ошибках в DOS или Windows."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
-#| msgid ""
-#| "Apparently, whenever you create or resize a partition for DOS use, it's a "
-#| "good idea to fill the first few sectors with zeros. You should do this "
-#| "prior to running DOS's <command>format</command> command by executing the "
-#| "following command from Debian:"
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
 "good idea to fill the first few sectors with zeros. You should do this prior "
@@ -1890,27 +1711,20 @@ msgstr ""
 "следующую команду &debian;:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Разметка из SunOS"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
-#| msgid ""
-#| "It's perfectly fine to partition from SunOS; in fact, if you intend to "
-#| "run both SunOS and Debian on the same machine, it is recommended that you "
-#| "partition using SunOS prior to installing Debian. The Linux kernel "
-#| "understands Sun disk labels, so there are no problems there. SILO "
-#| "supports booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), "
-#| "romfs or iso9660 (CDROM) partitions."
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
 "both SunOS and &debian; on the same machine, it is recommended that you "
@@ -1921,20 +1735,19 @@ msgid ""
 msgstr ""
 "Разметка замечательно делается из SunOS; фактически, если вы намереваетесь "
 "работать и в SunOS, и в &debian; на одной машине, то даже рекомендуется "
-"делать "
-"разметку с помощью SunOS перед установкой &debian;. Ядро Linux понимает "
-"таблицу разделов Sun (disk labels), поэтому с этим не будет никаких проблем. "
-"SILO поддерживает загрузку Linux и SunOS с разделов EXT2 (Linux), UFS "
-"(SunOS), romfs или iso9660 (CDROM)."
+"делать разметку с помощью SunOS перед установкой &debian;. Ядро Linux "
+"понимает таблицу разделов Sun (disk labels), поэтому с этим не будет никаких "
+"проблем. SILO поддерживает загрузку Linux и SunOS с разделов EXT2 (Linux), "
+"UFS (SunOS), romfs или iso9660 (CDROM)."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Разметка из Linux или другой ОС"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1958,7 +1771,7 @@ msgstr ""
 "возникнут проблемы с геометрией диска."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1973,13 +1786,13 @@ msgstr ""
 ">."
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "Разметка MacOS/OSX"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1994,7 +1807,7 @@ msgstr ""
 "разметки не показан в <application>Drive Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -2006,7 +1819,7 @@ msgstr ""
 "установки &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -2032,7 +1845,7 @@ msgstr ""
 "OS 9 и OS X доступны и из OS 9 и из OS X."
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -2050,23 +1863,15 @@ msgstr ""
 "поддерживаются и MacOS и Linux."
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 "Настройка аппаратного обеспечения и операционной системы перед установкой"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
-#| msgid ""
-#| "This section will walk you through pre-installation hardware setup, if "
-#| "any, that you will need to do prior to installing Debian. Generally, this "
-#| "involves checking and possibly changing firmware settings for your "
-#| "system. The <quote>firmware</quote> is the core software used by the "
-#| "hardware; it is most critically invoked during the bootstrap process "
-#| "(after power-up). Known hardware issues affecting the reliability of "
-#| "&debian-gnu; on your system are also highlighted."
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
 "that you will need to do prior to installing &debian;. Generally, this "
@@ -2078,29 +1883,21 @@ msgid ""
 msgstr ""
 "В этом разделе описывается аппаратное обеспечение, для которого требуется "
 "настройка перед установкой &debian;. Обычно, для этого производится проверка "
-"и "
-"возможно, изменение настроек микропрограммы вашей системы. "
+"и возможно, изменение настроек микропрограммы вашей системы. "
 "<quote>Микропрограмма (firmware)</quote> &mdash; это программное обеспечение "
 "используемое аппаратным обеспечением; она почти всегда вызывается во время "
 "загрузки машины (после подачи питания). Здесь также описаны известные "
 "проблемы аппаратного обеспечения, которые влияют на надёжность &debian-gnu;."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Вызов меню настройки BIOS"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
-#| msgid ""
-#| "BIOS provides the basic functions needed to boot your machine to allow "
-#| "your operating system to access your hardware. Your system probably "
-#| "provides a BIOS setup menu, which is used to configure the BIOS. Before "
-#| "installing, you <emphasis>must</emphasis> ensure that your BIOS is set up "
-#| "correctly; not doing so can lead to intermittent crashes or an inability "
-#| "to install Debian."
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
 "operating system to access your hardware. Your system probably provides a "
@@ -2116,7 +1913,7 @@ msgstr ""
 "случайные сбои или невозможность установки &debian;."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -2130,13 +1927,13 @@ msgstr ""
 "производителя программы BIOS:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr ""
@@ -2144,13 +1941,13 @@ msgstr ""
 "самотестирование при включении питания)"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2160,25 +1957,25 @@ msgstr ""
 "keycap> </keycombo> или <keycap>Delete</keycap> во время POST"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "Клавиша <keycap>Esc</keycap> во время POST"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -2190,13 +1987,13 @@ msgstr ""
 "keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2208,7 +2005,7 @@ msgstr ""
 "keycap> </keycombo> или <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2218,7 +2015,7 @@ msgstr ""
 "invoking-bios-info;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2235,23 +2032,14 @@ msgstr ""
 
 # index.docbook:1535, index.docbook:1873
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Выбор загрузочного устройства"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
-#| msgid ""
-#| "Many BIOS setup menus allow you to select the devices that will be used "
-#| "to bootstrap the system. Set this to look for a bootable operating system "
-#| "on <filename>A:</filename> (the first floppy disk), then optionally the "
-#| "first CD-ROM device (possibly appearing as <filename>D:</filename> or "
-#| "<filename>E:</filename>), and then from <filename>C:</filename> (the "
-#| "first hard disk). This setting enables you to boot from either a floppy "
-#| "disk or a CD-ROM, which are the two most common boot devices used to "
-#| "install Debian."
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
 "bootstrap the system. Set this to look for a bootable operating system on "
@@ -2272,7 +2060,7 @@ msgstr ""
 "&debian;."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2284,7 +2072,7 @@ msgstr ""
 "разрешить загрузку с CD-ROM в BIOS SCSI-контроллера."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2300,7 +2088,7 @@ msgstr ""
 "загрузку с <quote>Removable drive</quote> или даже с <quote>USB-ZIP</quote>."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2311,13 +2099,13 @@ msgstr ""
 "порядок после установки &arch-kernel; на загрузку с жёсткого диска."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Изменение порядка загрузки на компьютерах с IDE"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2329,7 +2117,7 @@ msgstr ""
 "на компьютер, какие клавиши предназначены для этого."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2339,19 +2127,19 @@ msgstr ""
 "обычно вам нужно искать поле со списком дисководов."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "Распространённые поля на машинах с IDE: C, A, cdrom или A, C, cdrom."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C &mdash; это жёсткий диск, а A &mdash; дисковод гибких дисков."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2363,7 +2151,7 @@ msgstr ""
 "<keycap>Page Down</keycap>, которые по циклу перебирают возможные значения."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2371,13 +2159,13 @@ msgid ""
 msgstr "Сохраните изменения. Как это сделать написано в подсказке на экране."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Изменение порядка загрузки на компьютерах со SCSI"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
@@ -2386,7 +2174,7 @@ msgstr ""
 "настройки SCSI."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2396,7 +2184,7 @@ msgstr ""
 "сделать, появляется подсказка на экране."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2408,20 +2196,20 @@ msgstr ""
 "нужную комбинацию посмотрите в документации на аппаратуру."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Найдите пункт изменения порядка загрузки."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
 msgstr "Настройте так, что SCSI ID привода компакт дисков был первым в списке."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2431,19 +2219,19 @@ msgstr ""
 "вы должны нажать <keycap>F10</keycap>."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Другие настройки BIOS"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "Настройки CD-ROM"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2457,13 +2245,13 @@ msgstr ""
 "<userinput>seek failed</userinput>, вероятно, проблема в этом."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Расширенная и дополнительная память"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2478,13 +2266,13 @@ msgstr ""
 "память."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Защита от вирусов"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2510,13 +2298,13 @@ msgstr ""
 "после настройки системного загрузчика. </para> </footnote>."
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Shadow RAM"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2542,13 +2330,13 @@ msgstr ""
 "аппаратуре."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Memory Hole"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2559,7 +2347,7 @@ msgstr ""
 "выключите это. &arch-kernel; найдёт эту память, если она есть."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2580,13 +2368,13 @@ msgstr ""
 "а может и без него."
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Усовершенствованное управление питанием (Advanced Power Management)"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2602,13 +2390,13 @@ msgstr ""
 "это лучше чем BIOS."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Вход в OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2623,7 +2411,7 @@ msgstr ""
 "документации на железо, которая поставляется вместе с машиной."
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2640,7 +2428,7 @@ msgstr ""
 "модели. Подробней смотрите <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2664,7 +2452,7 @@ msgstr ""
 "модемный порт и запустить на ней программу терминала."
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2686,13 +2474,13 @@ msgstr ""
 "установить заплатку микропрограммы в nvram."
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Вызов OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2709,7 +2497,7 @@ msgstr ""
 "д."
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2730,7 +2518,7 @@ msgstr ""
 "чтобы получить приглашение нового типа."
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2745,7 +2533,7 @@ msgstr ""
 "терминала."
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2765,7 +2553,7 @@ msgstr ""
 "openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2808,7 +2596,7 @@ msgstr ""
 "OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2839,19 +2627,19 @@ msgstr ""
 "</screen></informalexample> и в Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Настройка BIOS"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2874,7 +2662,7 @@ msgstr ""
 "консоли 3215/3270."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2895,19 +2683,8 @@ msgstr ""
 "аппаратурой)) из LPAR, если HMC и эта опция вам доступны."
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
-#| msgid ""
-#| "Before you actually perform an installation, you have to go over some "
-#| "design and preparation steps. IBM has made documentation available about "
-#| "the whole process, e.g. how to prepare an installation medium and how "
-#| "actually to boot from that medium. Duplicating that information here is "
-#| "neither possible nor necessary. However, we will describe here which kind "
-#| "of Debian-specific data is needed and where to find it. Using both "
-#| "sources of information, you have to prepare your machine and the "
-#| "installation medium before you can perform a boot from it. When you see "
-#| "the welcome message in your client session, return to this document to go "
-#| "through the Debian-specific installation steps."
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
 "and preparation steps. IBM has made documentation available about the whole "
@@ -2923,23 +2700,21 @@ msgstr ""
 "Перед тем как выполнить установку, проведите планирование и некоторые "
 "предварительные шаги. IBM сделала доступной документацию о всём процессе, "
 "например, о подготовке установочного носителя и как загрузиться из этого "
-"носителя. "
-"Дублировать эту информацию нет необходимости. Однако, здесь мы опишем "
-"какие &debian;-специфичные данные нужны и где их найти. Основываясь на обоих "
-"источниках информации вы подготовите машину и установочный носитель для "
-"выполнения "
-"загрузки. Когда вы увидите приглашение клиентского сеанса, возьмите этот "
-"документ опять, чтобы проделать шаги установки, специфичные для установки "
-"&debian;."
+"носителя. Дублировать эту информацию нет необходимости. Однако, здесь мы "
+"опишем какие &debian;-специфичные данные нужны и где их найти. Основываясь "
+"на обоих источниках информации вы подготовите машину и установочный носитель "
+"для выполнения загрузки. Когда вы увидите приглашение клиентского сеанса, "
+"возьмите этот документ опять, чтобы проделать шаги установки, специфичные "
+"для установки &debian;."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Родная и LPAR установки"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2955,13 +2730,13 @@ msgstr ""
 "Distributions</ulink> Redbook о том как настроить LPAR для Linux."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Установка в качестве гостевой виртуальной машины (VM)"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2978,13 +2753,21 @@ msgstr ""
 "запуска Linux."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "Вам нужно скопировать все файлы из подкаталога <filename>generic</filename> "
 "на CMS диск. Проверьте, что копирование <filename>kernel.debian</filename> и "
@@ -2992,13 +2775,13 @@ msgstr ""
 "постоянной длиной записи равной 80 символам."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Настройка сервера установки"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -3012,7 +2795,7 @@ msgstr ""
 "установить и должен быть доступен через NFS, HTTP или FTP."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -3026,25 +2809,25 @@ msgstr ""
 "CD с таким же деревом каталогов."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: нужно больше информации из Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Аппаратные проблемы, которых нужно остерегаться"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Поддержка USB в BIOS и клавиатуры"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -3065,13 +2848,13 @@ msgstr ""
 "<quote>USB keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Изображение на мониторе OldWorld Powermac"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -3092,6 +2875,16 @@ msgstr ""
 "попробуйте изменить настройки экрана в MacOS на использование 256 цветов "
 "вместо <quote>тысяч</quote> или <quote>миллионов</quote>."
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Инструкции по установке и драйверам устройств (DASD, XPRAM, Console, "
+#~ "tape, z90 crypto, chandev, network)для Linux на &arch-title; с ядром 2.4"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Драйвера устройств и команды установки"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha FAQ"
 
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index cff82af8a..430095a74 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 20:52+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: preseed.xml:16
@@ -335,12 +335,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:252
 #, no-c-format
-#| msgid ""
-#| "For the other preseeding methods you need to tell the installer what file "
-#| "to use when you boot it. This is normally done by passing the kernel a "
-#| "boot parameter, either manually at boot time or by editing the bootloader "
-#| "configuration file (e.g. <filename>syslinux.cfg</filename>) and adding "
-#| "the parameter to the end of the append line(s) for the kernel."
 msgid ""
 "For the other preseeding methods you need to tell the installer what file to "
 "use when you boot it. This is normally done by passing the kernel a boot "
@@ -355,26 +349,18 @@ msgid ""
 msgstr ""
 "Для других методов автоматической установки нужно указать при загрузке "
 "программе установки какой файл использовать при загрузке. Это можно сделать "
-"через "
-"параметр загрузки ядра, вручную во время загрузки или изменив "
-"файл настройки системного загрузчика <phrase arch=\"linux-any\">(например, <"
-"filename>syslinux.cfg</"
-"filename>) и добавить параметр в конец строки append для "
-"ядра.</phrase><phrase arch=\"kfreebsd-any\">(например, <filename>grub.cfg</"
-"filename>) добавить параметр ядра как новую "
-"строку <literal>set</literal>.</phrase><phrase arch=\"hurd-any\">(например, "
-"<filename>grub.cfg</filename>) и добавить параметр в конец строки <filename>"
-"gnumach.gz</"
+"через параметр загрузки ядра, вручную во время загрузки или изменив файл "
+"настройки системного загрузчика <phrase arch=\"linux-any\">(например, "
+"<filename>syslinux.cfg</filename>) и добавить параметр в конец строки append "
+"для ядра.</phrase><phrase arch=\"kfreebsd-any\">(например, <filename>grub."
+"cfg</filename>) добавить параметр ядра как новую строку <literal>set</"
+"literal>.</phrase><phrase arch=\"hurd-any\">(например, <filename>grub.cfg</"
+"filename>) и добавить параметр в конец строки <filename>gnumach.gz</"
 "filename> line.</phrase>"
 
 #. Tag: para
 #: preseed.xml:265
 #, no-c-format
-#| msgid ""
-#| "If you do specify the preconfiguration file in the bootloader "
-#| "configuration, you might change the configuration so you don't need to "
-#| "hit enter to boot the installer. For syslinux this means setting the "
-#| "timeout to <literal>1</literal> in <filename>syslinux.cfg</filename>."
 msgid ""
 "If you do specify the preconfiguration file in the bootloader configuration, "
 "you might change the configuration so you don't need to hit enter to boot "
@@ -384,15 +370,12 @@ msgid ""
 "timeout to <literal>0</literal> in <filename>grub.cfg</filename>.</phrase>"
 msgstr ""
 "Если вы указываете файл ответов в настройке системного загрузчика, то можно "
-"изменить "
-"конфигурацию таким образом, чтобы не нажимать клавишу ввод для загрузки "
-"программы установки. <phrase arch=\"linux-any\">Для syslinux это достигается "
-"установкой timeout равным "
-"<literal>1</literal> в файле <filename>syslinux.cfg</filename>.</"
-"phrase><phrase arch=\"kfrebsd-any;hurd-any\">Для grub это достигается "
-"установкой "
-"timeout равным <literal>0</literal> в файле <filename>grub.cfg</filename>.<"
-"/phrase>"
+"изменить конфигурацию таким образом, чтобы не нажимать клавишу ввод для "
+"загрузки программы установки. <phrase arch=\"linux-any\">Для syslinux это "
+"достигается установкой timeout равным <literal>1</literal> в файле "
+"<filename>syslinux.cfg</filename>.</phrase><phrase arch=\"kfrebsd-any;hurd-"
+"any\">Для grub это достигается установкой timeout равным <literal>0</"
+"literal> в файле <filename>grub.cfg</filename>.</phrase>"
 
 #. Tag: para
 #: preseed.xml:274
@@ -617,20 +600,6 @@ msgstr "Автоматический режим"
 #. Tag: para
 #: preseed.xml:381
 #, no-c-format
-#| msgid ""
-#| "There are several features of Debian Installer that combine to allow "
-#| "fairly simple command lines at the boot prompt to result in arbitrarily "
-#| "complex customized automatic installs. To illustrate this, here are some "
-#| "examples that can be used at the boot prompt: <informalexample><screen>\n"
-#| "auto url=autoserver\n"
-#| "</screen></informalexample> This relies on there being a DHCP server that "
-#| "will get the machine to the point where <literal>autoserver</literal> can "
-#| "be resolved by DNS, perhaps after adding the local domain if that was "
-#| "provided by DHCP. If this was done at a site where the domain is "
-#| "<literal>example.com</literal>, and they have a reasonably sane DHCP "
-#| "setup, it would result in the preseed file being retrieved from "
-#| "<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
-#| "literal>."
 msgid ""
 "There are several features of &debian; Installer that combine to allow "
 "fairly simple command lines at the boot prompt to result in arbitrarily "
@@ -646,8 +615,7 @@ msgid ""
 "com/d-i/&releasename;/./preseed.cfg</literal>."
 msgstr ""
 "Есть несколько возможностей программы установки &debian;, объединив которые "
-"с "
-"помощью простых команд в приглашении к загрузке, можно получить "
+"с помощью простых команд в приглашении к загрузке, можно получить "
 "автоматическую установку любого уровня настраиваемости. Вот один из примеров "
 "использования настроек в приглашении к загрузке: <informalexample><screen>\n"
 "auto url=autoserver\n"
@@ -655,10 +623,9 @@ msgstr ""
 "настройкам с DHCP сервера будет найдена машина <literal>autoserver</literal> "
 "из записей DNS, возможно к имени будет добавлено имя локального домена, если "
 "он передаётся в DHCP. Если в сети используется доменное имя <literal>example."
-"com</"
-"literal>, и этот домен передаётся по DHCP, то в результате файл с ответами "
-"будет получен с <literal>http://autoserver.example.com/d-i/&releasename;/./"
-"preseed.cfg</literal>."
+"com</literal>, и этот домен передаётся по DHCP, то в результате файл с "
+"ответами будет получен с <literal>http://autoserver.example.com/d-i/"
+"&releasename;/./preseed.cfg</literal>."
 
 #. Tag: para
 #: preseed.xml:398
@@ -1040,14 +1007,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:537
 #, no-c-format
-#| msgid ""
-#| "It's also possible to use DHCP to specify a preconfiguration file to "
-#| "download from the network. DHCP allows specifying a filename. Normally "
-#| "this is a file to netboot, but if it appears to be an URL then "
-#| "installation media that support network preseeding will download the file "
-#| "from the URL and use it as a preconfiguration file. Here is an example of "
-#| "how to set it up in the dhcpd.conf for version 3 of the ISC DHCP server "
-#| "(the dhcp3-server Debian package)."
 msgid ""
 "It's also possible to use DHCP to specify a preconfiguration file to "
 "download from the network. DHCP allows specifying a filename. Normally this "
@@ -1095,12 +1054,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:557
 #, no-c-format
-#| msgid ""
-#| "A good way to use the DHCP preseeding is to only preseed values specific "
-#| "to your network, such as the Debian mirror to use. This way installs on "
-#| "your network will automatically get a good mirror selected, but the rest "
-#| "of the installation can be performed interactively. Using DHCP preseeding "
-#| "to fully automate Debian installs should only be done with care."
 msgid ""
 "A good way to use the DHCP preseeding is to only preseed values specific to "
 "your network, such as the &debian; mirror to use. This way installs on your "
@@ -1108,13 +1061,12 @@ msgid ""
 "installation can be performed interactively. Using DHCP preseeding to fully "
 "automate &debian; installs should only be done with care."
 msgstr ""
-"При автоматизации с помощью DHCP лучше указывать только значения "
-"специфичные для вашей сети, например, желаемые сервера-зеркала &debian;. "
-"В этом случае при установке по сети машины получат правильные "
-"сервера-зеркала, а оставшаяся "
-"установка будет выполнена в интерактивном режиме. Использование DHCP для "
-"полной автоматической установки &debian; тоже возможна, но с большой "
-"осторожностью."
+"При автоматизации с помощью DHCP лучше указывать только значения специфичные "
+"для вашей сети, например, желаемые сервера-зеркала &debian;. В этом случае "
+"при установке по сети машины получат правильные сервера-зеркала, а "
+"оставшаяся установка будет выполнена в интерактивном режиме. Использование "
+"DHCP для полной автоматической установки &debian; тоже возможна, но с "
+"большой осторожностью."
 
 #. Tag: title
 #: preseed.xml:571
@@ -2032,13 +1984,17 @@ msgstr "Разметка с использованием RAID"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
 msgstr ""
 "Также вы можете автоматизировать настройку массивов программного RAID. "
 "Поддерживаются RAID уровни 0, 1, 5, 6 и 10, создание неполных массивов "
@@ -2047,7 +2003,26 @@ msgstr ""
 "см. <xref linkend=\"preseed-bootloader\"/>."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgstr ""
+"Также вы можете автоматизировать настройку массивов программного RAID. "
+"Поддерживаются RAID уровни 0, 1, 5, 6 и 10, создание неполных массивов "
+"(degraded arrays) и можно указать запасные устройства. Если вы используете "
+"RAID 1, то можете автоматизировать установку grub на все устройства массива, "
+"см. <xref linkend=\"preseed-bootloader\"/>."
+
+#. Tag: para
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2063,7 +2038,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2166,13 +2141,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Управление монтированием разделов"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2192,7 +2167,7 @@ msgstr ""
 "на основе UUID."
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2203,7 +2178,7 @@ msgstr ""
 "ы."
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2219,7 +2194,7 @@ msgstr ""
 "ваша система начинает работать непредсказуемым образом."
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2236,13 +2211,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "Установка базовой системы"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2253,7 +2228,7 @@ msgstr ""
 "основном они касаются установки ядра."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2285,13 +2260,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "Настройка учётной записи"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2303,7 +2278,7 @@ msgstr ""
 "виде или в виде <emphasis>хешей</emphasis> MD5."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2319,7 +2294,7 @@ msgstr ""
 "пароль прямым перебором."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2378,7 +2353,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2399,26 +2374,26 @@ msgstr ""
 "<command>sudo</command>)."
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "С помощью следующей команды можно сгенерировать MD5 хеш для пароля:"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "Настройка Apt"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2432,7 +2407,7 @@ msgstr ""
 "добавить другие (локальные) репозитории."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2492,13 +2467,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "Выбор пакетов"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2508,73 +2483,73 @@ msgstr ""
 "Доступные задачи:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "standard (стандартная система)"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "desktop (рабочий стол)"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop (рабочий стол gnome)"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop (рабочий стол kde)"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-server (веб сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "print-server (сервер печати)"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server (DNS-сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "file-server (файловый сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server (почтовый сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database (база данных SQL)"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop (для ноутбука)"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2586,7 +2561,7 @@ msgstr ""
 "<userinput>standard</userinput>."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2602,7 +2577,7 @@ msgstr ""
 "указать в командной строке ядра."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2640,22 +2615,26 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Установка загрузчика"
 
 #. Tag: screen
-#: preseed.xml:1084
-#, no-c-format
+#: preseed.xml:1087
+#, fuzzy, no-c-format
 #| msgid ""
-#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
 #| "# instead, uncomment this:\n"
 #| "#d-i grub-installer/skip boolean true\n"
 #| "# To also skip installing lilo, and install no bootloader, uncomment "
 #| "this\n"
 #| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
 #| "\n"
 #| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
 #| "the\n"
@@ -2726,6 +2705,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2786,7 +2767,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2798,13 +2779,13 @@ msgstr ""
 "linkend=\"preseed-account\"/>."
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "Завершение установки"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2844,13 +2825,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Автоматизация других пакетов"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2873,19 +2854,19 @@ msgstr ""
 "#   debconf-get-selections >> файл"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "Дополнительные параметры"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Запуск пользовательских команд во время установки"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2896,7 +2877,7 @@ msgstr ""
 "моменты установки."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2946,14 +2927,14 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr ""
 "Использование автоматической установки для изменения значений по умолчанию"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2979,7 +2960,7 @@ msgstr ""
 "помочь при отладке или тестировании вашего файла ответов."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2993,7 +2974,7 @@ msgstr ""
 "этого пакета. См. сноску к <xref linkend=\"preseed-bootparms\"/>."
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -3017,13 +2998,13 @@ msgstr ""
 "<quote>внутренние</quote> параметры."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Последовательная загрузка нескольких файлов ответов"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -3039,7 +3020,7 @@ msgstr ""
 "конфигураций в другие файлы."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -3092,7 +3073,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
@@ -3109,4 +3090,3 @@ msgstr ""
 "разных по сути метода автоматизации, что, например, приведёт к выполнению "
 "команды из preseed/early дважды: один раз из первого метода, второй раз "
 "после включения сети."
-
diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index 89220fc14..a7d4a25a1 100644
--- a/po/ru/random-bits.po
+++ b/po/ru/random-bits.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-25 10:02+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: random-bits.xml:4
@@ -831,8 +831,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS-сервер"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -846,23 +874,14 @@ msgstr ""
 "зависит от языка; добавьте около 350 МБ на загрузку и установку."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Установка &debian-gnu; из системы Unix/Linux"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
-#| msgid ""
-#| "This section explains how to install &debian-gnu; from an existing Unix "
-#| "or Linux system, without using the menu-driven installer as explained in "
-#| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
-#| "SUSE. In this section some familiarity with entering *nix commands and "
-#| "navigating the file system is assumed. In this section, <prompt>$</"
-#| "prompt> symbolizes a command to be entered in the user's current system, "
-#| "while <prompt>#</prompt> refers to a command entered in the Debian chroot."
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
@@ -884,14 +903,8 @@ msgstr ""
 "относится к команде, вводимой в &debian; chroot."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
-#| msgid ""
-#| "Once you've got the new Debian system configured to your preference, you "
-#| "can migrate your existing user data (if any) to it, and keep on rolling. "
-#| "This is therefore a <quote>zero downtime</quote> &debian-gnu; install. "
-#| "It's also a clever way for dealing with hardware that otherwise doesn't "
-#| "play friendly with various boot or installation media."
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
 "can migrate your existing user data (if any) to it, and keep on rolling. "
@@ -907,17 +920,8 @@ msgstr ""
 "загрузочными или установочными носителями."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
-#| msgid ""
-#| "As this is a mostly manual procedure, you should bear in mind that you "
-#| "will need to do a lot of basic configuration of the system yourself, "
-#| "which will also require more knowledge of Debian and of &arch-kernel; in "
-#| "general than performing a regular installation. You cannot expect this "
-#| "procedure to result in a system that is identical to a system from a "
-#| "regular installation. You should also keep in mind that this procedure "
-#| "only gives the basic steps to set up a system. Additional installation "
-#| "and/or configuration steps may be needed."
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
 "need to do a lot of basic configuration of the system yourself, which will "
@@ -937,13 +941,13 @@ msgstr ""
 "системы. Может потребоваться дополнительная установка и/или настройка."
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "Начинаем"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -959,7 +963,7 @@ msgstr ""
 "если вы будете устанавливать окружение рабочего стола типа GNOME или KDE)."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -977,18 +981,8 @@ msgstr ""
 "указывайте параметр <userinput>-j</userinput>."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
-#| msgid ""
-#| "Initialize and activate swap (substitute the partition number for your "
-#| "intended Debian swap partition): <informalexample><screen>\n"
-#| "# mkswap /dev/<replaceable>hda5</replaceable>\n"
-#| "# sync; sync; sync\n"
-#| "# swapon /dev/<replaceable>hda5</replaceable>\n"
-#| "</screen></informalexample> Mount one partition as <filename>/mnt/"
-#| "debinst</filename> (the installation point, to be the root (<filename>/</"
-#| "filename>) filesystem on your new system). The mount point name is "
-#| "strictly arbitrary, it is referenced later below."
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
 "intended &debian; swap partition): <informalexample><screen>\n"
@@ -1011,7 +1005,7 @@ msgstr ""
 "абсолютно произвольное."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -1021,7 +1015,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -1033,25 +1027,14 @@ msgstr ""
 "перед тем как перейти к следующему этапу."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Установка <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
-#| msgid ""
-#| "The utility used by the Debian installer, and recognized as the official "
-#| "way to install a Debian base system, is <command>debootstrap</command>. "
-#| "It uses <command>wget</command> and <command>ar</command>, but otherwise "
-#| "depends only on <classname>/bin/sh</classname> and basic Unix/Linux "
-#| "tools<footnote> <para> These include the GNU core utilities and commands "
-#| "like <command>sed</command>, <command>grep</command>, <command>tar</"
-#| "command> and <command>gzip</command>. </para> </footnote>. Install "
-#| "<command>wget</command> and <command>ar</command> if they aren't already "
-#| "on your current system, then download and install <command>debootstrap</"
-#| "command>."
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
 "way to install a &debian; base system, is <command>debootstrap</command>. It "
@@ -1075,19 +1058,8 @@ msgstr ""
 "command>."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
-#| msgid ""
-#| "Or, you can use the following procedure to install it manually. Make a "
-#| "work folder for extracting the .deb into: <informalexample><screen>\n"
-#| "# mkdir work\n"
-#| "# cd work\n"
-#| "</screen></informalexample> The <command>debootstrap</command> binary is "
-#| "located in the Debian archive (be sure to select the proper file for your "
-#| "architecture). Download the <command>debootstrap</command> .deb from the "
-#| "<ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> "
-#| "pool</ulink>, copy the package to the work folder, and extract the files "
-#| "from it. You will need to have root privileges to install the files."
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
 "folder for extracting the .deb into: <informalexample><screen>\n"
@@ -1106,15 +1078,14 @@ msgstr ""
 "# cd work\n"
 "</screen></informalexample> Двоичный файл <command>debootstrap</command> "
 "расположен в архиве &debian; (убедитесь, что вы выбрали правильный файл, "
-"соответствующий вашей архитектуре). Скачайте <command>debootstrap</"
-"command> .deb из <ulink url=\"http://ftp.debian.org/debian/pool/main/d/"
-"debootstrap/\">пула</ulink>, скопируйте пакет в рабочий каталог и извлеките "
-"из "
-"него файлы. Для установки файлов вам потребуются привилегии "
-"суперпользователя (root)."
+"соответствующий вашей архитектуре). Скачайте <command>debootstrap</command> ."
+"deb из <ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/"
+"\">пула</ulink>, скопируйте пакет в рабочий каталог и извлеките из него "
+"файлы. Для установки файлов вам потребуются привилегии суперпользователя "
+"(root)."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1126,20 +1097,14 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Запуск <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
-#| msgid ""
-#| "<command>debootstrap</command> can download the needed files directly "
-#| "from the archive when you run it. You can substitute any Debian archive "
-#| "mirror for <userinput>&archive-mirror;/debian</userinput> in the command "
-#| "example below, preferably a mirror close to you network-wise. Mirrors are "
-#| "listed at <ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
 "the archive when you run it. You can substitute any &debian; archive mirror "
@@ -1154,7 +1119,7 @@ msgstr ""
 "url=\"http://www.debian.org/mirror/list\"></ulink>."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1166,7 +1131,7 @@ msgstr ""
 "URL: <userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1187,7 +1152,7 @@ msgstr ""
 "<userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1197,21 +1162,14 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Настройка базовой системы"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
-#| msgid ""
-#| "Now you've got a real Debian system, though rather lean, on disk. "
-#| "<command>chroot</command> into it: <informalexample><screen>\n"
-#| "# LANG=C chroot /mnt/debinst /bin/bash\n"
-#| "</screen></informalexample> After chrooting you may need to set the "
-#| "terminal definition to be compatible with the Debian base system, for "
-#| "example:"
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
 "<command>chroot</command> into it: <informalexample><screen>\n"
@@ -1228,19 +1186,19 @@ msgstr ""
 "например:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "Создание файлов устройств"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1260,20 +1218,20 @@ msgstr ""
 "статические файлы устройств."
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "Некоторые доступные способы:"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr ""
 "создание используемого по умолчанию набора статических файлов устройств"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1283,7 +1241,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1292,7 +1250,7 @@ msgstr ""
 "<command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1305,55 +1263,14 @@ msgstr ""
 "использовать осторожно"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Монтирование разделов"
 
 #. Tag: para
-#: random-bits.xml:591
-#, no-c-format
-#| msgid ""
-#| "You need to create <filename>/etc/fstab</filename>. "
-#| "<informalexample><screen>\n"
-#| "# editor /etc/fstab\n"
-#| "</screen></informalexample> Here is a sample you can modify to suit: "
-#| "<informalexample><screen>\n"
-#| "# /etc/fstab: static file system information.\n"
-#| "#\n"
-#| "# file system    mount point   type    options                  dump "
-#| "pass\n"
-#| "/dev/XXX         /             ext3    defaults                 0    1\n"
-#| "/dev/XXX         /boot         ext3    ro,nosuid,nodev          0    2\n"
-#| "\n"
-#| "/dev/XXX         none          swap    sw                       0    0\n"
-#| "proc             /proc         proc    defaults                 0    0\n"
-#| "\n"
-#| "/dev/fd0         /media/floppy auto    noauto,rw,sync,user,exec 0    0\n"
-#| "/dev/cdrom       /media/cdrom  iso9660 noauto,ro,user,exec      0    0\n"
-#| "\n"
-#| "/dev/XXX         /tmp          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /var          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /usr          ext3    rw,nodev                 0    2\n"
-#| "/dev/XXX         /home         ext3    rw,nosuid,nodev          0    2\n"
-#| "</screen></informalexample> Use <userinput>mount -a</userinput> to mount "
-#| "all the file systems you have specified in your <filename>/etc/fstab</"
-#| "filename>, or, to mount file systems individually, use: "
-#| "<informalexample><screen>\n"
-#| "# mount /path   # e.g.: mount /usr\n"
-#| "</screen></informalexample> Current Debian systems have mountpoints for "
-#| "removable media under <filename>/media</filename>, but keep compatibility "
-#| "symlinks in <filename>/</filename>. Create these as as needed, for "
-#| "example: <informalexample><screen>\n"
-#| "# cd /media\n"
-#| "# mkdir cdrom0\n"
-#| "# ln -s cdrom0 cdrom\n"
-#| "# cd /\n"
-#| "# ln -s media/cdrom\n"
-#| "</screen></informalexample> You can mount the proc file system multiple "
-#| "times and to arbitrary locations, though <filename>/proc</filename> is "
-#| "customary. If you didn't use <userinput>mount -a</userinput>, be sure to "
-#| "mount proc before continuing:"
+#: random-bits.xml:598
+#, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1421,8 +1338,7 @@ msgstr ""
 "<informalexample><screen>\n"
 "# mount /path   # пример: mount /usr\n"
 "</screen></informalexample> В системах &debian; точки монтирования для "
-"съёмных "
-"носителей расположены в <filename>/media</filename>, но для обратной "
+"съёмных носителей расположены в <filename>/media</filename>, но для обратной "
 "совместимости в <filename>/</filename> созданы символические ссылки. "
 "Создайте их, если нужно. Пример: <informalexample><screen>\n"
 "# cd /media\n"
@@ -1436,13 +1352,13 @@ msgstr ""
 "тем как продолжить, убедитесь, что proc смонтирована:"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1454,19 +1370,19 @@ msgstr ""
 "chroot:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Настройка часового пояса"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1480,7 +1396,7 @@ msgstr ""
 "это и выбрать часовой пояс."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1490,13 +1406,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "Настройка сети"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1627,13 +1543,13 @@ msgstr ""
 "интерфейса (eth0, eth1 и т.д.) как вы и ожидали."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Настройка Apt"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1659,13 +1575,13 @@ msgstr ""
 "update</userinput> после изменения списка источников."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Настройка раскладки клавиатуры и локалей"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1685,7 +1601,7 @@ msgstr ""
 "</screen></informalexample> Для настройки раскладки клавиатуры (если нужно):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1695,7 +1611,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1705,13 +1621,13 @@ msgstr ""
 "chroot, но настройка будет произведена после следующей перезагрузки."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Установка ядра"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1722,19 +1638,19 @@ msgstr ""
 "помощью:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "Затем установите пакет с ядром, указав подходящий вам вариант."
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1744,19 +1660,14 @@ msgstr ""
 "replaceable>"
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Установка системного загрузчика"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
-#| msgid ""
-#| "To make your &debian-gnu; system bootable, set up your boot loader to "
-#| "load the installed kernel with your new root partition. Note that "
-#| "<command>debootstrap</command> does not install a boot loader, though you "
-#| "can use <command>aptitude</command> inside your Debian chroot to do so."
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
 "the installed kernel with your new root partition. Note that "
@@ -1770,17 +1681,8 @@ msgstr ""
 "вашего &debian; chroot, чтобы сделать это."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, no-c-format
-#| msgid ""
-#| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
-#| "userinput> for instructions on setting up the bootloader. If you are "
-#| "keeping the system you used to install Debian, just add an entry for the "
-#| "Debian install to your existing grub <filename>menu.lst</filename> or "
-#| "<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
-#| "could also copy it to the new system and edit it there. After you are "
-#| "done editing, call <command>lilo</command> (remember it will use "
-#| "<filename>lilo.conf</filename> relative to the system you call it from)."
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
 "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
@@ -1792,22 +1694,19 @@ msgid ""
 "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> "
 "relative to the system you call it from)</phrase>."
 msgstr ""
-"Просмотрите <userinput>info grub</userinput> <phrase arch=\"x86\">или <"
-"userinput>man lilo.conf</"
-"userinput></phrase> про установку системного загрузчика. Если вы оставляете "
-"систему, "
-"которую использовали для установки &debian;, просто добавьте запись для "
-"установленной системы &debian; в существующий файл grub <filename>menu.lst</"
-"filename><phrase arch=\"x86\">или <filename>lilo.conf</filename>. Для <"
-"filename>lilo.conf</"
-"filename> вы можете также скопировать его в новую систему и отредактировать "
-"его там. После того как закончите редактирование, вызовите <command>lilo<"
-"/command> (помните, "
-"что он будет использовать <filename>lilo.conf</filename>, относящийся к "
-"системе, из которой его вызвали)</phrase>."
+"Просмотрите <userinput>info grub</userinput> <phrase arch=\"x86\">или "
+"<userinput>man lilo.conf</userinput></phrase> про установку системного "
+"загрузчика. Если вы оставляете систему, которую использовали для установки "
+"&debian;, просто добавьте запись для установленной системы &debian; в "
+"существующий файл grub <filename>menu.lst</filename><phrase arch=\"x86\">или "
+"<filename>lilo.conf</filename>. Для <filename>lilo.conf</filename> вы можете "
+"также скопировать его в новую систему и отредактировать его там. После того "
+"как закончите редактирование, вызовите <command>lilo</command> (помните, что "
+"он будет использовать <filename>lilo.conf</filename>, относящийся к системе, "
+"из которой его вызвали)</phrase>."
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1831,7 +1730,7 @@ msgstr ""
 "filename>."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1843,13 +1742,13 @@ msgstr ""
 "command>, но они здесь не описаны."
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Вот простой <filename>/etc/lilo.conf</filename> в качестве примера:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1871,16 +1770,8 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
-#| msgid ""
-#| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
-#| "up the bootloader. If you are keeping the system you used to install "
-#| "Debian, just add an entry for the Debian install to your existing "
-#| "<filename>yaboot.conf</filename>. You could also copy it to the new "
-#| "system and edit it there. After you are done editing, call ybin (remember "
-#| "it will use <filename>yaboot.conf</filename> relative to the system you "
-#| "call it from)."
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
 "the bootloader. If you are keeping the system you used to install &debian;, "
@@ -1892,15 +1783,14 @@ msgstr ""
 "Просмотрите <userinput>man yaboot.conf</userinput> для инструкций об "
 "установке системного загрузчика. Если вы оставляете систему, которую "
 "использовали для установки &debian;, просто добавьте запись для "
-"установленной "
-"системы &debian; в существующий <filename>yaboot.conf</filename>. Также вы "
-"можете скопировать его в новую систему и отредактировать его там. После "
-"того, как закончите редактирование, вызовите ybin (помните, что он будет "
-"использовать <filename>yaboot.conf</filename>, относящийся к системе, из "
-"которой его вызвали)."
+"установленной системы &debian; в существующий <filename>yaboot.conf</"
+"filename>. Также вы можете скопировать его в новую систему и отредактировать "
+"его там. После того, как закончите редактирование, вызовите ybin (помните, "
+"что он будет использовать <filename>yaboot.conf</filename>, относящийся к "
+"системе, из которой его вызвали)."
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1930,13 +1820,13 @@ msgstr ""
 "использовать <userinput>ide0:</userinput> вместо <userinput>hd:</userinput>."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Заключительные шаги"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1955,7 +1845,7 @@ msgstr ""
 "<command>aptitude</command> для установки отдельных пакетов."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1967,26 +1857,20 @@ msgstr ""
 "запустив:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "Установка &debian-gnu; через Parallel Line IP (PLIP)"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
-#| msgid ""
-#| "This section explains how to install &debian-gnu; on a computer without "
-#| "an Ethernet card, but with just a remote gateway computer attached via a "
-#| "Null-Modem cable (also called Null-Printer cable). The gateway computer "
-#| "should be connected to a network that has a Debian mirror on it (e.g. to "
-#| "the Internet)."
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
 "Ethernet card, but with just a remote gateway computer attached via a Null-"
@@ -2001,7 +1885,7 @@ msgstr ""
 "Интернет)."
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -2017,7 +1901,7 @@ msgstr ""
 "не должны использоваться в вашем сетевом адресном пространстве)."
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -2028,7 +1912,7 @@ msgstr ""
 "перезагрузки в установленную систему (смотрите <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -2041,26 +1925,23 @@ msgstr ""
 "<literal>io=0x378</literal>, <literal>irq=7</literal>."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "Требования"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
-#| msgid ""
-#| "A target computer, called <emphasis>target</emphasis>, where Debian will "
-#| "be installed."
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
 "be installed."
 msgstr ""
-"На компьютер приёмник, называемый <emphasis>приёмник</emphasis>, "
-"будет установлен &debian;."
+"На компьютер приёмник, называемый <emphasis>приёмник</emphasis>, будет "
+"установлен &debian;."
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
@@ -2068,7 +1949,7 @@ msgstr ""
 "\"/>."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -2078,7 +1959,7 @@ msgstr ""
 "emphasis>, будет использоваться в качестве шлюза."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -2089,13 +1970,13 @@ msgstr ""
 "<ulink url=\"&url-plip-install-howto;\">PLIP-Install-HOWTO</ulink>."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "Настройка источника"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -2105,7 +1986,7 @@ msgstr ""
 "источника в качестве шлюза в Интернет через ppp0."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -2147,13 +2028,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "Установка приёмника"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2179,13 +2060,13 @@ msgstr ""
 "различных этапах установки."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Загрузка компонент программы установки с CD"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2195,13 +2076,13 @@ msgstr ""
 "доступным PLIP драйвера для программы установки."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Определение сетевой карты"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2216,7 +2097,7 @@ msgstr ""
 "установки не покажет этого списка."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2228,19 +2109,19 @@ msgstr ""
 "<userinput>plip</userinput>."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "Настройка сети"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Настроить сеть автоматически с помощью DHCP: нет"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2248,7 +2129,7 @@ msgstr ""
 "IP-адрес: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2257,7 +2138,7 @@ msgstr ""
 "Адрес PPP: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2267,13 +2148,13 @@ msgstr ""
 "(смотрите <filename>/etc/resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "Установка &debian-gnu; с использованием PPP через Ethernet (PPPoE)"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2289,7 +2170,7 @@ msgstr ""
 "добиться. В этом разделе будет описано как это сделать."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2301,7 +2182,7 @@ msgstr ""
 "\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2315,7 +2196,7 @@ msgstr ""
 "или floppy</phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2325,7 +2206,7 @@ msgstr ""
 "способа установки. Далее будут описаны различия."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2341,7 +2222,7 @@ msgstr ""
 "classname>) будет загружена и и запущена автоматически."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2361,7 +2242,7 @@ msgstr ""
 "quote> в строке приглашения к загрузке. </para> </footnote>)."
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2371,7 +2252,7 @@ msgstr ""
 "целью распознавания имеющихся в системе карт Ethernet."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2383,7 +2264,7 @@ msgstr ""
 "через все найденные интерфейсы Ethernet."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2399,7 +2280,7 @@ msgstr ""
 "PPPoE-соединения</guimenuitem> из главного меню программы установки."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2409,7 +2290,7 @@ msgstr ""
 "информацию (имя пользователя и пароль для PPPoE)."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2430,13 +2311,13 @@ msgstr ""
 "guimenuitem>."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "Программа установки с графическим интерфейсом"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2451,7 +2332,7 @@ msgstr ""
 "интерфейсе."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2469,7 +2350,7 @@ msgstr ""
 "целиком влезают на один экран."
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2491,15 +2372,8 @@ msgstr ""
 "пункта <quote>Help</quote> в загрузочном меню."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
-#| msgid ""
-#| "There is also a graphical installer image that can be netbooted. And "
-#| "there is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso"
-#| "\"> <para> The mini ISO image can be downloaded from a Debian mirror as "
-#| "described in <xref linkend=\"downloading-files\"/>. Look for "
-#| "<filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is "
-#| "mainly useful for testing."
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
 "is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso\"> "
@@ -2516,16 +2390,8 @@ msgstr ""
 "для тестов."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
-#| msgid ""
-#| "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
-#| "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
-#| "can be downloaded from a Debian mirror as described in <xref linkend="
-#| "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</"
-#| "filename>. </para> </footnote>. It should work on almost all PowerPC "
-#| "systems that have an ATI graphical card, but is unlikely to work on other "
-#| "systems."
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
 "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
@@ -2543,7 +2409,7 @@ msgstr ""
 "системах."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2553,7 +2419,7 @@ msgstr ""
 "запуске её графической версии."
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2567,7 +2433,7 @@ msgstr ""
 "<quote>newt</quote>."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2582,13 +2448,13 @@ msgstr ""
 "консольным интерфейсом."
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "Использование программы установки с графическим интерфейсом"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2600,7 +2466,7 @@ msgstr ""
 "использовать для выполнения процесса установки."
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2620,7 +2486,7 @@ msgstr ""
 "активировать &BTN-CONT;."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2632,7 +2498,7 @@ msgstr ""
 "кнопки или клавиши <keycap>F1</keycap>."
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/ru/using-d-i.po b/po/ru/using-d-i.po
index 6ce8179a3..db6f16cd4 100644
--- a/po/ru/using-d-i.po
+++ b/po/ru/using-d-i.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-25 10:13+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -15,13 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: using-d-i.xml:5
 #, no-c-format
-#| msgid "Using the Debian Installer"
 msgid "Using the &debian; Installer"
 msgstr "Использование программы установки &debian;"
 
@@ -34,12 +33,6 @@ msgstr "Как работает программа установки"
 #. Tag: para
 #: using-d-i.xml:8
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer consists of a number of special-purpose components "
-#| "to perform each installation task. Each component performs its task, "
-#| "asking the user questions as necessary to do its job. The questions "
-#| "themselves are given priorities, and the priority of questions to be "
-#| "asked is set when the installer is started."
 msgid ""
 "The &debian; Installer consists of a number of special-purpose components to "
 "perform each installation task. Each component performs its task, asking the "
@@ -370,7 +363,6 @@ msgstr "cdrom-detect"
 #. Tag: para
 #: using-d-i.xml:185
 #, no-c-format
-#| msgid "Looks for and mounts a Debian installation CD."
 msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Ищет и монтирует компакт-диск с программой установки &debian;."
 
@@ -413,9 +405,6 @@ msgstr "choose-mirror"
 #. Tag: para
 #: using-d-i.xml:210
 #, no-c-format
-#| msgid ""
-#| "Presents a list of Debian archive mirrors. The user may choose the source "
-#| "of his installation packages."
 msgid ""
 "Presents a list of &debian; archive mirrors. The user may choose the source "
 "of his installation packages."
@@ -476,11 +465,24 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr ""
+"Настраивает пароль суперпользователя и добавляет обычного пользователя."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -490,31 +492,26 @@ msgstr ""
 "нет."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "Выбирает часовой пояс, основываясь на местоположении указанном ранее."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
-#| msgid ""
-#| "Allows the user to partition disks attached to the system, create file "
-#| "systems on the selected partitions, and attach them to the mountpoints. "
-#| "Included are also interesting features like a fully automatic mode or LVM "
-#| "support. This is the preferred partitioning tool in Debian."
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
 "systems on the selected partitions, and attach them to the mountpoints. "
@@ -528,13 +525,13 @@ msgstr ""
 "утилита для работы с разделами в &debian;."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -544,13 +541,13 @@ msgstr ""
 "разметки будет соответствовать архитектуре вашего компьютера."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -560,13 +557,13 @@ msgstr ""
 "согласно пользовательским указаниям."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -576,13 +573,13 @@ msgstr ""
 "логических томов)."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -594,13 +591,13 @@ msgstr ""
 "дешёвые IDE (псевдо-аппаратные) RAID-контроллеры в новых материнских платах."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -610,19 +607,6 @@ msgstr ""
 "работать под &debian-gnu; после перезагрузки."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr ""
-"Настраивает пароль суперпользователя и добавляет обычного пользователя."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -721,11 +705,6 @@ msgstr "save-logs"
 #. Tag: para
 #: using-d-i.xml:381
 #, no-c-format
-#| msgid ""
-#| "Provides a way for the user to record information on a floppy disk, "
-#| "network, hard disk, or other media when trouble is encountered, in order "
-#| "to accurately report installer software problems to Debian developers "
-#| "later."
 msgid ""
 "Provides a way for the user to record information on a floppy disk, network, "
 "hard disk, or other media when trouble is encountered, in order to "
@@ -734,8 +713,7 @@ msgstr ""
 "Предоставляет пользователю возможность записать информацию на дискету, через "
 "сеть, на жёсткий диск или другой носитель в случае возникновения проблем, "
 "чтобы позже отправить разработчикам &debian; точный отчёт о проблеме в "
-"программе "
-"установки."
+"программе установки."
 
 #. Tag: title
 #: using-d-i.xml:399
@@ -762,23 +740,12 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:412
 #, no-c-format
-#| msgid "Setting up Debian Installer and Hardware Configuration"
 msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "Настройка программы установки &debian; и оборудования"
 
 #. Tag: para
 #: using-d-i.xml:413
 #, no-c-format
-#| msgid ""
-#| "Let's assume the Debian Installer has booted and you are facing its first "
-#| "screen. At this time, the capabilities of &d-i; are still quite limited. "
-#| "It doesn't know much about your hardware, preferred language, or even the "
-#| "task it should perform. Don't worry. Because &d-i; is quite clever, it "
-#| "can automatically probe your hardware, locate the rest of its components "
-#| "and upgrade itself to a capable installation system. However, you still "
-#| "need to help &d-i; with some information it can't determine automatically "
-#| "(like selecting your preferred language, keyboard layout or desired "
-#| "network mirror)."
 msgid ""
 "Let's assume the &debian; Installer has booted and you are facing its first "
 "screen. At this time, the capabilities of &d-i; are still quite limited. It "
@@ -984,12 +951,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:530
 #, no-c-format
-#| msgid ""
-#| "The selected geographic location (in most cases a country) will be used "
-#| "later in the installation process to select the correct time zone and a "
-#| "Debian mirror appropriate for that country. Language and country together "
-#| "will help determine the default locale for your system and select the "
-#| "correct keyboard layout."
 msgid ""
 "The selected geographic location (in most cases a country) will be used "
 "later in the installation process to select the correct time zone and a "
@@ -999,10 +960,9 @@ msgid ""
 msgstr ""
 "Указанное значение географического расположения (в большинстве случаев "
 "&mdash; страны) будет использовано позднее в процессе установки для выбора "
-"правильного часового пояса и подходящего для страны сервера-зеркала &debian;."
-" "
-"Значения страны и языка будут использованы вместе для настройки локали вашей "
-"системы и выборе правильной раскладки клавиатуры."
+"правильного часового пояса и подходящего для страны сервера-зеркала "
+"&debian;. Значения страны и языка будут использованы вместе для настройки "
+"локали вашей системы и выборе правильной раскладки клавиатуры."
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -1141,8 +1101,8 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Клавиатуры часто приспосабливают к алфавиту определённого языка. Выберите "
 "раскладку, которая подходит к вашей клавиатуре, или выберите наиболее "
@@ -1189,18 +1149,12 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:675
 #, no-c-format
-#| msgid "Looking for the Debian Installer ISO Image"
 msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Поиск образа ISO программы установки &debian;"
 
 #. Tag: para
 #: using-d-i.xml:676
 #, no-c-format
-#| msgid ""
-#| "When installing via the <emphasis>hd-media</emphasis> method, there will "
-#| "be a moment where you need to find and mount the Debian Installer iso "
-#| "image in order to get the rest of the installation files. The component "
-#| "<command>iso-scan</command> does exactly this."
 msgid ""
 "When installing via the <emphasis>hd-media</emphasis> method, there will be "
 "a moment where you need to find and mount the &debian; Installer iso image "
@@ -1215,20 +1169,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:683
 #, no-c-format
-#| msgid ""
-#| "At first, <command>iso-scan</command> automatically mounts all block "
-#| "devices (e.g. partitions) which have some known filesystem on them and "
-#| "sequentially searches for filenames ending with <filename>.iso</filename> "
-#| "(or <filename>.ISO</filename> for that matter). Beware that the first "
-#| "attempt scans only files in the root directory and in the first level of "
-#| "subdirectories (i.e. it finds <filename>/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, <filename>/data/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, but not <filename>/data/tmp/"
-#| "<replaceable>whatever</replaceable>.iso</filename>). After an iso image "
-#| "has been found, <command>iso-scan</command> checks its content to "
-#| "determine if the image is a valid Debian iso image or not. In the former "
-#| "case we are done, in the latter <command>iso-scan</command> seeks for "
-#| "another image."
 msgid ""
 "At first, <command>iso-scan</command> automatically mounts all block devices "
 "(e.g. partitions) which have some known filesystem on them and sequentially "
@@ -1245,17 +1185,17 @@ msgid ""
 msgstr ""
 "Сначала <command>iso-scan</command> автоматически смонтирует все блочные "
 "устройства (например, разделы), на которых есть распознанная файловая "
-"система, и "
-"последовательно будет искать на них файлы с именами, оканчивающимися на "
-"<filename>.iso</filename> (или <filename>.ISO</filename>, это важно). "
-"Обратите внимание, ищутся файлы только в корневом каталоге и подкаталогах "
-"первого уровня (то есть найдутся файлы <filename>/<replaceable>имя</"
-"replaceable>.iso</filename>, <filename>/data/<replaceable>имя</replaceable>."
-"iso</filename>, но не <filename>/data/tmp/<replaceable>имя</replaceable>."
-"iso</filename>). После нахождения iso-образа, <command>iso-scan</command> "
-"проверит его содержимое чтобы выяснить, является ли образ правильным "
-"iso-образом &debian; или нет. В первом случае поиск завершается, в последнем "
-"<command>iso-scan</command> будет искать другой образ."
+"система, и последовательно будет искать на них файлы с именами, "
+"оканчивающимися на <filename>.iso</filename> (или <filename>.ISO</filename>, "
+"это важно). Обратите внимание, ищутся файлы только в корневом каталоге и "
+"подкаталогах первого уровня (то есть найдутся файлы <filename>/"
+"<replaceable>имя</replaceable>.iso</filename>, <filename>/data/"
+"<replaceable>имя</replaceable>.iso</filename>, но не <filename>/data/tmp/"
+"<replaceable>имя</replaceable>.iso</filename>). После нахождения iso-образа, "
+"<command>iso-scan</command> проверит его содержимое чтобы выяснить, является "
+"ли образ правильным iso-образом &debian; или нет. В первом случае поиск "
+"завершается, в последнем <command>iso-scan</command> будет искать другой "
+"образ."
 
 #. Tag: para
 #: using-d-i.xml:700
@@ -1496,11 +1436,150 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Добавление пользователей и паролей"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"После установки базовой системы, программа установки предложит вам настроить "
+"учётную запись <quote>root</quote> и/или учётную запись для первого "
+"пользователя. Дополнительные учётные записи можно будет создать после "
+"завершения установки."
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "Установка пароля суперпользователя (root)"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"Учётная запись <emphasis>root</emphasis> также называемая "
+"<emphasis>суперпользовательской</emphasis> &mdash; это учётная запись, для "
+"которой нет никаких преград в вашей системе. Учётная запись root должна "
+"использоваться только для администрирования системы и как можно меньшее "
+"время."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"Любой создаваемый вами пароль должен состоять как минимум из 6 символов и "
+"содержать заглавные и строчные буквы, а также знаки препинания. Уделите "
+"побольше внимания при установке пароля root, поскольку эта самая мощная "
+"учётная запись. Избегайте слов из словаря или использования любой "
+"персональной информации, которую можно угадать."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Если кто-то говорит вам, что ему нужен ваш пароль root, будьте очень "
+"осторожны. Обычно нет необходимости давать свой пароль root кому-либо, если "
+"только вы не администрируете машину вместе с другими системными "
+"администраторами."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Создание учётной записи обычного пользователя"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"Система спросит вас, желаете ли вы сейчас создать учётную запись для "
+"обычного пользователя. Эта учётная запись должна использоваться в качестве "
+"вашей основной рабочей учётной записи. Вы <emphasis>не должны</emphasis> "
+"использовать учётную запись root в повседневной работе или в качестве "
+"персональной учётной записи."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"Почему не должны? Одна из причин, по которой следует избегать использования "
+"привилегий root это то, что в качестве root можно очень легко сделать "
+"необратимые повреждения. Другая причина: вас могут обманом заставить "
+"запустить программу <emphasis>троянского коня</emphasis> &mdash; это "
+"программа, которая воспользуется преимуществами ваших возможностей "
+"суперпользователя, чтобы скомпрометировать систему. В любой хорошей книге по "
+"системному администрированию Unix эта тема рассматривается подробно &mdash; "
+"прочтите одну из них, если это для вас в новинку."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Сначала вас попросят ввести полное имя пользователя. Затем спросят имя "
+"пользовательской учётной записи; в общем случае, ваше имя или что-то похожее "
+"вполне подойдёт. И, наконец, вас попросят ввести пароль учётной записи."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Если в любой момент после установки вы захотите создать ещё одну учётную "
+"запись, воспользуйтесь командой <command>adduser</command>."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Разметка разделов и выбор точек монтирования"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1518,7 +1597,7 @@ msgstr ""
 "настройка RAID, LVM или шифрованных устройств."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1528,7 +1607,7 @@ msgstr ""
 "процесса, смотрите <xref linkend=\"partitioning\"/>."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1550,7 +1629,7 @@ msgstr ""
 "станут недоступными."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1564,13 +1643,13 @@ msgstr ""
 "меню <guimenuitem>Вручную</guimenuitem>."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "Поддерживамые параметры разметки"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1582,7 +1661,7 @@ msgstr ""
 "системы и расширенные блочные устройства."
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1603,7 +1682,7 @@ msgstr ""
 "по умолчанию будут использоваться."
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1614,31 +1693,31 @@ msgstr ""
 "использовать совместно."
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "Управление логическими томами (LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "Программный RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "Поддерживается RAID 0, 1, 4, 5, 6 и 10 уровня."
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "Шифрование"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1647,7 +1726,7 @@ msgstr ""
 "classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1661,14 +1740,14 @@ msgstr ""
 "sataraid;\">вики</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr ""
 "<emphasis>Многолучевое устройство</emphasis> (экспериментальная поддержка)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1680,13 +1759,13 @@ msgstr ""
 "запуске программы установки."
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "Поддерживаются следующие файловые системы."
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1698,7 +1777,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1710,19 +1789,19 @@ msgstr ""
 "будет выбрана ext2."
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>jfs</emphasis> (недоступна на всех архитектурах)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>xfs</emphasis> (недоступна на всех архитектурах)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
@@ -1730,7 +1809,7 @@ msgstr ""
 "<emphasis>reiserfs</emphasis> (по выбору; недоступна на всех архитектурах)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1744,13 +1823,13 @@ msgstr ""
 "Поддерживается файловая система только третьей версии."
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1760,13 +1839,13 @@ msgstr ""
 "новых разделов с jffs2 не поддерживается."
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1776,19 +1855,19 @@ msgstr ""
 "новых разделов с qnx4 не поддерживается."
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (только на чтение)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1798,13 +1877,13 @@ msgstr ""
 "новых разделов с NTFS не поддерживается."
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "Направляющая разметка"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1822,7 +1901,7 @@ msgstr ""
 "</para> </footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1830,7 +1909,7 @@ msgstr ""
 "LVM или LVM с шифрованием может быть недоступно на некоторых архитектурах."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1847,7 +1926,7 @@ msgstr ""
 "дополнительную безопасность вашим (личным) данным."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1863,7 +1942,7 @@ msgstr ""
 "это занимает некоторое время в зависимости от размера диска."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1880,7 +1959,7 @@ msgstr ""
 "записью на диск попросит вас подтвердить выполнение этих изменений."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1898,7 +1977,7 @@ msgstr ""
 "диски вам поможет их показанный размер."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1913,7 +1992,7 @@ msgstr ""
 "самом конце; при использовании LVM (с шифрованием) это невозможно."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1932,73 +2011,73 @@ msgstr ""
 "завершится неудачно."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Схема разметки"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Минимальное пространство"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Создаваемые разделы"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Все файлы на одном разделе"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600МБ"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Отдельный раздел /home"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500МБ"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Отдельные разделы /home, /usr, /var и /tmp"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1ГБ</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -2008,7 +2087,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -2022,7 +2101,7 @@ msgstr ""
 "раздела LVM."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -2037,7 +2116,7 @@ msgstr ""
 "качестве загрузочного раздела EFI."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -2049,7 +2128,7 @@ msgstr ""
 "они будут смонтированы."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2099,7 +2178,7 @@ msgstr ""
 "разметки, это просто пример, созданный с помощью разметки вручную."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2119,20 +2198,14 @@ msgstr ""
 "предложенные изменения вручную, как описано ниже."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "Разметка вручную"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
-#| msgid ""
-#| "A similar screen to the one shown just above will be displayed if you "
-#| "choose manual partitioning except that your existing partition table will "
-#| "be shown and without the mount points. How to manually set up your "
-#| "partition table and the usage of partitions by your new Debian system "
-#| "will be covered in the remainder of this section."
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
 "manual partitioning except that your existing partition table will be shown "
@@ -2146,7 +2219,7 @@ msgstr ""
 "разделы в &debian;."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2160,7 +2233,7 @@ msgstr ""
 "строка <quote>СВОБОДНОЕ МЕСТО</quote>."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2201,7 +2274,7 @@ msgstr ""
 "главное меню <command>partman</command>."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2222,7 +2295,7 @@ msgstr ""
 "разделом подкачки. Также, из этого меню можно удалить раздел."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2239,7 +2312,7 @@ msgstr ""
 "исправите ошибку."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2251,7 +2324,7 @@ msgstr ""
 "вы создадите такой раздел."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2267,7 +2340,7 @@ msgstr ""
 "<filename>partman-xfs</filename> или <filename>partman-lvm</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2281,13 +2354,13 @@ msgstr ""
 "подтвердить, что все представленные файловые системы должны быть созданы."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Настройка устройств Multidisk (программный RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2308,7 +2381,7 @@ msgstr ""
 "название, <firstterm>программный RAID</firstterm>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2323,7 +2396,7 @@ msgstr ""
 "точку монтирования и т.д.)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2433,101 +2506,101 @@ msgstr ""
 "контрольных сумм. </para></listitem> </varlistentry> </variablelist> Итог:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Тип"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Минимум устройств"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Запасное устройство"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "Сохранятся ли данные при отказе диска?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Доступное пространство"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 # index.docbook:1062, index.docbook:1070
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 # index.docbook:1063, index.docbook:1064
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>нет</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "Размер самого маленького раздела умноженный на число устройств в RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 # index.docbook:1071, index.docbook:1079
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "необязательно"
 
 # index.docbook:1072, index.docbook:1080
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>да</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Размер самого маленького раздела в RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2537,20 +2610,20 @@ msgstr ""
 "один)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 # index.docbook:1062, index.docbook:1070
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2560,13 +2633,13 @@ msgstr ""
 "два)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2576,7 +2649,7 @@ msgstr ""
 "умолчанию два)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2586,7 +2659,7 @@ msgstr ""
 "software-raid-howto;\">Software RAID HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2602,7 +2675,7 @@ msgstr ""
 "устройство RAID</guimenuitem> </menuchoice>.)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2622,7 +2695,7 @@ msgstr ""
 "filename> и RAID1 для <filename>/boot</filename>."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2640,7 +2713,7 @@ msgstr ""
 "некоторую настройку или шаги установки вручную из командной строки."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2662,7 +2735,7 @@ msgstr ""
 "зависят от типа выбранного MD."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2673,7 +2746,7 @@ msgstr ""
 "вашей задачей будет выбор разделов, из которых вы хотите сформировать MD."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2693,7 +2766,7 @@ msgstr ""
 "позволит вам продолжить, пока вы не исправите ошибку."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2703,7 +2776,7 @@ msgstr ""
 "использовать как минимум <emphasis>три</emphasis> активных раздела."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2713,7 +2786,7 @@ msgstr ""
 "использовать как минимум <emphasis>четыре</emphasis> активных раздела."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2734,7 +2807,7 @@ msgstr ""
 "все копии по разным дискам."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2752,7 +2825,7 @@ msgstr ""
 "для <filename>/home</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2766,13 +2839,13 @@ msgstr ""
 "новых MD устройствах и назначить им обычные атрибуты типа точек монтирования."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Настройка менеджера логических томов (LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2789,7 +2862,7 @@ msgstr ""
 "и т.д."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2809,7 +2882,7 @@ msgstr ""
 "их группы томов) можно распределить по нескольким физическим дискам."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2830,7 +2903,7 @@ msgstr ""
 "HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2847,7 +2920,7 @@ msgstr ""
 "guimenuitem> </menuchoice>."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2867,7 +2940,7 @@ msgstr ""
 "Возможные действия:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2877,43 +2950,43 @@ msgstr ""
 "структуру LVM устройства, имена и размеры логических томов и т.д."
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Создать группу томов"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Создание логических томов"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Удалить группу томов"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Удаление логических томов"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Расширить группу томов"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Уменьшить группу томов"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2923,7 +2996,7 @@ msgstr ""
 "<command>partman</command>"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2933,7 +3006,7 @@ msgstr ""
 "логические тома."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2945,13 +3018,13 @@ msgstr ""
 "они одинаково)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Настройка шифрованных томов"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2973,7 +3046,7 @@ msgstr ""
 "данные на диске выглядят как случайный набор символов."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -3001,7 +3074,7 @@ msgstr ""
 "загрузить ядро с шифрованного раздела."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -3015,7 +3088,7 @@ msgstr ""
 "выбранного алгоритма шифрования и длины ключа."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -3035,7 +3108,7 @@ msgstr ""
 "параметров шифрования."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -3051,7 +3124,7 @@ msgstr ""
 "непреодолимых причин, рекомендуется использовать метод по умолчанию."
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -3065,13 +3138,13 @@ msgstr ""
 "вдумчиво выбирались исходя из соображений безопасности."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Шифрование: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3096,13 +3169,13 @@ msgstr ""
 "конфиденциальной информации в 21-ом веке."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Размер ключа: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -3116,13 +3189,13 @@ msgstr ""
 "ключа зависят от шифра."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV алгоритм: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3140,7 +3213,7 @@ msgstr ""
 "повторяющихся участков в шифрованных данных."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3155,25 +3228,25 @@ msgstr ""
 "задействовать новые алгоритмы."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Ключ шифрования: <userinput>ключевая фраза</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Здесь можно ввести тип ключа шифрования для этого раздела."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Ключевая фраза"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3187,13 +3260,13 @@ msgstr ""
 "которую вы сможете ввести позже."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Произвольный ключ"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3211,7 +3284,7 @@ msgstr ""
 "продолжительность жизни.)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3230,13 +3303,13 @@ msgstr ""
 "загрузки) восстановить приостановленные данные записанные в раздел подкачки."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Стереть данные: <userinput>да</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3257,7 +3330,7 @@ msgstr ""
 "неоднократной перезаписи на магнитооптических носителях. </para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3269,13 +3342,13 @@ msgstr ""
 "следующие параметры:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Шифрование: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3287,25 +3360,25 @@ msgstr ""
 "размерах ключей смотрите в разделах ранее."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Ключ шифрования: <userinput>Keyfile (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "Здесь вы можете выбрать тип ключа шифрования для этого раздела."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "файл ключа (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3320,19 +3393,19 @@ msgstr ""
 "позже в процессе установки)."
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "Подробней о произвольных ключах смотрите в разделе ранее."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "Подробней о стирании данных смотрите в разделе ранее."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3350,7 +3423,7 @@ msgstr ""
 "это может занять некоторое время."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3367,7 +3440,7 @@ msgstr ""
 "родственников и тому подобное)."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3391,7 +3464,7 @@ msgstr ""
 "ключевой фразы для корневой файловой системы."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3414,7 +3487,7 @@ msgstr ""
 "для каждого шифруемого раздела."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3448,7 +3521,7 @@ msgstr ""
 "устраивают."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3466,7 +3539,7 @@ msgstr ""
 "<xref linkend=\"mount-encrypted-volumes\"/>."
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3475,13 +3548,13 @@ msgstr ""
 "После того как вас полностью устроит схема разметки, продолжайте установку."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "Установка базовой системы"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3495,7 +3568,7 @@ msgstr ""
 "может занять определённое время."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3511,7 +3584,7 @@ msgstr ""
 "нажмите <keycombo><keycap>левый Alt</keycap><keycap>F1</keycap></keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3523,7 +3596,7 @@ msgstr ""
 "установка выполняется через консоль на последовательном порту."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3537,7 +3610,7 @@ msgstr ""
 "предложат сделать вам из списка доступных ядер."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3554,7 +3627,7 @@ msgstr ""
 "должны, по мнению сопровождающих, обычно устанавливаться вместе с этим ПО."
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3568,140 +3641,6 @@ msgstr ""
 "установки."
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "Добавление пользователей и паролей"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"После установки базовой системы, программа установки предложит вам настроить "
-"учётную запись <quote>root</quote> и/или учётную запись для первого "
-"пользователя. Дополнительные учётные записи можно будет создать после "
-"завершения установки."
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "Установка пароля суперпользователя (root)"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"Учётная запись <emphasis>root</emphasis> также называемая "
-"<emphasis>суперпользовательской</emphasis> &mdash; это учётная запись, для "
-"которой нет никаких преград в вашей системе. Учётная запись root должна "
-"использоваться только для администрирования системы и как можно меньшее "
-"время."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"Любой создаваемый вами пароль должен состоять как минимум из 6 символов и "
-"содержать заглавные и строчные буквы, а также знаки препинания. Уделите "
-"побольше внимания при установке пароля root, поскольку эта самая мощная "
-"учётная запись. Избегайте слов из словаря или использования любой "
-"персональной информации, которую можно угадать."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Если кто-то говорит вам, что ему нужен ваш пароль root, будьте очень "
-"осторожны. Обычно нет необходимости давать свой пароль root кому-либо, если "
-"только вы не администрируете машину вместе с другими системными "
-"администраторами."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "Создание учётной записи обычного пользователя"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"Система спросит вас, желаете ли вы сейчас создать учётную запись для "
-"обычного пользователя. Эта учётная запись должна использоваться в качестве "
-"вашей основной рабочей учётной записи. Вы <emphasis>не должны</emphasis> "
-"использовать учётную запись root в повседневной работе или в качестве "
-"персональной учётной записи."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"Почему не должны? Одна из причин, по которой следует избегать использования "
-"привилегий root это то, что в качестве root можно очень легко сделать "
-"необратимые повреждения. Другая причина: вас могут обманом заставить "
-"запустить программу <emphasis>троянского коня</emphasis> &mdash; это "
-"программа, которая воспользуется преимуществами ваших возможностей "
-"суперпользователя, чтобы скомпрометировать систему. В любой хорошей книге по "
-"системному администрированию Unix эта тема рассматривается подробно &mdash; "
-"прочтите одну из них, если это для вас в новинку."
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Сначала вас попросят ввести полное имя пользователя. Затем спросят имя "
-"пользовательской учётной записи; в общем случае, ваше имя или что-то похожее "
-"вполне подойдёт. И, наконец, вас попросят ввести пароль учётной записи."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Если в любой момент после установки вы захотите создать ещё одну учётную "
-"запись, воспользуйтесь командой <command>adduser</command>."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4333,12 +4272,6 @@ msgstr "Обнаружение операционных систем"
 #. Tag: para
 #: using-d-i.xml:2595
 #, no-c-format
-#| msgid ""
-#| "Before a boot loader is installed, the installer will attempt to probe "
-#| "for other operating systems which are installed on the machine. If it "
-#| "finds a supported operating system, you will be informed of this during "
-#| "the boot loader installation step, and the computer will be configured to "
-#| "boot this other operating system in addition to Debian."
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
 "other operating systems which are installed on the machine. If it finds a "
@@ -4507,17 +4440,12 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:2704
 #, no-c-format
-#| msgid "new Debian partition"
 msgid "new &debian; partition"
 msgstr "новый раздел &debian;"
 
 #. Tag: para
 #: using-d-i.xml:2704
 #, no-c-format
-#| msgid ""
-#| "Choose this if you want to use another boot manager. <command>LILO</"
-#| "command> will install itself at the beginning of the new Debian partition "
-#| "and it will serve as a secondary boot loader."
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
 "will install itself at the beginning of the new &debian; partition and it "
@@ -4525,8 +4453,7 @@ msgid ""
 msgstr ""
 "Выберите это место, если хотите использовать другой менеджер загрузки. "
 "Загрузчик <command>LILO</command> будет установлен в начало раздела, "
-"созданного для "
-"&debian; и будет играть роль вторичного системного загрузчика."
+"созданного для &debian; и будет играть роль вторичного системного загрузчика."
 
 #. Tag: term
 #: using-d-i.xml:2713
@@ -4551,12 +4478,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2723
 #, no-c-format
-#| msgid ""
-#| "If you can no longer boot into Windows 9x (or DOS) after this step, "
-#| "you'll need to use a Windows 9x (MS-DOS) boot disk and use the "
-#| "<userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS master "
-#| "boot record &mdash; however, this means that you'll need to use some "
-#| "other way to get back into Debian!"
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
 "need to use a Windows 9x (MS-DOS) boot disk and use the <userinput>fdisk /"
@@ -4630,14 +4551,21 @@ msgstr "Выберите правильный раздел!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "Критерии выбора раздела: должен иметь файловую систему FAT и установленный "
 "флаг <emphasis>boot</emphasis>. &d-i; может показать несколько вариантов, в "
@@ -4709,11 +4637,6 @@ msgstr "elilo.efi"
 #. Tag: para
 #: using-d-i.xml:2821
 #, no-c-format
-#| msgid ""
-#| "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
-#| "runs to boot the system. It is the program behind the <guimenuitem>Debian "
-#| "GNU/Linux</guimenuitem> menu item of the <quote>EFI Boot Manager</quote> "
-#| "command menu."
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
 "runs to boot the system. It is the program behind the <guimenuitem>&debian; "
@@ -4734,12 +4657,6 @@ msgstr "initrd.img"
 #. Tag: para
 #: using-d-i.xml:2832
 #, no-c-format
-#| msgid ""
-#| "This is the initial root filesystem used to boot the kernel. It is a copy "
-#| "of the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
-#| "standard Debian installation it would be the file in <filename>/boot</"
-#| "filename> pointed to by the symbolic link <filename>/initrd.img</"
-#| "filename>."
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
 "the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
@@ -4749,8 +4666,8 @@ msgstr ""
 "Это файл начальной корневой файловой системы(initial root filesystem), "
 "используемой для загрузки ядра. Это копия файла, на который есть ссылка из "
 "<filename>/etc/elilo.conf</filename>. В стандартной установке &debian; этот "
-"файл находится в <filename>/boot</filename>, и на него указывает "
-"символьная ссылка <filename>/initrd.img</filename>."
+"файл находится в <filename>/boot</filename>, и на него указывает символьная "
+"ссылка <filename>/initrd.img</filename>."
 
 #. Tag: filename
 #: using-d-i.xml:2844
@@ -4779,11 +4696,6 @@ msgstr "vmlinuz"
 #. Tag: para
 #: using-d-i.xml:2856
 #, no-c-format
-#| msgid ""
-#| "This is the compressed kernel itself. It is a copy of the file referenced "
-#| "in the <filename>/etc/elilo.conf</filename>. In a standard Debian "
-#| "installation it would be the file in <filename>/boot</filename> pointed "
-#| "to by the symbolic link <filename>/vmlinuz</filename>."
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
 "the <filename>/etc/elilo.conf</filename>. In a standard &debian; "
@@ -4792,8 +4704,8 @@ msgid ""
 msgstr ""
 "Это файл с сжатым ядром. Это копия файла, на который есть ссылка в "
 "<filename>/etc/elilo.conf</filename>. В стандартной установке &debian; этот "
-"файл находится в <filename>/boot</filename>, и на него указывает "
-"символьная ссылка <filename>/vmlinuz</filename>."
+"файл находится в <filename>/boot</filename>, и на него указывает символьная "
+"ссылка <filename>/vmlinuz</filename>."
 
 #. Tag: title
 #: using-d-i.xml:2876
@@ -5067,18 +4979,13 @@ msgstr "Завершение установки"
 #. Tag: para
 #: using-d-i.xml:3053
 #, no-c-format
-#| msgid ""
-#| "This is the last step in the Debian installation process during which the "
-#| "installer will do any last minute tasks. It mostly consists of tidying up "
-#| "after the &d-i;."
 msgid ""
 "This is the last step in the &debian; installation process during which the "
 "installer will do any last minute tasks. It mostly consists of tidying up "
 "after the &d-i;."
 msgstr ""
 "Это последний этап установки &debian; в процессе которого программа "
-"установки "
-"выполнит ещё пару действий. В основном, это уборка за &d-i;."
+"установки выполнит ещё пару действий. В основном, это уборка за &d-i;."
 
 #. Tag: title
 #: using-d-i.xml:3066
@@ -5140,10 +5047,6 @@ msgstr "Перезагрузка системы"
 #. Tag: para
 #: using-d-i.xml:3103
 #, no-c-format
-#| msgid ""
-#| "You will be prompted to remove the boot media (CD, floppy, etc) that you "
-#| "used to boot the installer. After that the system will be rebooted into "
-#| "your new Debian system."
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
 "used to boot the installer. After that the system will be rebooted into your "
@@ -5194,10 +5097,6 @@ msgstr "Сохранение протокола установки"
 #. Tag: para
 #: using-d-i.xml:3138
 #, no-c-format
-#| msgid ""
-#| "If the installation is successful, the logfiles created during the "
-#| "installation process will be automatically saved to <filename>/var/log/"
-#| "installer/</filename> on your new Debian system."
 msgid ""
 "If the installation is successful, the logfiles created during the "
 "installation process will be automatically saved to <filename>/var/log/"
@@ -5680,12 +5579,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:3429
 #, no-c-format
-#| msgid ""
-#| "Tarballs containing current packages for the most common firmware are "
-#| "available from: <itemizedlist> <listitem><para> <ulink url=\"&url-"
-#| "firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
-#| "download the tarball for the correct release and unpack it to the file "
-#| "system on the medium."
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
 "firmware are available from: <itemizedlist> <listitem><para> <ulink url="
@@ -5694,10 +5587,10 @@ msgid ""
 "the file system on the medium."
 msgstr ""
 "Tar-архивы и файлы zip с пакетами наиболее распространённых микропрограмм "
-"доступны "
-"здесь: <itemizedlist> <listitem><para> <ulink url=\"&url-firmware-tarballs;"
-"\"></ulink> </para></listitem> </itemizedlist> Просто скачайте tar-архив или "
-"zip-файл под нужный выпуск и распакуйте его на файловую систему носителя."
+"доступны здесь: <itemizedlist> <listitem><para> <ulink url=\"&url-firmware-"
+"tarballs;\"></ulink> </para></listitem> </itemizedlist> Просто скачайте tar-"
+"архив или zip-файл под нужный выпуск и распакуйте его на файловую систему "
+"носителя."
 
 #. Tag: para
 #: using-d-i.xml:3443
@@ -5791,4 +5684,3 @@ msgstr ""
 "установленную систему микропрограмма <emphasis>не</emphasis> будет "
 "автоматически обновляться, пока не не будет установлен соответствующий пакет "
 "с микропрограммой (если есть) после завершения установки."
-
diff --git a/po/ru/welcome.po b/po/ru/welcome.po
index 3ddfed891..c7d760d0f 100644
--- a/po/ru/welcome.po
+++ b/po/ru/welcome.po
@@ -16,32 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: welcome.xml:4
 #, no-c-format
-#| msgid "Welcome to Debian"
 msgid "Welcome to &debian;"
 msgstr "Добро пожаловать в &debian;"
 
 #. Tag: para
 #: welcome.xml:5
 #, no-c-format
-#| msgid ""
-#| "This chapter provides an overview of the Debian Project and &debian-gnu;. "
-#| "If you already know about the Debian Project's history and the &debian-"
-#| "gnu; distribution, feel free to skip to the next chapter."
 msgid ""
 "This chapter provides an overview of the &debian; Project and &debian-gnu;. "
 "If you already know about the &debian; Project's history and the &debian-"
 "gnu; distribution, feel free to skip to the next chapter."
 msgstr ""
 "Эта глава посвящена обзору проекта &debian; и &debian-gnu;. Если вы уже "
-"знаете "
-"историю проекта &debian; и дистрибутива &debian-gnu;, спокойно переходите к "
-"следующей главе."
+"знаете историю проекта &debian; и дистрибутива &debian-gnu;, спокойно "
+"переходите к следующей главе."
 
 #. Tag: title
 #: welcome.xml:19
@@ -392,24 +386,12 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-#| msgid "What is Debian GNU/Linux?"
 msgid "What is &debian; GNU/Linux?"
 msgstr "Что такое &debian; GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
 #, no-c-format
-#| msgid ""
-#| "The combination of Debian's philosophy and methodology and the GNU tools, "
-#| "the Linux kernel, and other important free software, form a unique "
-#| "software distribution called Debian GNU/Linux. This distribution is made "
-#| "up of a large number of software <emphasis>packages</emphasis>. Each "
-#| "package in the distribution contains executables, scripts, documentation, "
-#| "and configuration information, and has a <emphasis>maintainer</emphasis> "
-#| "who is primarily responsible for keeping the package up-to-date, tracking "
-#| "bug reports, and communicating with the upstream author(s) of the "
-#| "packaged software. Our extremely large user base, combined with our bug "
-#| "tracking system ensures that problems are found and fixed quickly."
 msgid ""
 "The combination of &debian;'s philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
@@ -423,26 +405,19 @@ msgid ""
 "that problems are found and fixed quickly."
 msgstr ""
 "Комбинация философии и методологии &debian;, средств GNU, ядра Linux и "
-"других "
-"важных программ, составляют уникальный дистрибутив под названием &debian; "
-"GNU/"
-"Linux. Этот дистрибутив собран из большого количества <emphasis>пакетов</"
-"emphasis> программ. Каждый пакет в дистрибутиве содержит исполняемые файлы, "
-"сценарии, документацию, конфигурационную информацию и имеет "
-"<emphasis>сопровождающего</emphasis>, который отвечает за поддержание пакета "
-"в актуальном состоянии, отслеживает сообщения об ошибках (bug reports) и "
-"общается с основными авторами программы. Огромная база наших пользователей в "
-"сочетании с нашей системой отслеживания сообщений об ошибках гарантируют, "
-"что проблемы будут быстро обнаружены и устранены."
+"других важных программ, составляют уникальный дистрибутив под названием "
+"&debian; GNU/Linux. Этот дистрибутив собран из большого количества "
+"<emphasis>пакетов</emphasis> программ. Каждый пакет в дистрибутиве содержит "
+"исполняемые файлы, сценарии, документацию, конфигурационную информацию и "
+"имеет <emphasis>сопровождающего</emphasis>, который отвечает за поддержание "
+"пакета в актуальном состоянии, отслеживает сообщения об ошибках (bug "
+"reports) и общается с основными авторами программы. Огромная база наших "
+"пользователей в сочетании с нашей системой отслеживания сообщений об ошибках "
+"гарантируют, что проблемы будут быстро обнаружены и устранены."
 
 #. Tag: para
 #: welcome.xml:246
 #, no-c-format
-#| msgid ""
-#| "Debian's attention to detail allows us to produce a high-quality, stable, "
-#| "and scalable distribution. Installations can be easily configured to "
-#| "serve many roles, from stripped-down firewalls to desktop scientific "
-#| "workstations to high-end network servers."
 msgid ""
 "&debian;'s attention to detail allows us to produce a high-quality, stable, "
 "and scalable distribution. Installations can be easily configured to serve "
@@ -450,20 +425,14 @@ msgid ""
 "to high-end network servers."
 msgstr ""
 "Внимание &debian; к деталям позволило создать высококачественный, стабильный "
-"и "
-"расширяемый дистрибутив. Установленные системы могут быть легко настроены на "
-"выполнение самых различных задач: от упрощённого межсетевого экрана "
+"и расширяемый дистрибутив. Установленные системы могут быть легко настроены "
+"на выполнение самых различных задач: от упрощённого межсетевого экрана "
 "(firewall), рабочей станции учёного, до высокопроизводительного сетевого "
 "сервера."
 
 #. Tag: para
 #: welcome.xml:253
 #, no-c-format
-#| msgid ""
-#| "Debian is especially popular among advanced users because of its "
-#| "technical excellence and its deep commitment to the needs and "
-#| "expectations of the Linux community. Debian also introduced many features "
-#| "to Linux that are now commonplace."
 msgid ""
 "&debian; is especially popular among advanced users because of its technical "
 "excellence and its deep commitment to the needs and expectations of the "
@@ -471,20 +440,13 @@ msgid ""
 "now commonplace."
 msgstr ""
 "&debian; особенно популярен среди опытных пользователей из-за его "
-"технического "
-"совершенства и глубокого понимания нужд и ожиданий сообщества Linux. "
-"&debian; "
-"также добавил много новых свойств в Linux, которые теперь повсеместно "
-"используются."
+"технического совершенства и глубокого понимания нужд и ожиданий сообщества "
+"Linux. &debian; также добавил много новых свойств в Linux, которые теперь "
+"повсеместно используются."
 
 #. Tag: para
 #: welcome.xml:260
 #, no-c-format
-#| msgid ""
-#| "For example, Debian was the first Linux distribution to include a package "
-#| "management system for easy installation and removal of software. It was "
-#| "also the first Linux distribution that could be upgraded without "
-#| "requiring reinstallation."
 msgid ""
 "For example, &debian; was the first Linux distribution to include a package "
 "management system for easy installation and removal of software. It was also "
@@ -499,11 +461,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:267
 #, no-c-format
-#| msgid ""
-#| "Debian continues to be a leader in Linux development. Its development "
-#| "process is an example of just how well the Open Source development model "
-#| "can work &mdash; even for very complex tasks such as building and "
-#| "maintaining a complete operating system."
 msgid ""
 "&debian; continues to be a leader in Linux development. Its development "
 "process is an example of just how well the Open Source development model can "
@@ -518,15 +475,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:274
 #, no-c-format
-#| msgid ""
-#| "The feature that most distinguishes Debian from other Linux distributions "
-#| "is its package management system. These tools give the administrator of a "
-#| "Debian system complete control over the packages installed on that "
-#| "system, including the ability to install a single package or "
-#| "automatically update the entire operating system. Individual packages can "
-#| "also be protected from being updated. You can even tell the package "
-#| "management system about software you have compiled yourself and what "
-#| "dependencies it fulfills."
 msgid ""
 "The feature that most distinguishes &debian; from other Linux distributions "
 "is its package management system. These tools give the administrator of a "
@@ -547,14 +495,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:285
 #, no-c-format
-#| msgid ""
-#| "To protect your system against <quote>Trojan horses</quote> and other "
-#| "malevolent software, Debian's servers verify that uploaded packages come "
-#| "from their registered Debian maintainers. Debian packagers also take "
-#| "great care to configure their packages in a secure manner. When security "
-#| "problems in shipped packages do appear, fixes are usually available very "
-#| "quickly. With Debian's simple update options, security fixes can be "
-#| "downloaded and installed automatically across the Internet."
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
 "malevolent software, &debian;'s servers verify that uploaded packages come "
@@ -571,20 +511,11 @@ msgstr ""
 "программ в своих пакетах. Когда случаются проблемы с безопасностью в "
 "выпущенном пакете, обычно очень быстро выходят исправления. С помощью "
 "простой системы обновлений &debian; исправления безопасности можно загружать "
-"и "
-"устанавливать автоматически через Интернет."
+"и устанавливать автоматически через Интернет."
 
 #. Tag: para
 #: welcome.xml:295
 #, no-c-format
-#| msgid ""
-#| "The primary, and best, method of getting support for your Debian GNU/"
-#| "Linux system and communicating with Debian Developers is through the many "
-#| "mailing lists maintained by the Debian Project (there are more than &num-"
-#| "of-debian-maillists; at this writing). The easiest way to subscribe to "
-#| "one or more of these lists is visit <ulink url=\"&url-debian-lists-"
-#| "subscribe;\"> Debian's mailing list subscription page</ulink> and fill "
-#| "out the form you'll find there."
 msgid ""
 "The primary, and best, method of getting support for your &debian; GNU/Linux "
 "system and communicating with &debian; Developers is through the many "
@@ -596,17 +527,14 @@ msgid ""
 msgstr ""
 "Основным и самым лучшим способом получения поддержки системы &debian; GNU/"
 "Linux и общения с разработчиками &debian; является множество списков "
-"рассылки "
-"проекта &debian; (на момент написания этих строк их было более "
-"&num-of-debian-"
-"maillists;). Самый простой способ подписаться на один из этих списков "
-"&mdash; посетить <ulink url=\"&url-debian-lists-subscribe;\"> страницу "
-"подписки на списки рассылки Debian</ulink> и заполнить форму."
+"рассылки проекта &debian; (на момент написания этих строк их было более &num-"
+"of-debian-maillists;). Самый простой способ подписаться на один из этих "
+"списков &mdash; посетить <ulink url=\"&url-debian-lists-subscribe;\"> "
+"страницу подписки на списки рассылки Debian</ulink> и заполнить форму."
 
 #. Tag: title
 #: welcome.xml:315
 #, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Что такое &debian; GNU/kFreeBSD?"
 
@@ -621,20 +549,12 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:321
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
 "amd64 architectures, although ports to other architectures is possible."
 msgstr ""
 "Этот перенос &debian; в настоящее время разработан только для архитектур "
-"i386 "
-"и amd64, хотя возможен перенос и на другие архитектуры."
+"i386 и amd64, хотя возможен перенос и на другие архитектуры."
 
 #. Tag: para
 #: welcome.xml:326
@@ -649,24 +569,18 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:331
 #, no-c-format
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
 "kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
-"Подробности смотрите на <ulink url=\"http://www.debian.org/ports/kfreebsd/\">"
-" "
-"странице переноса &debian; GNU/kFreeBSD</ulink> и в списке рассылки "
+"Подробности смотрите на <ulink url=\"http://www.debian.org/ports/kfreebsd/"
+"\"> странице переноса &debian; GNU/kFreeBSD</ulink> и в списке рассылки "
 "проекта <email>debian-bsd@lists.debian.org</email>."
 
 #. Tag: title
 #: welcome.xml:350
 #, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/Hurd?"
 msgstr "Что такое &debian; GNU/Hurd?"
 
@@ -683,23 +597,16 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:357
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
 "is continuing. The Hurd is currently only being developed for the i386 "
 "architecture, although ports to other architectures will be made once the "
 "system becomes more stable."
 msgstr ""
-"Проект Hurd пока незавершён и непригоден для повседневного использования, "
-"но работа продолжается. Сейчас Hurd разработан только для архитектуры i386, "
-"однако перенос на другие архитектуры будет сделан как только система "
-"станет более стабильной."
+"Проект Hurd пока незавершён и непригоден для повседневного использования, но "
+"работа продолжается. Сейчас Hurd разработан только для архитектуры i386, "
+"однако перенос на другие архитектуры будет сделан как только система станет "
+"более стабильной."
 
 #. Tag: para
 #: welcome.xml:365
@@ -714,10 +621,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:370
 #, no-c-format
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
 "\"> &debian; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
@@ -730,19 +633,12 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:387
 #, no-c-format
-#| msgid "Getting Debian"
 msgid "Getting &debian;"
 msgstr "Получение &debian;"
 
 #. Tag: para
 #: welcome.xml:389
 #, no-c-format
-#| msgid ""
-#| "For information on how to download &debian-gnu; from the Internet or from "
-#| "whom official Debian CDs can be purchased, see the <ulink url=\"&url-"
-#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-#| "debian-mirrors;\">list of Debian mirrors</ulink> contains a full set of "
-#| "official Debian mirrors, so you can easily find the nearest one."
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
 "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
@@ -759,10 +655,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:398
 #, no-c-format
-#| msgid ""
-#| "Debian can be upgraded after installation very easily. The installation "
-#| "procedure will help set up the system so that you can make those upgrades "
-#| "once installation is complete, if need be."
 msgid ""
 "&debian; can be upgraded after installation very easily. The installation "
 "procedure will help set up the system so that you can make those upgrades "
@@ -803,11 +695,6 @@ msgstr "Структура этого документа"
 #. Tag: para
 #: welcome.xml:435
 #, no-c-format
-#| msgid ""
-#| "This document is meant to serve as a manual for first-time Debian users. "
-#| "It tries to make as few assumptions as possible about your level of "
-#| "expertise. However, we do assume that you have a general understanding of "
-#| "how the hardware in your computer works."
 msgid ""
 "This document is meant to serve as a manual for first-time &debian; users. "
 "It tries to make as few assumptions as possible about your level of "
@@ -822,11 +709,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:442
 #, no-c-format
-#| msgid ""
-#| "Expert users may also find interesting reference information in this "
-#| "document, including minimum installation sizes, details about the "
-#| "hardware supported by the Debian installation system, and so on. We "
-#| "encourage expert users to jump around in the document."
 msgid ""
 "Expert users may also find interesting reference information in this "
 "document, including minimum installation sizes, details about the hardware "
@@ -864,11 +746,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:463
 #, no-c-format
-#| msgid ""
-#| "Backup your system, perform any necessary planning and hardware "
-#| "configuration prior to installing Debian, in <xref linkend=\"preparing\"/"
-#| ">. If you are preparing a multi-boot system, you may need to create "
-#| "partitionable space on your hard disk for Debian to use."
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
 "configuration prior to installing &debian;, in <xref linkend=\"preparing\"/"
@@ -904,15 +781,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:484
 #, no-c-format
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a Debian server (if you "
-#| "are not installing from a CD), partitioning your hard drives and "
-#| "installation of a base system, then selection and installation of tasks. "
-#| "(Some background about setting up the partitions for your Debian system "
-#| "is explained in <xref linkend=\"partitioning\"/>.)"
 msgid ""
 "Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
 "This involves choosing your language, configuring peripheral driver modules, "
@@ -944,10 +812,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:505
 #, no-c-format
-#| msgid ""
-#| "Once you've got your system installed, you can read <xref linkend=\"post-"
-#| "install\"/>. That chapter explains where to look to find more information "
-#| "about Unix and Debian, and how to replace your kernel."
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
 "install\"/>. That chapter explains where to look to find more information "
@@ -1013,17 +877,6 @@ msgstr "Об авторских правах и лицензиях на прог
 #. Tag: para
 #: welcome.xml:553
 #, no-c-format
-#| msgid ""
-#| "We're sure that you've read some of the licenses that come with most "
-#| "commercial software &mdash; they usually say that you can only use one "
-#| "copy of the software on a single computer. This system's license isn't "
-#| "like that at all. We encourage you to put a copy of &debian-gnu; on every "
-#| "computer in your school or place of business. Lend your installation "
-#| "media to your friends and help them install it on their computers! You "
-#| "can even make thousands of copies and <emphasis>sell</emphasis> them "
-#| "&mdash; albeit with a few restrictions. Your freedom to install and use "
-#| "the system comes directly from Debian being based on <emphasis>free "
-#| "software</emphasis>."
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
 "commercial software &mdash; they usually say that you can only use one copy "
@@ -1071,15 +924,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:577
 #, no-c-format
-#| msgid ""
-#| "The Debian project, as a pragmatic concession to its users, does make "
-#| "some packages available that do not meet our criteria for being free. "
-#| "These packages are not part of the official distribution, however, and "
-#| "are only available from the <userinput>contrib</userinput> or "
-#| "<userinput>non-free</userinput> areas of Debian mirrors or on third-party "
-#| "CD-ROMs; see the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, "
-#| "under <quote>The Debian FTP archives</quote>, for more information about "
-#| "the layout and contents of the archives."
 msgid ""
 "The &debian; project, as a pragmatic concession to its users, does make some "
 "packages available that do not meet our criteria for being free. These "
@@ -1095,26 +939,13 @@ msgstr ""
 "Однако, эти пакеты не являются частью официального дистрибутива, и доступны "
 "только из областей <userinput>contrib</userinput> или <userinput>non-free</"
 "userinput> серверов-зеркал &debian; или на неофициальных компакт-дисках; "
-"более "
-"подробную информацию о расположении и содержании архивов смотрите в разделе "
-"<quote>FTP-архивы Debian</quote> в <ulink url=\"&url-debian-faq;\">Debian "
-"FAQ</ulink>."
+"более подробную информацию о расположении и содержании архивов смотрите в "
+"разделе <quote>FTP-архивы Debian</quote> в <ulink url=\"&url-debian-faq;"
+"\">Debian FAQ</ulink>."
 
 #. Tag: para
 #: welcome.xml:591
 #, no-c-format
-#| msgid ""
-#| "Many of the programs in the system are licensed under the <emphasis>GNU</"
-#| "emphasis> <emphasis>General Public License</emphasis>, often simply "
-#| "referred to as <quote>the GPL</quote>. The GPL requires you to make the "
-#| "<emphasis>source code</emphasis> of the programs available whenever you "
-#| "distribute a binary copy of the program; that provision of the license "
-#| "ensures that any user will be able to modify the software. Because of "
-#| "this provision, the source code<footnote> <para> For information on how "
-#| "to locate, unpack, and build binaries from Debian source packages, see "
-#| "the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under "
-#| "<quote>Basics of the Debian Package Management System</quote>. </para> </"
-#| "footnote> for all such programs is available in the Debian system."
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
 "emphasis> <emphasis>General Public License</emphasis>, often simply referred "
@@ -1143,12 +974,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:610
 #, no-c-format
-#| msgid ""
-#| "There are several other forms of copyright statements and software "
-#| "licenses used on the programs in Debian. You can find the copyrights and "
-#| "licenses for every package installed on your system by looking in the "
-#| "file <filename>/usr/share/doc/<replaceable>package-name</replaceable>/"
-#| "copyright </filename> once you've installed a package on your system."
 msgid ""
 "There are several other forms of copyright statements and software licenses "
 "used on the programs in &debian;. You can find the copyrights and licenses "
@@ -1157,28 +982,22 @@ msgid ""
 "once you've installed a package on your system."
 msgstr ""
 "Программы в &debian; доступны по нескольким соглашениям об авторских правах "
-"и "
-"программных лицензий. Сразу после установки в систему, лицензия на пакет "
+"и программных лицензий. Сразу после установки в систему, лицензия на пакет "
 "сохраняется в файле <filename>/usr/share/doc/<replaceable>имя-пакета</"
 "replaceable>/copyright </filename>."
 
 #. Tag: para
 #: welcome.xml:620
 #, no-c-format
-#| msgid ""
-#| "For more information about licenses and how Debian determines whether "
-#| "software is free enough to be included in the main distribution, see the "
-#| "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgid ""
 "For more information about licenses and how &debian; determines whether "
 "software is free enough to be included in the main distribution, see the "
 "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgstr ""
 "Более полную информацию о лицензиях и о том, как &debian; определяет, "
-"является "
-"ли программа достаточно свободной, чтобы быть включённой в основную (main) "
-"часть дистрибутива, смотрите в <ulink url=\"&url-dfsg;\">критериях Debian "
-"для свободного программного обеспечения</ulink>."
+"является ли программа достаточно свободной, чтобы быть включённой в основную "
+"(main) часть дистрибутива, смотрите в <ulink url=\"&url-dfsg;\">критериях "
+"Debian для свободного программного обеспечения</ulink>."
 
 #. Tag: para
 #: welcome.xml:626
@@ -1200,4 +1019,3 @@ msgstr ""
 "модифицировать программу для достижения необходимых вам целей &mdash; и "
 "наслаждаться выгодами изменений, сделанных другими людьми, которые расширили "
 "возможности программы тем же путём."
-
diff --git a/po/sv/administrivia.po b/po/sv/administrivia.po
index 3ac9f32f9..0ce4a5b8c 100644
--- a/po/sv/administrivia.po
+++ b/po/sv/administrivia.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20051025 administrativa\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-07-16 10:26+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -37,7 +37,7 @@ msgstr "Om det här dokumentet"
 #| "released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -209,7 +209,7 @@ msgstr ""
 #| "edits and text. We have to thank Pascal Le Bail for useful information "
 #| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/sv/bookinfo.po b/po/sv/bookinfo.po
index f50ccb4d3..8e2f800de 100644
--- a/po/sv/bookinfo.po
+++ b/po/sv/bookinfo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20051025 bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2007-01-04 23:25+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -59,14 +59,14 @@ msgstr ""
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Den här installationsguiden är baserad på en tidigare handbok skriven för "
 "det äldre installationssystemet för Debian med (<quote>startdisketter</"
diff --git a/po/sv/hardware.po b/po/sv/hardware.po
index 72cc34ddd..b800ec22a 100644
--- a/po/sv/hardware.po
+++ b/po/sv/hardware.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-02-24 09:06+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -860,14 +860,14 @@ msgstr "In/ut-buss"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "Systembussen är den del av moderkortet som tillåter processorn att "
 "kommunicera med kringutrustning såsom lagringsenheter. Din dator måste "
-"använda ISA, EISA, PCI, PCIe, PCI-X eller VESA Local Bus (VLB, kallas ibland för VL-"
-"bussen). Praktiskt taget alla persondatorer som sålts de senaste åren "
+"använda ISA, EISA, PCI, PCIe, PCI-X eller VESA Local Bus (VLB, kallas ibland "
+"för VL-bussen). Praktiskt taget alla persondatorer som sålts de senaste åren "
 "använder någon av dessa."
 
 #. Tag: para
@@ -1650,32 +1650,25 @@ msgstr "S/390 och zSeries-maskintyper"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
 msgstr ""
-"Komplett information angående stöd för S/390 och zSeries-maskiner kan hittas "
-"i IBMs Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/"
-"sg246264.pdf\"> Linux för IBM eServer zSeries och S/390: Distributioner</"
-"ulink> i kapitel 2.1 eller på <ulink url=\"http://oss.software.ibm.com/"
-"developerworks/opensource/linux390/index.shtml\">zSeries-sidorna på "
-"developerWorks</ulink>. I korthet, G5, Multiprise 3000, G6 och alla zSeries "
-"finns det fullt stöd för; Multiprise 2000, G3 och G4-maskiner finns stöd för "
-"med emulering av IEEE-flyttalsprocessorn och därav minskad prestanda."
 
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "Stöd för processorer och moderkort"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1689,13 +1682,13 @@ msgstr ""
 "av stöd man kan förvänta sig för dem."
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1709,7 +1702,7 @@ msgstr ""
 "SPARCstation-sidan</ulink>."
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The last Debian release to support sparc32 was Etch, but even then only "
@@ -1725,13 +1718,13 @@ msgstr ""
 "tagits bort i tidigare utgåvor."
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1749,13 +1742,13 @@ msgstr ""
 "kärnan i UP och sparc64-smp-kärnan i SMP-konfigurationer."
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1769,7 +1762,7 @@ msgstr ""
 "och stöds mycket väl. Använd sparc64-smp-kärnan."
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1779,13 +1772,13 @@ msgstr ""
 "av servrar inte stöds på grund av avsaknad av stöd i Linux-kärnan."
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "Bärbara datorer"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1801,13 +1794,13 @@ msgstr ""
 "ulink> för att se om din bärbara dator fungerar bra med GNU/Linux."
 
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "Flera processorer"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1832,7 +1825,7 @@ msgstr ""
 "systemanvändning är detta knappt märkbart."
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1857,7 +1850,7 @@ msgstr ""
 "section;</quote> i konfigurationen av kärnan.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1882,7 +1875,7 @@ msgstr ""
 "automatiskt inaktivera SMP på system med bara en processor."
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The 486 flavour of the Debian kernel image packages for &arch-title; is "
@@ -1895,7 +1888,7 @@ msgstr ""
 "med SMP-stöd."
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1919,7 +1912,7 @@ msgstr ""
 "helt enkelt att använda den första processorn."
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order to take advantage of multiple processors, you'll have to replace "
@@ -1944,7 +1937,7 @@ msgstr ""
 "konfigurationen av kärnan.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1971,7 +1964,7 @@ msgstr ""
 "kärnan kommer helt enkelt att använda den första processorn."
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1983,7 +1976,7 @@ msgstr ""
 "lämpligt kärnpaket."
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can also build your own customized kernel to support SMP. <phrase "
@@ -2007,20 +2000,27 @@ msgstr ""
 "kärnan.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "Stöd för grafikkort"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "Du bör använda ett VGA-kompatibelt skärmgränssnitt för konsollterminalen. "
 "Nästan alla moderna grafikkort är kompatibla med VGA. Urgamla standarder som "
@@ -2029,35 +2029,35 @@ msgstr ""
 "dokumentet."
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Debian's support for graphical interfaces is determined by the underlying "
-#| "support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards "
-#| "work under X.Org. Details on supported graphics buses, cards, monitors, "
-#| "and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-#| "Debian &release; ships with X.Org version &x11ver;."
+#| "support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+#| "cards work under X.Org. Details on supported graphics buses, cards, "
+#| "monitors, and pointing devices can be found at <ulink url=\"&url-xorg;"
+#| "\"></ulink>. Debian &release; ships with X.Org version &x11ver;."
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "Debians stöd för grafiska gränssnitt bestäms av det underliggande stöd som "
-"hittas i X.Org:s X11-system. De flesta AGP-, PCI-, PCIe- och PCI-X-grafikkort "
-"fungerar under X.Org. Detaljer om grafikbussar, kort, skärmar och pekenheter "
-"som stöds kan hittas på <ulink url=\"&url-xorg;\"></ulink>. Debian &release; "
-"skickar med X.Org version &x11ver;."
+"hittas i X.Org:s X11-system. De flesta AGP-, PCI-, PCIe- och PCI-X-"
+"grafikkort fungerar under X.Org. Detaljer om grafikbussar, kort, skärmar och "
+"pekenheter som stöds kan hittas på <ulink url=\"&url-xorg;\"></ulink>. "
+"Debian &release; skickar med X.Org version &x11ver;."
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org X Window System stöds endast på SGI Indy och O2."
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2078,7 +2078,7 @@ msgstr ""
 "man aktiverar kortet."
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2106,13 +2106,13 @@ msgstr ""
 "tangentbordet innan systemet startar upp."
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Maskinvara för anslutning till nätverk"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2128,7 +2128,7 @@ msgstr ""
 "också.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2138,61 +2138,61 @@ msgstr ""
 "följande nätverkskort från Sun:"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "Listan över nätverksenheter som stöds är:"
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) och ESCON-anslutning (riktig eller emulerad)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet och OSA-Express Fast Ethernet (non-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express i QDIO-läge, HiperSockets och Gäst-LAN"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2212,19 +2212,19 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN stöds men inte under installationen."
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Trådlösa nätverkskort"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2242,7 +2242,7 @@ msgstr ""
 "information om hur man läser in fast programvara under installationen."
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2254,7 +2254,7 @@ msgstr ""
 "installationen."
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2266,7 +2266,7 @@ msgstr ""
 "den inte användas under installationsprocessen."
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2286,7 +2286,7 @@ msgstr ""
 "nätverk manuellt."
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In some cases the driver you need may not be available as a Debian "
@@ -2312,13 +2312,13 @@ msgstr ""
 "drivrutin från Windows.</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "Kända problem för &arch-title;"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2328,13 +2328,13 @@ msgstr ""
 "här."
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "Konflikt mellan drivrutinerna tulip och dfme"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2353,7 +2353,7 @@ msgstr ""
 "fungerar dåligt."
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2368,7 +2368,7 @@ msgstr ""
 "linkend=\"module-blacklist\"/>."
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2387,13 +2387,13 @@ msgstr ""
 "om."
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2403,13 +2403,13 @@ msgstr ""
 "B100-bladsystem."
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "Punktskriftsskärmar"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2428,13 +2428,13 @@ msgstr ""
 "version &brlttyver;."
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "Talsyntes (maskinvara)"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2455,13 +2455,13 @@ msgstr ""
 "&release; levereras med <classname>speakup</classname> version &speakupver;."
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Kringutrustning och annan maskinvara"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2473,7 +2473,7 @@ msgstr ""
 "dessa enheter vid installation av systemet."
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2483,7 +2483,7 @@ msgstr ""
 "kräva ytterligare konfiguration (se <xref linkend=\"hardware-issues\"/>)."
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2495,7 +2495,7 @@ msgstr ""
 "stöds av Linux. "
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2507,7 +2507,7 @@ msgstr ""
 "nätverket via NFS, HTTP eller FTP."
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2516,13 +2516,13 @@ msgstr ""
 "Cobalt RaQ saknar stöd för ytterligare enheter men Qube har en PCI-plats."
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "Enheter som kräver fast programvara"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2540,7 +2540,7 @@ msgstr ""
 "hårddiskstyrkort kan också kräva fast programvara."
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2558,7 +2558,7 @@ msgstr ""
 "tillgänglig som ett separat paket från sektionen non-free i arkivet."
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2576,13 +2576,13 @@ msgstr ""
 "programvara eller paket under installationen."
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "Köpa maskinvara specifikt för GNU/&arch-kernel;"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, fuzzy, no-c-format
 #| msgid ""
 #| "There are several vendors, who ship systems with Debian or other "
@@ -2604,7 +2604,7 @@ msgstr ""
 "stöd av GNU/Linux."
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2620,7 +2620,7 @@ msgstr ""
 "för det här ändamålet."
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2638,13 +2638,13 @@ msgstr ""
 "Stöd de maskinvarutillverkare som är &arch-kernel;-vänliga."
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Undvik proprietär eller sluten maskinvara"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2658,7 +2658,7 @@ msgstr ""
 "skulle hindra oss från att ge ut källkod till &arch-kernel;."
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2674,13 +2674,13 @@ msgstr ""
 "programvarugemenskapen är en viktig marknad."
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Windows-specifik maskinvara"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2706,7 +2706,7 @@ msgstr ""
 "dyrare än liknande enheter som har kvar sin inbäddade intelligens."
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2746,7 +2746,7 @@ msgstr ""
 "sin maskinvara."
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can help improve this situation by encouraging these manufacturers to "
@@ -2769,13 +2769,13 @@ msgstr ""
 "hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>."
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "Installationsmedia"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will help you determine which different media types you can "
@@ -2800,13 +2800,13 @@ msgstr ""
 "referera tillbaka till den här sidan när du har nått fram till det avsnittet."
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "Disketter"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2818,19 +2818,19 @@ msgstr ""
 "diskettenhet."
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "För CHRP är stöd för disketter för närvarande trasig."
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "Cd-rom/Dvd-rom"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2844,7 +2844,7 @@ msgstr ""
 "standard cd-rom-enheter som varken är SCSI eller IDE/ATAPI."
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2864,7 +2864,7 @@ msgstr ""
 "linkend=\"boot-installer\"/>."
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2876,7 +2876,7 @@ msgstr ""
 "man använder CD-ROM-enheter med Linux."
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2886,13 +2886,13 @@ msgstr ""
 "drivrutinerna ohci1394 och sbp2."
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "Cd-rom-enheter med IDE/ATAPI stöds på alla ARM-maskiner."
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2912,13 +2912,13 @@ msgstr ""
 "<quote>System installation</quote> i den fasta programvaran."
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "Hårddisk"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2930,7 +2930,7 @@ msgstr ""
 "för att läsa in installationsprogrammet på hårddisken."
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2940,13 +2940,13 @@ msgstr ""
 "installera från en SunOS-partition (UFS-slice)."
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB-minne"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Many Debian boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2970,13 +2970,13 @@ msgstr ""
 "också användbart för mindre system som inte har plats för onödiga enheter."
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "Nätverk"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2996,7 +2996,7 @@ msgstr ""
 "konfigurera ditt system att använda ISDN och PPP."
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -3008,7 +3008,7 @@ msgstr ""
 "föredras för &arch-title;.</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -3018,13 +3018,13 @@ msgstr ""
 "montering av alla lokala filsystem är ett annat alternativ."
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x eller GNU-system"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -3041,13 +3041,13 @@ msgstr ""
 "<xref linkend=\"linux-upgrade\"/>."
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Lagringssystem som stöds"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The Debian boot disks contain a kernel which is built to maximize the "
@@ -3075,7 +3075,7 @@ msgstr ""
 "installeras på ett stort antal maskinvaror."
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Generally, the Debian installation system includes support for floppies, "
@@ -3094,7 +3094,7 @@ msgstr ""
 "Filsystemen som stöds inkluderar FAT, Win-32 FAT-utökningar (VFAT) och NTFS."
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -3110,7 +3110,7 @@ msgstr ""
 "information."
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3133,7 +3133,7 @@ msgstr ""
 "för mer information om SPARC-maskinvara som stöds av Linux-kärnan."
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3145,7 +3145,7 @@ msgstr ""
 "disketter på CHRP-system alls."
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3157,7 +3157,7 @@ msgstr ""
 "diskettenheten."
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3167,7 +3167,7 @@ msgstr ""
 "uppstartssystemet. "
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3179,13 +3179,13 @@ msgstr ""
 "gamla disklayouten i Linux (ldl) och den nya vanliga S/390 disklayout (cdl)."
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Krav för minne och diskplats"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3199,7 +3199,7 @@ msgstr ""
 "hardware-reqts\"/> för mer realistiska siffror."
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -3219,6 +3219,27 @@ msgstr ""
 "väljas. </para> </footnote> eller diskutrymme tillgängligt kan vara möjliga "
 "men rekommenderas endast för erfarna användare."
 
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "Komplett information angående stöd för S/390 och zSeries-maskiner kan "
+#~ "hittas i IBMs Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
+#~ "redbooks/sg246264.pdf\"> Linux för IBM eServer zSeries och S/390: "
+#~ "Distributioner</ulink> i kapitel 2.1 eller på <ulink url=\"http://oss."
+#~ "software.ibm.com/developerworks/opensource/linux390/index.shtml\">zSeries-"
+#~ "sidorna på developerWorks</ulink>. I korthet, G5, Multiprise 3000, G6 och "
+#~ "alla zSeries finns det fullt stöd för; Multiprise 2000, G3 och G4-"
+#~ "maskiner finns stöd för med emulering av IEEE-flyttalsprocessorn och "
+#~ "därav minskad prestanda."
+
 #~ msgid "DEC Alpha"
 #~ msgstr "DEC Alpha"
 
diff --git a/po/sv/install-methods.po b/po/sv/install-methods.po
index 5973bc776..42ee7d801 100644
--- a/po/sv/install-methods.po
+++ b/po/sv/install-methods.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-03-28 13:17+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1272,8 +1272,7 @@ msgstr ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> För det grafiska installationsprogrammet så bör "
-"du lägga till <userinput>vga=788</userinput> på den "
-"andra raden."
+"du lägga till <userinput>vga=788</userinput> på den andra raden."
 
 #. Tag: para
 #: install-methods.xml:768
@@ -1684,7 +1683,7 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "Kopiera följande filer från Debian-arkiven till en lämplig plats på din "
diff --git a/po/sv/preparing.po b/po/sv/preparing.po
index f9ebf8986..6eb135c87 100644
--- a/po/sv/preparing.po
+++ b/po/sv/preparing.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation guide 20051025 preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2008-09-29 16:30+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -503,20 +503,18 @@ msgstr "Maskinvarureferenser för &arch-title;"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Installationsinstruktioner och enhetsdrivrutiner (DASD, XPRAM, Console, "
-"tape, z90 crypto, chandev, network) för Linux på &arch-title; med 2.4-kärna"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "Enhetsdrivrutiner och installationskommandon"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -526,13 +524,13 @@ msgstr ""
 "title;-maskinvara."
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Linux för &arch-title;"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, fuzzy, no-c-format
 #| msgid ""
 #| "IBM Redbook describing the Linux distributions available for the "
@@ -548,19 +546,19 @@ msgstr ""
 "utgåvor."
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux för IBM eServer zSeries och &arch-title;: Utgåvor"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Hitta informationskällor för maskinvara"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -572,19 +570,19 @@ msgstr ""
 "hemmastadd med din maskinvara före installationen."
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "Maskinvaruinformation kan samlas in från:"
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "Handböckerna som kommer med varje maskinvarudel."
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -596,19 +594,19 @@ msgstr ""
 "efter kombinationen. Ofta är det tangenten <keycap>Delete</keycap>."
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "Förpackningarna och lådorna för varje del av maskinvaran."
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Systemfönstret i Windows kontrollpanel."
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -620,7 +618,7 @@ msgstr ""
 "RAM-minne och hårddisksutrymme."
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -631,175 +629,175 @@ msgstr ""
 "nätverksanslutning och e-post."
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Maskinvaruinformation som behövs för en installation"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "Maskinvara"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "Information du kan behöva"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "Hårddiskar"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "Hur många du har."
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "Deras ordning i systemet."
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "Om IDE (även känd som PATA), SATA eller SCSI används."
 
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "Tillgängligt ledigt utrymme."
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "Partitioner."
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "Partitioner där andra operativsystem är installerade."
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "Skärm"
 
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "Modell och tillverkare."
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "Upplösningar som stöds."
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Horisontell uppdateringsfrekvens."
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Vertikal uppdateringsfrekvens."
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Färgdjup (antal färger) som stöds."
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "Skärmstorlek."
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "Mus"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Typ: serieport, PS/2 eller USB."
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "Port."
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "Tillverkare."
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "Antal knappar."
 
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "Nätverk"
 
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "Typ av adapter."
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "Skrivare"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Utskriftsupplösningar som stöds."
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "Grafikkort"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "Tillgängligt videominne."
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -809,37 +807,37 @@ msgstr ""
 "skärm klarar av)."
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "Enhetsnummer."
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "Enhetsnummer."
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "Relativt adapternummer för OSA-kort."
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Maskinvarukompatibilitet"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -853,7 +851,7 @@ msgstr ""
 "operativsystem."
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -863,7 +861,7 @@ msgstr ""
 "körande version av Windows för att fungera."
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -877,7 +875,7 @@ msgstr ""
 "bli föråldrade."
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -887,19 +885,19 @@ msgstr ""
 "även skrivare och annan utrustning vara Windows-specifika."
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "Du kan kontrollera maskinvarukompatibiliteten genom att:"
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "Kontrollera tillverkarens webbplatser för nya drivrutiner."
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -910,7 +908,7 @@ msgstr ""
 "inställningar från mer kända märken."
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -920,19 +918,19 @@ msgstr ""
 "inriktade på din arkitektur."
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "Sök på Internet efter andra användares erfarenheter."
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "Nätverksinställningar"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -944,31 +942,31 @@ msgstr ""
 "fråga din nätverksadministratör efter följande information."
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "Ditt datornamn (du kanske kan välja det här helt på egen hand)."
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "Ditt domännamn."
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "Din dators IP-adress."
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "Nätmasken som används på ditt nätverk."
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -978,7 +976,7 @@ msgstr ""
 "ditt nätverk <emphasis>har</emphasis> en gateway."
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -988,7 +986,7 @@ msgstr ""
 "(Domännamnstjänst)."
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -1002,31 +1000,31 @@ msgstr ""
 "installationsprocessen."
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Om du använder ett trådlöst nätverk, bör du också ta reda på:"
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "ESSID för ditt trådlösa nätverk."
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEP-säkerhetsnyckel (om sådan används)."
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Matcha minimikrav för maskinvara"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -1037,7 +1035,7 @@ msgstr ""
 "din maskinvara låter dig göra den typ av installation som du vill göra."
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -1049,7 +1047,7 @@ msgstr ""
 "troligen att bli frustrerade om de ignorerar de här förslagen."
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
@@ -1058,7 +1056,7 @@ msgstr ""
 "skrivbordssystem."
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
@@ -1066,105 +1064,111 @@ msgstr ""
 "skrivbordssystem."
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Rekommenderade minimala systemkrav"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "Installationstyp"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (minimum)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (rekommenderat)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "hårddisk"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "Ingen skrivbordsmiljö"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 megabyte"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 megabyte"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 gigabyte"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "Med skrivbordsmiljö"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 megabyte"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 megabyte"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 gigabyte"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The actual minimum memory requirements are a lot less then the numbers "
 #| "listed in this table. Depending on the architecture, it is possible to "
-#| "install Debian with as little as 20MB (for s390) to 60MB (for "
-#| "amd64). The same goes for the disk space requirements, especially if you "
-#| "pick and choose which applications to install; see <xref linkend="
-#| "\"tasksel-size-list\"/> for additional information on disk space "
-#| "requirements."
+#| "install Debian with as little as 20MB (for s390) to 60MB (for amd64). The "
+#| "same goes for the disk space requirements, especially if you pick and "
+#| "choose which applications to install; see <xref linkend=\"tasksel-size-"
+#| "list\"/> for additional information on disk space requirements."
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "Det faktiska minimumkraven för minne är mycket mindre än de siffror som "
 "listas i den här tabellen. Beroende på arkitekturen är det möjligt att "
-"installera Debian med så lite som 20 MB (för s390) till 60 MB (för "
-"amd64). Det samma gäller för diskutrymmeskraven, speciellt om du väljer "
-"vilka program som ska installeras; se <xref linkend=\"tasksel-size-list\"/> "
-"för ytterligare information om diskutrymmeskraven."
+"installera Debian med så lite som 20 MB (för s390) till 60 MB (för amd64). "
+"Det samma gäller för diskutrymmeskraven, speciellt om du väljer vilka "
+"program som ska installeras; se <xref linkend=\"tasksel-size-list\"/> för "
+"ytterligare information om diskutrymmeskraven."
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1182,7 +1186,7 @@ msgstr ""
 "finns även andra att välja bland."
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1194,7 +1198,7 @@ msgstr ""
 "användas till."
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1207,7 +1211,7 @@ msgstr ""
 "filer och data."
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1242,13 +1246,13 @@ msgstr ""
 
 # Kolla denna
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Förpartionering för system med flera operativsystem"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1262,7 +1266,7 @@ msgstr ""
 "in möbler i ett rum så påverkar de inte något annat rum."
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1274,39 +1278,40 @@ msgstr ""
 "betyder en LPAR eller VM-gäst i det här fallet."
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Debian on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Unix systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
+#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> and want to stick Debian on the same disk, "
+#| "you will need to repartition the disk. Debian requires its own hard disk "
+#| "partitions. It cannot be installed on Windows or MacOS partitions. It may "
+#| "be able to share some partitions with other Unix systems, but that's not "
+#| "covered here. At the very least you will need a dedicated partition for "
+#| "the Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "Om du redan har ett operativsystem på ditt system <phrase arch=\"x86\"> "
-"(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
-"phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> och "
-"vill ha Debian på samma disk, behöver du antaglien partitionera om disken. "
-"Debian kräver sina egna hårddiskpartitioner och kan inte installeras på  "
-"Windows- eller MacOS-partitioner. Det kan dela vissa partitioner med andra "
-"Unix-system, men det täcks inte in här. Du behöver åtminstone en partition "
-"avsedd enbart för Debians rot."
+"(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
+"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
+"phrase> och vill ha Debian på samma disk, behöver du antaglien partitionera "
+"om disken. Debian kräver sina egna hårddiskpartitioner och kan inte "
+"installeras på  Windows- eller MacOS-partitioner. Det kan dela vissa "
+"partitioner med andra Unix-system, men det täcks inte in här. Du behöver "
+"åtminstone en partition avsedd enbart för Debians rot."
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You can find information about your current partition setup by using a "
@@ -1332,7 +1337,7 @@ msgstr ""
 "göra ändringar."
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1348,13 +1353,13 @@ msgstr ""
 "riskerar att de förstörs."
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: skriva om HP-UX-diskar?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your computer has more than one hard disk, you may want to dedicate "
@@ -1373,7 +1378,7 @@ msgstr ""
 "partitioneringsprogram är utmärkt för den uppgiften."
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1402,7 +1407,7 @@ msgstr ""
 "eller cd-skivor."
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your machine already has multiple partitions, and enough space can be "
@@ -1427,7 +1432,7 @@ msgstr ""
 "partitionskartan, som ändå tvingar dig att partitionera före en installation."
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1443,7 +1448,7 @@ msgstr ""
 "Installer för att ändra storleken på filsystemet."
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If none of the above apply, you'll need to partition your hard disk "
@@ -1474,7 +1479,7 @@ msgstr ""
 "ursprungliga operativsystemet som du vill bibehålla."
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are going to install more than one operating system on the same "
@@ -1495,7 +1500,7 @@ msgstr ""
 "eller föreslå dig att formatera om icke ursprungliga partitioner."
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1506,7 +1511,7 @@ msgstr ""
 "systemet först besparar dig troligen en hel del problem."
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
@@ -1539,7 +1544,7 @@ msgstr ""
 "med &arch-parttype;-partitioner."
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you currently have one hard disk with one partition (a common setup "
@@ -1555,13 +1560,13 @@ msgstr ""
 "ursprungliga operativsystemet och Debian, behöver du göra följande: "
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Säkerhetskopiera allt på datorn."
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1575,7 +1580,7 @@ msgstr ""
 "att bli det aktiva MacOS-systemet.</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1586,13 +1591,13 @@ msgstr ""
 "utrymme för &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "Installera det ursprungliga operativsystemet på dess nya partition."
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Boot back into the native system to verify everything's OK, and to "
@@ -1605,20 +1610,20 @@ msgstr ""
 "OK och hämta ner uppstartsfilerna för Debian Installer."
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, fuzzy, no-c-format
 #| msgid "Boot the Debian installer to continue installing Debian."
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "Starta upp Debian Installer för att fortsätta installera Debian."
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Partitionera från DOS eller Windows"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are manipulating existing FAT or NTFS partitions, it is "
@@ -1638,7 +1643,7 @@ msgstr ""
 "bättre jobb."
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, fuzzy, no-c-format
 #| msgid ""
 #| "But if you have a large IDE disk, and are not using LBA addressing, "
@@ -1667,50 +1672,50 @@ msgstr ""
 "NTFS-partition."
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr ""
 "Ompartitionering utan att förlora data vid start från DOS, Win-32 eller OS/2"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, fuzzy, no-c-format
 #| msgid ""
 #| "One of the most common installations is onto a system that already "
 #| "contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, "
-#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian onto the same "
-#| "disk without destroying the previous system. Note that the installer "
-#| "supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
-#| "Simply start the installer and when you get to the partitioning step, "
-#| "select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </"
-#| "menuchoice> partitioning, select the partition to resize, and specify its "
-#| "new size. So in most cases you should not need to use the method "
-#| "described below."
+#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian "
+#| "onto the same disk without destroying the previous system. Note that the "
+#| "installer supports resizing of FAT and NTFS filesystems as used by DOS "
+#| "and Windows. Simply start the installer and when you get to the "
+#| "partitioning step, select the option for <menuchoice> "
+#| "<guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, select the "
+#| "partition to resize, and specify its new size. So in most cases you "
+#| "should not need to use the method described below."
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "En av de vanligaste installationerna är på en dator som redan innehåller DOS "
-"(inklusive Windows 3.1), Win32 (såsom Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7) "
-"eller OS/2, och att det är önskvärt att lägga in Debian på samma disk utan "
-"att förstöra tidigare system. Observera att installationsprogrammet har stöd "
-"för att ändra storlek på FAT- och NTFS-filsystem som används av DOS och "
-"Windows. Starta helt enkelt installationsprogrammet, välj alternativet "
-"<menuchoice> <guimenuitem>Manuell</guimenuitem> </menuchoice> "
-"partitionering, välj den partition som du ska ändra storlek på och ange dess "
-"nya storlek. I de flesta fall behöver du inte använda metoden som beskrivs "
-"här nedan."
-
-#. Tag: para
-#: preparing.xml:966
+"(inklusive Windows 3.1), Win32 (såsom Windows 95, 98, Me, NT, 2000, XP, "
+"2003, Vista, 7) eller OS/2, och att det är önskvärt att lägga in Debian på "
+"samma disk utan att förstöra tidigare system. Observera att "
+"installationsprogrammet har stöd för att ändra storlek på FAT- och NTFS-"
+"filsystem som används av DOS och Windows. Starta helt enkelt "
+"installationsprogrammet, välj alternativet <menuchoice> "
+"<guimenuitem>Manuell</guimenuitem> </menuchoice> partitionering, välj den "
+"partition som du ska ändra storlek på och ange dess nya storlek. I de flesta "
+"fall behöver du inte använda metoden som beskrivs här nedan."
+
+#. Tag: para
+#: preparing.xml:965
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Before going any further, you should have decided how you will be "
@@ -1735,7 +1740,7 @@ msgstr ""
 "alltså, som växlingsutrymme eller som ett filsystem."
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1752,7 +1757,7 @@ msgstr ""
 "det här kommer att minska den mängd utrymme du kan ta från partitionen."
 
 #. Tag: para
-#: preparing.xml:984
+#: preparing.xml:983
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The first thing needed is a copy of <command>fips</command> which is "
@@ -1766,16 +1771,14 @@ msgstr ""
 #| "compression driver or a disk manager. Create the disk and read the "
 #| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "Det första som behövs är en kopia av <command>fips</command> som finns "
 "tillgänglig i katalogen <filename>tools/</filename> på din närmaste Debian-"
@@ -1789,7 +1792,7 @@ msgstr ""
 "emphasis> du defragmenterar disken."
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1809,7 +1812,7 @@ msgstr ""
 "används i Windows 95 och högre."
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1821,7 +1824,7 @@ msgstr ""
 "diskettenheten. Ange <filename>a:\\fips</filename> och följ instruktionerna."
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1831,13 +1834,13 @@ msgstr ""
 "<command>fips</command> inte fungerar för dig."
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Partitionering för DOS"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1859,7 +1862,7 @@ msgstr ""
 "konstiga fel i DOS eller Windows."
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1878,19 +1881,19 @@ msgstr ""
 "genom att köra följande kommando från Debian:"
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Partitionering från SunOS"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, fuzzy, no-c-format
 #| msgid ""
 #| "It's perfectly fine to partition from SunOS; in fact, if you intend to "
@@ -1915,13 +1918,13 @@ msgstr ""
 "och iso9660 (CDROM)."
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Partitionering från Linux eller annat OS"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1945,7 +1948,7 @@ msgstr ""
 "antagligen att inträffa med diskens geometri."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1959,13 +1962,13 @@ msgstr ""
 "<xref linkend=\"partitioning\"/>."
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "MacOS/OSX-partitionering"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1981,7 +1984,7 @@ msgstr ""
 "Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1993,7 +1996,7 @@ msgstr ""
 "bort och ersättas senare av &debian-gnu;s installationsprogram."
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -2020,7 +2023,7 @@ msgstr ""
 "antingen OS 9 eller OS X."
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -2038,13 +2041,13 @@ msgstr ""
 "HFS+ och MS-DOS FAT-partitioner stöds av både MacOS och Linux."
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Inställning av maskinvara och operativsystem före installation"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -2073,13 +2076,13 @@ msgstr ""
 "med."
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Starta BIOS-inställningsmenyn"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -2104,7 +2107,7 @@ msgstr ""
 "kan leda till återkommande krascher eller att Debian inte kan installeras."
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -2118,25 +2121,25 @@ msgstr ""
 "<quote>CMOS</quote>) beror på vem som skrev din BIOS-programvara:"
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "Tangenten <keycap>Delete</keycap> under självtestet"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2146,25 +2149,25 @@ msgstr ""
 "keycombo>, eller <keycap>Delete</keycap>-tangenten under självtestet"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "Tangenten <keycap>Esc</keycap> under självtestet"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -2176,13 +2179,13 @@ msgstr ""
 "keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2194,7 +2197,7 @@ msgstr ""
 "keycap><keycap>S</keycap> </keycombo> eller <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -2204,7 +2207,7 @@ msgstr ""
 "invoking-bios-info;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2220,14 +2223,14 @@ msgstr ""
 "\"></ulink>."
 
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Val av uppstartsenhet"
 
 # Se på den här. Bootstrap?
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Many BIOS setup menus allow you to select the devices that will be used "
@@ -2257,7 +2260,7 @@ msgstr ""
 "uppstartsmetoderna som används för att installera Debian."
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2269,7 +2272,7 @@ msgstr ""
 "är att aktivera uppstart från en cd-rom i SCSI-BIOS på ditt styrkort."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2286,7 +2289,7 @@ msgstr ""
 "från USB-enheten."
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2298,13 +2301,13 @@ msgstr ""
 "att du startar om din maskin från hårddisken."
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Ändra uppstartsordning på datorer med IDE"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2316,7 +2319,7 @@ msgstr ""
 "maskinvarudokumentationen för de exakta tangenterna."
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2326,19 +2329,19 @@ msgstr ""
 "ditt BIOS men du ska leta efter ett fält som listar diskarna."
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "Vanliga poster på IDE-maskiner är C, A, cdrom eller A, C, cdrom."
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C är hårddisken och A är diskettenheten."
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2350,7 +2353,7 @@ msgstr ""
 "<keycap>Page Down</keycap> som växlar mellan de möjliga valen."
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2360,13 +2363,13 @@ msgstr ""
 "sparar ändringarna på din dator."
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Ändra uppstartsordning på datorer med SCSI"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
@@ -2375,7 +2378,7 @@ msgstr ""
 "inställningsverktyget."
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2386,7 +2389,7 @@ msgstr ""
 "dator."
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2398,13 +2401,13 @@ msgstr ""
 "dock din maskinvarudokumentation för de exakta tangenterna."
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Hitta verktyget för att ändra uppstartsordningen."
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
@@ -2412,7 +2415,7 @@ msgstr ""
 "Ställ in verktyget så att SCSI ID för cd-enheten är den första i listan."
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2422,19 +2425,19 @@ msgstr ""
 "sparar ändringarna på din dator. Ofta måste du trycka <keycap>F10</keycap>."
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Blandade BIOS-inställningar"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "Cd-rom-inställningar"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2448,13 +2451,13 @@ msgstr ""
 "<userinput>seek failed</userinput> (sökfel), beror det kanske på det här."
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Utökat mot Expanderat minne"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2468,13 +2471,13 @@ msgstr ""
 "kernel; kräver utökat minne och kan inte använda expanderat minne."
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "Virusskydd"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2500,13 +2503,13 @@ msgstr ""
 "har ställts in. </para> </footnote>."
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "Shadow RAM"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2532,13 +2535,13 @@ msgstr ""
 "maskinvaruenheter."
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "Minneshål"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2550,7 +2553,7 @@ msgstr ""
 "du har så mycket RAM."
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2571,13 +2574,13 @@ msgstr ""
 "och inte utan den."
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "Avancerad strömhantering (APM)"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2594,13 +2597,13 @@ msgstr ""
 "lägena och kan göra ett bättre jobb för strömhantering än vad BIOS kan."
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Starta OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2616,7 +2619,7 @@ msgstr ""
 "din maskin."
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2634,7 +2637,7 @@ msgstr ""
 "<ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> för fler tips."
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2658,7 +2661,7 @@ msgstr ""
 "modemporten, för att interagera med OpenFirmware."
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2681,13 +2684,13 @@ msgstr ""
 "programvaran installerade till nvram."
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Starta OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2703,7 +2706,7 @@ msgstr ""
 "maskin, såsom diagnostik och enkla skript."
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2724,7 +2727,7 @@ msgstr ""
 "<keycap>n</keycap> för att få den nya varianten."
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2738,7 +2741,7 @@ msgstr ""
 "dokumentationen för din terminalemulator om du använder ett annat program."
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2758,7 +2761,7 @@ msgstr ""
 "\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2800,7 +2803,7 @@ msgstr ""
 "se <ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2831,19 +2834,19 @@ msgstr ""
 "</screen></informalexample> och under Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS-inställning"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2867,7 +2870,7 @@ msgstr ""
 "radbaserad istället för teckenbaserad."
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2887,7 +2890,7 @@ msgstr ""
 "en LPAR om HMC och detta alternativ finns tillgängligt för dig."
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Before you actually perform an installation, you have to go over some "
@@ -2924,13 +2927,13 @@ msgstr ""
 "Debian-specifika installationsstegen."
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Ursprunglig och LPAR-installationer"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2946,13 +2949,13 @@ msgstr ""
 "Distributioner</ulink> Redbook om hur man ställer in en LPAR för Linux."
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Installation som en VM-gäst"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2969,13 +2972,21 @@ msgstr ""
 "Linux."
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "Du behöver kopiera alla filerna från underkatalogen <filename>generic</"
 "filename> till din CMS-disk. Se till att överföra <filename>kernel.debian</"
@@ -2983,13 +2994,13 @@ msgstr ""
 "fixerad postlängd på 80 tecken."
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Ställa in en installationsserver"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -3003,7 +3014,7 @@ msgstr ""
 "och måste göra dem tillgängliga via NFS, HTTP eller FTP."
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -3017,25 +3028,25 @@ msgstr ""
 "sådant katalogträd."
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: mer information behövs &mdash; från en Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Maskinvaruproblem att se upp för"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS-stöd och tangentbord"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -3056,13 +3067,13 @@ msgstr ""
 "quote>."
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Skärmsynlighet på OldWorld Powermac-datorer"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -3084,6 +3095,17 @@ msgstr ""
 "skärminställning under MacOS till att använda 256 färger istället för "
 "<quote>tusentals</quote> eller <quote>miljoner</quote> färger."
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Installationsinstruktioner och enhetsdrivrutiner (DASD, XPRAM, Console, "
+#~ "tape, z90 crypto, chandev, network) för Linux på &arch-title; med 2.4-"
+#~ "kärna"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Enhetsdrivrutiner och installationskommandon"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha FAQ"
 
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index a270defd3..47d7684da 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-02-24 09:08+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2094,13 +2094,36 @@ msgstr "Partitionering med RAID"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
+msgstr ""
+"Du kan även använda förinställning för att konfigurera partitioner på "
+"programvaru-RAID-kedjor. Nivåer som stöds är RAID 0, 1, 5, 6 och 10, skapa "
+"trasiga kedjor och ange reservenheter. Om du använder RAID 1 kan du "
+"förinställa grub att installera sig på alla enheter som används i kedjan; se "
+"<xref linkend=\"preseed-bootloader\"/>."
+
+#. Tag: para
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
 msgstr ""
 "Du kan även använda förinställning för att konfigurera partitioner på "
 "programvaru-RAID-kedjor. Nivåer som stöds är RAID 0, 1, 5, 6 och 10, skapa "
@@ -2109,7 +2132,7 @@ msgstr ""
 "<xref linkend=\"preseed-bootloader\"/>."
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2125,7 +2148,7 @@ msgstr ""
 "var/log/syslog</filename> om du springer på problem."
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# NOTE: this option is of beta release quality and should be used "
@@ -2275,13 +2298,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Kontrollera hur partitioner monteras"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2301,7 +2324,7 @@ msgstr ""
 "istället."
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2311,7 +2334,7 @@ msgstr ""
 "att använda deras traditionella namn istället för UUID."
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2327,7 +2350,7 @@ msgstr ""
 "slumpmässigt."
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2345,13 +2368,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "Installation av grundsystem"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2363,7 +2386,7 @@ msgstr ""
 "installationen av kärnan."
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2397,13 +2420,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "Kontoinställning"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2415,7 +2438,7 @@ msgstr ""
 "klartextvärden eller <emphasis>MD5-hashar</emphasis>."
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2431,7 +2454,7 @@ msgstr ""
 "kan utsättas för en \"brute force\"-attack."
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2489,7 +2512,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2510,7 +2533,7 @@ msgstr ""
 "command>)."
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
@@ -2518,19 +2541,19 @@ msgstr ""
 "Följande kommando kan användas för att generera en MD5-hash för ett lösenord:"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "Apt-inställning"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2544,7 +2567,7 @@ msgstr ""
 "kan valfritt lägga till andra (lokala) förråd."
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2605,13 +2628,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "Paketval"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2621,73 +2644,73 @@ msgstr ""
 "tillgängliga. Tillgängliga funktioner just nu inkluderar:"
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2699,7 +2722,7 @@ msgstr ""
 "alltid att inkludera funktionen <userinput>standard</userinput>."
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2715,7 +2738,7 @@ msgstr ""
 "kan användas på kommandoraden för kärnan."
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2756,13 +2779,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Installation av starthanteraren"
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1087
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2836,6 +2859,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2892,7 +2917,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2904,13 +2929,13 @@ msgstr ""
 "exemplet i <xref linkend=\"preseed-account\"/>."
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "Färdigställande av installationen"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2953,13 +2978,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Förinställning av andra paket"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2981,19 +3006,19 @@ msgstr ""
 "#   debconf-get-selections >> fil"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "Avancerade inställningar"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Kör anpassade kommandon under installationen"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -3004,7 +3029,7 @@ msgstr ""
 "vid vissa punkter i installationen."
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -3060,13 +3085,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "Användning av förinställningar för att ändra på standardvärden"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -3092,7 +3117,7 @@ msgstr ""
 "användbart för testning eller felsökning av din förkonfigurationsfil."
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -3106,7 +3131,7 @@ msgstr ""
 "paketet. Se sidfoten på <xref linkend=\"preseed-bootparms\"/>."
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -3129,13 +3154,13 @@ msgstr ""
 "under en installation och inte för <quote>interna</quote> parametrar."
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Kedjeinläsning av förkonfigurationsfiler"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -3152,7 +3177,7 @@ msgstr ""
 "andra filer."
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -3205,7 +3230,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po
index 2f0c6b321..eccbd4066 100644
--- a/po/sv/random-bits.po
+++ b/po/sv/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-20 23:58+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -824,8 +824,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS-server"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -840,13 +868,13 @@ msgstr ""
 "installation."
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Installera &debian-gnu; från ett Unix/Linux-system"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section explains how to install &debian-gnu; from an existing Unix "
@@ -878,7 +906,7 @@ msgstr ""
 "kommando som ska anges i Debians chroot-miljö."
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Once you've got the new Debian system configured to your preference, you "
@@ -900,7 +928,7 @@ msgstr ""
 "fungerar snällt med olika uppstarts- eller installationsmedia."
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, fuzzy, no-c-format
 #| msgid ""
 #| "As this is a mostly manual procedure, you should bear in mind that you "
@@ -932,13 +960,13 @@ msgstr ""
 "behövas."
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "Påbörja arbetet"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -954,7 +982,7 @@ msgstr ""
 "du tänker installera skrivbordsmiljöer som GNOME eller KDE)."
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -972,7 +1000,7 @@ msgstr ""
 "uteslut <userinput>-j</userinput>."
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Initialize and activate swap (substitute the partition number for your "
@@ -1006,7 +1034,7 @@ msgstr ""
 "godtyckligt, det refereras till senare här nedan."
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -1016,7 +1044,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -1028,13 +1056,13 @@ msgstr ""
 "fortsätter till nästa steg."
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Installera <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The utility used by the Debian installer, and recognized as the official "
@@ -1070,7 +1098,7 @@ msgstr ""
 "<command>debootstrap</command>."
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Or, you can use the following procedure to install it manually. Make a "
@@ -1108,7 +1136,7 @@ msgstr ""
 "behöva root-privilegier för att installera filerna."
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1121,13 +1149,13 @@ msgstr ""
 "tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Kör <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, fuzzy, no-c-format
 #| msgid ""
 #| "<command>debootstrap</command> can download the needed files directly "
@@ -1150,7 +1178,7 @@ msgstr ""
 "\"></ulink>."
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1162,7 +1190,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1182,7 +1210,7 @@ msgstr ""
 "<userinput>s390</userinput> eller <userinput>sparc</userinput>."
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1192,13 +1220,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.se.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Konfigurera grundsystemet"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Now you've got a real Debian system, though rather lean, on disk. "
@@ -1222,19 +1250,19 @@ msgstr ""
 "grundsystem, till exempel:"
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "Skapa enhetsfiler"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1254,19 +1282,19 @@ msgstr ""
 "statiska enhetsfiler för det nya systemet."
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "Ett par av de tillgängliga alternativen är:"
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr "skapa en standarduppsättning av statiska enhetsfiler med"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1276,7 +1304,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1284,7 +1312,7 @@ msgstr ""
 "skapa manuellt endast specifika enhetsfiler med <command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1296,13 +1324,13 @@ msgstr ""
 "enhetsfiler, så detta alternativ ska endast användas med försiktighet"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Montera partitioner"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You need to create <filename>/etc/fstab</filename>. "
@@ -1425,13 +1453,13 @@ msgstr ""
 "innan du fortsätter:"
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1442,19 +1470,19 @@ msgstr ""
 "Om det här skulle misslyckas, kan du kanske montera proc utanför chroot:"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Ställ in tidszon"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1468,7 +1496,7 @@ msgstr ""
 "tidszon."
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1478,13 +1506,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "Konfigurera nätverket"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1608,13 +1636,13 @@ msgstr ""
 "gränssnittsnamnet (eth0, eth1, etc.) som du förväntar."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Konfigurera apt"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1640,13 +1668,13 @@ msgstr ""
 "userinput> efter att du har gjort ändringar i källistan."
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Konfigurera lokaler och tangentbord"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1667,7 +1695,7 @@ msgstr ""
 "behövs):"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1677,7 +1705,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1687,13 +1715,13 @@ msgstr ""
 "kommer att konfigureras inför nästa omstart."
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Installera en kärna"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1704,19 +1732,19 @@ msgstr ""
 "kärnor med:"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1726,13 +1754,13 @@ msgstr ""
 "replaceable>"
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Ställ in starthanteraren"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To make your &debian-gnu; system bootable, set up your boot loader to "
@@ -1752,7 +1780,7 @@ msgstr ""
 "att göra det."
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1785,7 +1813,7 @@ msgstr ""
 "filename> relativt till systemet du anropar det från)."
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1809,7 +1837,7 @@ msgstr ""
 "fungerande <filename>/boot/grub/menu.lst</filename>."
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1821,13 +1849,13 @@ msgstr ""
 "command>, men dessa är utanför omfånget för denna bilaga."
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Här är ett enkelt exempel på en <filename>/etc/lilo.conf</filename>:"
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1849,7 +1877,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
@@ -1876,7 +1904,7 @@ msgstr ""
 "filename> relativt till systemet du anropar det från)."
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1906,13 +1934,13 @@ msgstr ""
 "<userinput>ide0:</userinput> istället för <userinput>hd:</userinput>."
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Slutgiltiga justeringar"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1932,7 +1960,7 @@ msgstr ""
 "command> för att installera paket individuellt."
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1944,19 +1972,19 @@ msgstr ""
 "genom att köra:"
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "Installera &debian-gnu; över Parallel Line IP (PLIP)"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section explains how to install &debian-gnu; on a computer without "
@@ -1977,7 +2005,7 @@ msgstr ""
 "ansluten till ett nätverk som har en Debian-spegel på sig (t.ex. Internet)."
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1993,7 +2021,7 @@ msgstr ""
 "oanvända inom ditt nätverksadressintervall)."
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -2005,7 +2033,7 @@ msgstr ""
 "\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -2018,13 +2046,13 @@ msgstr ""
 "värdena är <literal>io=0x378</literal> och <literal>irq=7</literal>."
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "Krav"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, fuzzy, no-c-format
 #| msgid ""
 #| "A target computer, called <emphasis>target</emphasis>, where Debian will "
@@ -2037,13 +2065,13 @@ msgstr ""
 "installeras."
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "Systeminstallationsmedia; se <xref linkend=\"installation-media\"/>."
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -2053,7 +2081,7 @@ msgstr ""
 "som kommer att fungera som en gateway."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -2065,13 +2093,13 @@ msgstr ""
 "instruktioner hur man tillverkar en egen."
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "Ställ in källor"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -2081,7 +2109,7 @@ msgstr ""
 "en gateway till Internet med ppp0."
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -2123,13 +2151,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "Installera måldatorn"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2156,13 +2184,13 @@ msgstr ""
 "stegen av installationen."
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Läs in installationskomponenter från cd"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2172,13 +2200,13 @@ msgstr ""
 "göra drivrutinerna för PLIP tillgängliga för installationssystemet."
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Identifiera nätverksmaskinvara"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2193,7 +2221,7 @@ msgstr ""
 "installationsprogrammet inte att visa den här listan."
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2206,19 +2234,19 @@ msgstr ""
 "userinput>."
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "Konfigurera nätverket"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-konfigurera nätverk med DHCP: Nej"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2226,7 +2254,7 @@ msgstr ""
 "IP-adress: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2236,7 +2264,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2246,13 +2274,13 @@ msgstr ""
 "<filename>/etc/resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "Installera &debian-gnu; över PPP over Ethernet (PPPoE)"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2268,7 +2296,7 @@ msgstr ""
 "avsnittet förklarar hur man gör."
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2280,7 +2308,7 @@ msgstr ""
 "\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2295,7 +2323,7 @@ msgstr ""
 "phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2305,7 +2333,7 @@ msgstr ""
 "Följande steg förklarar skillnaderna."
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2322,7 +2350,7 @@ msgstr ""
 "classname>) kommer att läsas in och köras automatiskt."
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2342,7 +2370,7 @@ msgstr ""
 "uppstartsprompten. </para> </footnote>)."
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2352,7 +2380,7 @@ msgstr ""
 "Ethernet-kort som finns anslutna till systemet."
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2365,7 +2393,7 @@ msgstr ""
 "anslutningar)."
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2382,7 +2410,7 @@ msgstr ""
 "installationsprogrammet."
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2393,7 +2421,7 @@ msgstr ""
 "anslutningen)."
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2414,13 +2442,13 @@ msgstr ""
 "starta en PPPoE-anslutning</guimenuitem>."
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "Det grafiska installationsprogrammet"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2435,7 +2463,7 @@ msgstr ""
 "samma program, men med ett annat gränssnitt."
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2454,7 +2482,7 @@ msgstr ""
 "visas på samma skärm."
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2477,7 +2505,7 @@ msgstr ""
 "efter att alternativet <quote>Help</quote> väljs i uppstartsmenyn."
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, fuzzy, no-c-format
 #| msgid ""
 #| "There is also a graphical installer image that can be netbooted. And "
@@ -2502,7 +2530,7 @@ msgstr ""
 "filename>. </para> </footnote>, vilken oftast är användbar för testning."
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, fuzzy, no-c-format
 #| msgid ""
 #| "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2529,7 +2557,7 @@ msgstr ""
 "system."
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2540,7 +2568,7 @@ msgstr ""
 "startas."
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2554,7 +2582,7 @@ msgstr ""
 "automatiskt falla tillbaka på det vanliga gränssnittet <quote>newt</quote>."
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2569,13 +2597,13 @@ msgstr ""
 "tillgängligt minne."
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "Användning av det grafiska installationsprogrammet"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2588,7 +2616,7 @@ msgstr ""
 "installationsprocessen."
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2608,7 +2636,7 @@ msgstr ""
 "val; tryck Enter för att växla en markering, utan att aktivera &BTN-CONT;."
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2620,7 +2648,7 @@ msgstr ""
 "att aktivera knappen eller genom att trycka på <keycap>F1</keycap>-tangenten."
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/sv/using-d-i.po b/po/sv/using-d-i.po
index e1cec615e..7ee953567 100644
--- a/po/sv/using-d-i.po
+++ b/po/sv/using-d-i.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20051025 using d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-05-21 00:00+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -474,11 +474,23 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "Ställer in root-lösenordet och lägger till en icke-root-användare."
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -488,25 +500,25 @@ msgstr ""
 "UTC eller inte."
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "Väljer tidszonen, baserat på platsen som valdes tidigare."
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Allows the user to partition disks attached to the system, create file "
@@ -526,13 +538,13 @@ msgstr ""
 "Debian."
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -542,13 +554,13 @@ msgstr ""
 "partitioneringsprogram som lämpar sig för din dators arkitektur väljs."
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -558,13 +570,13 @@ msgstr ""
 "enligt användarens instruktioner."
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -574,13 +586,13 @@ msgstr ""
 "volymhantering)."
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -593,13 +605,13 @@ msgstr ""
 "finns på nyare moderkort."
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -609,18 +621,6 @@ msgstr ""
 "&debian-gnu; efter omstart."
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "Ställer in root-lösenordet och lägger till en icke-root-användare."
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -1130,15 +1130,16 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Tangentbord är ofta anpassade efter de tecken som används i ett språk. Välj "
 "en layout som gäller för tangentbordet du använder, eller välj något som "
 "liknar det om tangentbordslayouten du vill välja inte finns. När "
 "installationen av systemet är färdig kommer du kunna välja en "
-"tangentbordslayout från en bredare skala (kör <command>dpkg-reconfigure keyboard-configuration</command> "
-"som root efter att du har färdigställt installationen)."
+"tangentbordslayout från en bredare skala (kör <command>dpkg-reconfigure "
+"keyboard-configuration</command> som root efter att du har färdigställt "
+"installationen)."
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1502,11 +1503,149 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Skapa användare och lösenord"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"Efter att grundsystemet har installerats kommer installationsprogrammet att "
+"låta dig konfigurera <quote>root</quote>-kontot och/eller ett konto för den "
+"första användaren. Andra användarkonton kan skapas efter att installationen "
+"har färdigställts."
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "Ställa in ett lösenord för root"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"Kontot <emphasis>root</emphasis> kallas även för <emphasis>superanvändare</"
+"emphasis>; det är ett konto som kringgår alla säkerhetsskydd på ditt system. "
+"Root-kontot bör endast användas för systemadministration och endast användas "
+"under en så kort tid som möjligt."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"Lösenord som du skapar bör innehålla åtminstone 6 tecken och bör innehålla "
+"både versaler och gemener, såväl som specialtecken. Ta extra hänsyn när du "
+"ställer in ditt root-lösenord eftersom det är ett sådant kraftfullt konto. "
+"Undvik ord som man hittar i ordböcker eller användning av personlig "
+"information som lätt kan gissas."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Om någon berättar för dig att de behöver ditt root-lösenord, var extremt "
+"försiktig. Du bör normalt sett aldrig ge ut ditt root-lösenord, om du inte "
+"administrerar en maskin med fler än en systemadministratör."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Skapa en vanlig användare"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"Systemet kommer att fråga dig om du önskar att skapa ett vanligt "
+"användarkonto vid den här punkten. Det här kontot bör vara ditt huvudsakliga "
+"personliga konto. Du bör <emphasis>inte</emphasis> använda rootkontot för "
+"dagligt bruk eller som ditt personliga konto."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"Varför inte? Tja, en anledning är att undvika att använda roots privilegier "
+"är att det är mycket lätt att skada något som root och som inte går att "
+"rätta till. En annan anledning är att du kanske luras till att köra en "
+"<emphasis>trojansk häst</emphasis> &mdash; det är ett program som utnyttjar "
+"krafterna av din superanvändare för att åsidosätta säkerheten i ditt system "
+"bakom din rygg. En bra bok om systemadministration i Unix täcker in det här "
+"ämnet mer i detalj &mdash; om det här är nytt för dig, fundera på att läsa "
+"en sådan bok."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Du kommer första att bli frågad efter användarens fullständiga namn. Sedan "
+"kommer du att bli frågad efter ett namn på användarens konto; generellt sett "
+"ditt förnamn eller något liknande det bör räcka och det är även "
+"standardvalet här. Till slut kommer du bli frågad efter ett lösenord för "
+"kontot."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Om du vill skapa en annan användare vid en senare punkt efter "
+"installationen, använd kommandot <command>adduser</command>."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Partitionering och val av monteringspunkter"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1525,7 +1664,7 @@ msgstr ""
 "LVM eller RAID-enheter."
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1535,7 +1674,7 @@ msgstr ""
 "detaljer, se <xref linkend=\"partitioning\"/>."
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1558,7 +1697,7 @@ msgstr ""
 "befintligt data på disken otillgängligt."
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1572,13 +1711,13 @@ msgstr ""
 "automatiskt, välj <guimenuitem>Manuell</guimenuitem> från menyn."
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "Partitionsflaggor som stöds"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1587,7 +1726,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1600,7 +1739,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1611,31 +1750,31 @@ msgstr ""
 "kombineras."
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "Logisk volymhantering (LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "Programvaru-RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "RAID-nivåer som stöds är 0, 1, 4, 5, 6 och 10."
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "Kryptering"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1643,7 +1782,7 @@ msgstr ""
 "<emphasis>Serial ATA RAID</emphasis> (med <classname>dmraid</classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1653,13 +1792,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1668,13 +1807,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "Följande filsystem stöds."
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1686,7 +1825,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1695,19 +1834,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>jfs</emphasis> (inte tillgänglig på alla arkitekturer)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>xfs</emphasis> (inte tillgänglig på alla arkitekturer)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
@@ -1715,7 +1854,7 @@ msgstr ""
 "<emphasis>reiserfs</emphasis> (valfri; inte tillgänglig på alla arkitekturer)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1725,13 +1864,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1739,13 +1878,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1753,19 +1892,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (skrivskyddad)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1773,13 +1912,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "Guidad partitionering"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1797,7 +1936,7 @@ msgstr ""
 "para> </footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
@@ -1806,7 +1945,7 @@ msgstr ""
 "arkitekturer."
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1823,7 +1962,7 @@ msgstr ""
 "extra säkerhet för ditt (personliga) data."
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1840,7 +1979,7 @@ msgstr ""
 "disk."
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1858,7 +1997,7 @@ msgstr ""
 "dessa ändringar innan de skrivs till disken."
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1876,7 +2015,7 @@ msgstr ""
 "hjälpa dig att särskilja dem."
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1892,7 +2031,7 @@ msgstr ""
 "inte möjligt."
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1910,73 +2049,73 @@ msgstr ""
 "på vald plan), kommer den guidade partitioneringen att misslyckas."
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "Partitioneringsplan"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "Minsta utrymme"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "Skapade partitioner"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "Alla filer på en partition"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600 MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, växl"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "Separat partition för /home"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500 MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, växl"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Separata partitioner för /home, /usr, /var och /tmp"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1 GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1986,7 +2125,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, växl"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -2000,7 +2139,7 @@ msgstr ""
 "att skapas inom LVM-partitionen."
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -2015,7 +2154,7 @@ msgstr ""
 "uppstartspartition."
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -2027,7 +2166,7 @@ msgstr ""
 "var de kommer att monteras."
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -2077,7 +2216,7 @@ msgstr ""
 "men det visar en möjlig variation som kan uppnås med manuell partitionering."
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -2098,13 +2237,13 @@ msgstr ""
 "beskrivs nedan för manuell partitionering."
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "Manuell partitionering"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, fuzzy, no-c-format
 #| msgid ""
 #| "A similar screen to the one shown just above will be displayed if you "
@@ -2126,7 +2265,7 @@ msgstr ""
 "kommer att täckas in av den återstående delen av det här avsnittet."
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -2140,7 +2279,7 @@ msgstr ""
 "texten <quote>LEDIGT UTRYMME</quote> visas i tabellen under en valda disken."
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -2182,7 +2321,7 @@ msgstr ""
 "<command>partman</command>."
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -2204,7 +2343,7 @@ msgstr ""
 "Den här menyn låter dig även ta bort en partition."
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2220,7 +2359,7 @@ msgstr ""
 "förrän du har rättat till det."
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2232,7 +2371,7 @@ msgstr ""
 "förrän du har allokerat en."
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2248,7 +2387,7 @@ msgstr ""
 "filename> eller <filename>partman-lvm</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2263,13 +2402,13 @@ msgstr ""
 "filsystem."
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Konfiguration av multidiskenheter (Programvaru-RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2289,7 +2428,7 @@ msgstr ""
 "<firstterm>programvaru-RAID</firstterm>)."
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2304,7 +2443,7 @@ msgstr ""
 "etc.)."
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2415,98 +2554,98 @@ msgstr ""
 "varlistentry> </variablelist> För att summera:"
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "Typ"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "Minimum antal enheter"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "Reservenhet"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "Överlever diskfel?"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "Tillgänglig plats"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>nej</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
 "Storlek för den minsta partitionen multiplicerat med antalet enheter i RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "valfri"
 
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>ja</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Storlek för den minsta partitionen i RAID"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2516,19 +2655,19 @@ msgstr ""
 "minus en)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2538,13 +2677,13 @@ msgstr ""
 "minus två)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2553,7 +2692,7 @@ msgstr ""
 "Totalen för alla partitioner delat med antalet delkopior (standard är två)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2563,7 +2702,7 @@ msgstr ""
 "software-raid-howto;\">Software RAID HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2579,7 +2718,7 @@ msgstr ""
 "<guimenuitem>fysisk volym för RAID</guimenuitem> </menuchoice>.)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2599,7 +2738,7 @@ msgstr ""
 "RAID1 för <filename>/boot</filename> kan det vara ett alternativ."
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2617,7 +2756,7 @@ msgstr ""
 "installationssteg manuellt från ett skal."
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2639,7 +2778,7 @@ msgstr ""
 "beror på den MD-typ du har valt."
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2651,7 +2790,7 @@ msgstr ""
 "enheten."
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2671,7 +2810,7 @@ msgstr ""
 "fortsätta förräns du har rättat till det."
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2681,7 +2820,7 @@ msgstr ""
 "behöver använda åtminstone <emphasis>tre</emphasis> aktiva partitioner."
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2691,7 +2830,7 @@ msgstr ""
 "behöver använda åtminstone <emphasis>fyra</emphasis> aktiva partitioner."
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2711,7 +2850,7 @@ msgstr ""
 "enheter så att var och en av kopiorna kan distribueras till olika diskar."
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2730,7 +2869,7 @@ msgstr ""
 "home</filename>)."
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2744,13 +2883,13 @@ msgstr ""
 "enheter och ge dem de vanliga attributen såsom monteringspunkter."
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Konfigurering av den logiska volymhanteraren (LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2766,7 +2905,7 @@ msgstr ""
 "den här situationen genom att flytta runt saker, symboliska länkar, etc."
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2786,7 +2925,7 @@ msgstr ""
 "volymgrupperna) kan spänna över ett flertal fysiska diskar."
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2807,7 +2946,7 @@ msgstr ""
 "<ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2824,7 +2963,7 @@ msgstr ""
 "guimenuitem> </menuchoice>."
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2845,7 +2984,7 @@ msgstr ""
 "är:"
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2855,43 +2994,43 @@ msgstr ""
 "enhetsstrukturen, namn och storlekar på logiska volymer och annat"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Skapa volymgrupp"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Skapa logisk volym"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Ta bort volymgrupp"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Ta bort logisk volym"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Utöka volymgrupp"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Minska volymgrupp"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2901,7 +3040,7 @@ msgstr ""
 "<command>partman</command>"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2911,7 +3050,7 @@ msgstr ""
 "skapa dina logiska volymer i den."
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2923,13 +3062,13 @@ msgstr ""
 "bör även behandla dem som det)."
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Konfigurera krypterade volymer"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2952,7 +3091,7 @@ msgstr ""
 "slumpmässiga tecken."
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2980,7 +3119,7 @@ msgstr ""
 "krypterad partition."
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2994,7 +3133,7 @@ msgstr ""
 "processorhastighet, vald kryptering och nyckellängd."
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -3015,7 +3154,7 @@ msgstr ""
 "partitionen."
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -3032,7 +3171,7 @@ msgstr ""
 "annorlunda. "
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -3046,13 +3185,13 @@ msgstr ""
 "ut med tanke på säkerhet."
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Kryptering: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3077,13 +3216,13 @@ msgstr ""
 "standardkrypteringsalgoritm för skydd av känslig information för 2000-talet."
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Nyckellängd: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -3097,13 +3236,13 @@ msgstr ""
 "olika beroende på valt chiffer."
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV-algoritm: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3121,7 +3260,7 @@ msgstr ""
 "krypterat data."
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3135,25 +3274,25 @@ msgstr ""
 "system som inte kan använda nyare algoritmer."
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Krypteringsnyckel: <userinput>Lösenfras</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Här kan du välja typ av krypteringsnyckel för denna partition."
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Lösenfras"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3167,13 +3306,13 @@ msgstr ""
 "basis och som du kan ange senare i processen."
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Slumpmässig nyckel"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -3192,7 +3331,7 @@ msgstr ""
 "livstid.)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -3212,13 +3351,13 @@ msgstr ""
 "återhämta suspenderat data som skrivits på växlingspartitionen."
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Radera data: <userinput>ja</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -3240,7 +3379,7 @@ msgstr ""
 "flertal överskrivningar. </para></footnote>."
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3252,13 +3391,13 @@ msgstr ""
 "att ändras för att tillhandahålla följande alternativ:"
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Kryptering: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3271,25 +3410,25 @@ msgstr ""
 "nyckellängder."
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Krypteringsnyckel: <userinput>Nyckelfil (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "Här kan du välja typ av krypteringsnyckel för denna partition."
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Nyckelfil (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -3304,19 +3443,19 @@ msgstr ""
 "processen)."
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "Se ovanstående avsnitt angående slumpmässiga nycklar."
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "Se ovanstående avsnitt angående radering av data."
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -3335,7 +3474,7 @@ msgstr ""
 "ta lite tid."
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3352,7 +3491,7 @@ msgstr ""
 "namn på husdjur, namn på familjemedlemmar eller närstående, etc.)."
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3376,7 +3515,7 @@ msgstr ""
 "lösenfrasen för rotfilsystemet anges."
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3399,7 +3538,7 @@ msgstr ""
 "kommer att upprepas för varje partition som ska krypteras."
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3433,7 +3572,7 @@ msgstr ""
 "inte passar för dig."
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3452,7 +3591,7 @@ msgstr ""
 "encrypted-volumes\"/>."
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3460,13 +3599,13 @@ msgid ""
 msgstr "När du är nöjd med partitioneringsplanen, fortsätt med installationen."
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "Installation av grundsystemet"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3480,7 +3619,7 @@ msgstr ""
 "här ta en stund."
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3497,7 +3636,7 @@ msgstr ""
 "keycap><keycap>F1</keycap></keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3509,7 +3648,7 @@ msgstr ""
 "dem där om installationen genomförs över en seriekonsoll."
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3523,7 +3662,7 @@ msgstr ""
 "från en lista av tillgängliga kärnor."
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3535,7 +3674,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3545,139 +3684,6 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "Skapa användare och lösenord"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"Efter att grundsystemet har installerats kommer installationsprogrammet att "
-"låta dig konfigurera <quote>root</quote>-kontot och/eller ett konto för den "
-"första användaren. Andra användarkonton kan skapas efter att installationen "
-"har färdigställts."
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "Ställa in ett lösenord för root"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"Kontot <emphasis>root</emphasis> kallas även för <emphasis>superanvändare</"
-"emphasis>; det är ett konto som kringgår alla säkerhetsskydd på ditt system. "
-"Root-kontot bör endast användas för systemadministration och endast användas "
-"under en så kort tid som möjligt."
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"Lösenord som du skapar bör innehålla åtminstone 6 tecken och bör innehålla "
-"både versaler och gemener, såväl som specialtecken. Ta extra hänsyn när du "
-"ställer in ditt root-lösenord eftersom det är ett sådant kraftfullt konto. "
-"Undvik ord som man hittar i ordböcker eller användning av personlig "
-"information som lätt kan gissas."
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Om någon berättar för dig att de behöver ditt root-lösenord, var extremt "
-"försiktig. Du bör normalt sett aldrig ge ut ditt root-lösenord, om du inte "
-"administrerar en maskin med fler än en systemadministratör."
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "Skapa en vanlig användare"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"Systemet kommer att fråga dig om du önskar att skapa ett vanligt "
-"användarkonto vid den här punkten. Det här kontot bör vara ditt huvudsakliga "
-"personliga konto. Du bör <emphasis>inte</emphasis> använda rootkontot för "
-"dagligt bruk eller som ditt personliga konto."
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"Varför inte? Tja, en anledning är att undvika att använda roots privilegier "
-"är att det är mycket lätt att skada något som root och som inte går att "
-"rätta till. En annan anledning är att du kanske luras till att köra en "
-"<emphasis>trojansk häst</emphasis> &mdash; det är ett program som utnyttjar "
-"krafterna av din superanvändare för att åsidosätta säkerheten i ditt system "
-"bakom din rygg. En bra bok om systemadministration i Unix täcker in det här "
-"ämnet mer i detalj &mdash; om det här är nytt för dig, fundera på att läsa "
-"en sådan bok."
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Du kommer första att bli frågad efter användarens fullständiga namn. Sedan "
-"kommer du att bli frågad efter ett namn på användarens konto; generellt sett "
-"ditt förnamn eller något liknande det bör räcka och det är även "
-"standardvalet här. Till slut kommer du bli frågad efter ett lösenord för "
-"kontot."
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Om du vill skapa en annan användare vid en senare punkt efter "
-"installationen, använd kommandot <command>adduser</command>."
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -4617,14 +4623,21 @@ msgstr "Välj den korrekta partitionen!"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "Villkoret för att välja en partition är att den har ett FAT-formaterat "
 "filsystem med sin <emphasis>boot</emphasis>-flagga inställd. &d-i; kan visa "
diff --git a/po/tl/bookinfo.po b/po/tl/bookinfo.po
index 591418136..dd37b251d 100644
--- a/po/tl/bookinfo.po
+++ b/po/tl/bookinfo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer manual Tagalog\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-11-30 04:11+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -61,14 +61,14 @@ msgstr ""
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "Itong gabay sa pagluklok ay batay sa mas-naunang manwal na sinulat para sa "
 "lumang sistema ng pagluklok ng Debian (ang mga \"boot floppy\"), at binago "
diff --git a/po/vi/administrivia.po b/po/vi/administrivia.po
index d7f87e802..b8155e004 100644
--- a/po/vi/administrivia.po
+++ b/po/vi/administrivia.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: administrivia\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 19:29+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,41 +17,41 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: administrivia.xml:5
 #, no-c-format
-#. Tag: title
 msgid "Administrivia"
 msgstr "Linh tinh quản trị"
 
+#. Tag: title
 #: administrivia.xml:9
 #, no-c-format
-#. Tag: title
 msgid "About This Document"
 msgstr "Về tài liệu này"
 
-#: administrivia.xml:11
-#, no-c-format
 #. Tag: para
+#: administrivia.xml:11
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This manual was created for Sarge's debian-installer, based on the Woody "
-#| "installation manual for boot-floppies, which was based on earlier Debian "
-#| "installation manuals, and on the Progeny distribution manual which was "
-#| "released under GPL in 2003."
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
 "Sổ tay này đã được tạo dành cho trình cài đặt của bản phát hành &debian; tên "
 "Sarge, dựa vào sổ tay cài đặt Woody bằng đĩa mềm khởi động, mà lần lượt dựa "
-"vào những sổ tay cài đặt &debian; trước, cũng vào sổ tay phân phối Progeny mà "
-"được phát hành với điều kiện của Giấy Phép Công Cộng GNU (GPL) trong năm "
+"vào những sổ tay cài đặt &debian; trước, cũng vào sổ tay phân phối Progeny "
+"mà được phát hành với điều kiện của Giấy Phép Công Cộng GNU (GPL) trong năm "
 "2003."
 
+#. Tag: para
 #: administrivia.xml:18
 #, no-c-format
-#. Tag: para
 msgid ""
 "This document is written in DocBook XML. Output formats are generated by "
 "various programs using information from the <classname>docbook-xml</"
@@ -62,9 +62,9 @@ msgstr ""
 "từ hai gói <classname>docbook-xml</classname> và <classname>docbook-xsl</"
 "classname>."
 
+#. Tag: para
 #: administrivia.xml:25
 #, no-c-format
-#. Tag: para
 msgid ""
 "In order to increase the maintainability of this document, we use a number "
 "of XML features, such as entities and profiling attributes. These play a "
@@ -80,9 +80,9 @@ msgstr ""
 "riêng &mdash; những thuộc tính tạo hồ sơ riêng được dùng để đặt một số đoạn "
 "nào đó là đặc trưng cho kiến trúc."
 
+#. Tag: para
 #: administrivia.xml:34
 #, no-c-format
-#. Tag: para
 msgid ""
 "Translators can use this paragraph to acknowledge the people responsible for "
 "the translation of the manual. Translation teams are advised to just mention "
@@ -93,15 +93,15 @@ msgid ""
 msgstr ""
 "Bản dịch: Nhóm Việt hoá phần mềm tự do <email>vi-VN@googlegroups.com</email>."
 
+#. Tag: title
 #: administrivia.xml:50
 #, no-c-format
-#. Tag: title
 msgid "Contributing to This Document"
 msgstr "Cách đóng góp cho tài liệu này"
 
+#. Tag: para
 #: administrivia.xml:52
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have problems or suggestions regarding this document, you should "
 "probably submit them as a bug report against the package "
@@ -126,9 +126,9 @@ msgstr ""
 "replaceable>@bugs.debian.org</email>, mà <replaceable>SỐ </replaceable> là "
 "số hiệu của lỗi đã được thông báo."
 
+#. Tag: para
 #: administrivia.xml:68
 #, no-c-format
-#. Tag: para
 msgid ""
 "Better yet, get a copy of the DocBook source for this document, and produce "
 "patches against it. The DocBook source can be found at the <ulink url=\"&url-"
@@ -151,9 +151,9 @@ msgstr ""
 "về cách lấy mã nguồn bằng SVN, xem tài liệu Đọc Đi <ulink url=\"&url-d-i-"
 "readme;\">README</ulink> nằm trong thư mục gốc nguồn."
 
+#. Tag: para
 #: administrivia.xml:82
 #, no-c-format
-#. Tag: para
 msgid ""
 "Please do <emphasis>not</emphasis> contact the authors of this document "
 "directly. There is also a discussion list for &d-i;, which includes "
@@ -171,15 +171,15 @@ msgstr ""
 "qua <ulink url=\"&url-debian-list-archives;\">Kho lưu hộp thư chung Debian</"
 "ulink> trực tuyến."
 
+#. Tag: title
 #: administrivia.xml:99
 #, no-c-format
-#. Tag: title
 msgid "Major Contributions"
 msgstr "Đóng góp chính"
 
+#. Tag: para
 #: administrivia.xml:101
 #, no-c-format
-#. Tag: para
 msgid ""
 "This document was originally written by Bruce Perens, Sven Rudolph, Igor "
 "Grobman, James Treacy, and Adam Di Carlo. Sebastian Ley wrote the "
@@ -189,9 +189,9 @@ msgstr ""
 "Grobman, James Treacy và Adam Di Carlo. Sebastian Ley đã viết Tài liệu Cài "
 "đặt Như Thế Nào."
 
+#. Tag: para
 #: administrivia.xml:107
 #, no-c-format
-#. Tag: para
 msgid ""
 "Miroslav Kuře has documented a lot of the new functionality in Sarge's "
 "debian-installer. Frans Pop was the main editor and release manager during "
@@ -201,11 +201,11 @@ msgstr ""
 "đặt Debian phiên bản Sarge. Frans Pop là biên tập viên chính và quản trị "
 "phát hành trong khi phát hành phiên bản Etch, Lenny và Squeeze."
 
-#: administrivia.xml:113
-#, no-c-format
 #. Tag: para
+#: administrivia.xml:113
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Many, many Debian users and developers contributed to this document. "
+#| "Many, many &debian; users and developers contributed to this document. "
 #| "Particular note must be made of Michael Schmitz (m68k support), Frank "
 #| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 #| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
@@ -213,7 +213,7 @@ msgstr ""
 #| "edits and text. We have to thank Pascal Le Bail for useful information "
 #| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
@@ -221,16 +221,16 @@ msgid ""
 "edits and text. We have to thank Pascal Le Bail for useful information about "
 "booting from USB memory sticks."
 msgstr ""
-"Rất nhiều người dùng và nhà phát triển &debian; đã đóng góp cho tài liệu này. "
-"Chúng tôi cám ơn đặc biệt Michael Schmitz (hỗ trợ m68k), Frank Neumann (tác "
-"giả gốc của <ulink url=\"&url-m68k-old-amiga-install;\">sổ tay cài đặt vào "
-"Amiga</ulink>), Arto Astala, Eric Delaunay/Ben Collins (thông tin về SPARC), "
-"Tapio Lehtonen, và Stéphane Bortzmeyer (rất nhiều lời sửa đổi), và Pascal Le "
-"Bail (thông tin hữu hiệu về cách khởi động từ thanh bộ nhớ USB)."
+"Rất nhiều người dùng và nhà phát triển &debian; đã đóng góp cho tài liệu "
+"này. Chúng tôi cám ơn đặc biệt Michael Schmitz (hỗ trợ m68k), Frank Neumann "
+"(tác giả gốc của <ulink url=\"&url-m68k-old-amiga-install;\">sổ tay cài đặt "
+"vào Amiga</ulink>), Arto Astala, Eric Delaunay/Ben Collins (thông tin về "
+"SPARC), Tapio Lehtonen, và Stéphane Bortzmeyer (rất nhiều lời sửa đổi), và "
+"Pascal Le Bail (thông tin hữu hiệu về cách khởi động từ thanh bộ nhớ USB)."
 
+#. Tag: para
 #: administrivia.xml:124
 #, no-c-format
-#. Tag: para
 msgid ""
 "Extremely helpful text and information was found in Jim Mintha's HOWTO for "
 "network booting (no URL available), the <ulink url=\"&url-debian-faq;"
@@ -248,9 +248,9 @@ msgstr ""
 "Linux/Alpha</ulink>, trong nhiều điều khác nhau. Mọi người nhờ những nhà bảo "
 "trì các nguồn thông tin phong phú này là sẵn sàng tự do."
 
+#. Tag: para
 #: administrivia.xml:136
 #, no-c-format
-#. Tag: para
 msgid ""
 "The section on chrooted installations in this manual (<xref linkend=\"linux-"
 "upgrade\"/>) was derived in part from documents copyright Karsten M. Self."
@@ -258,9 +258,9 @@ msgstr ""
 "Tiết đoạn của sổ tay này về cách cài đặt kiểu chroot (<xref linkend=\"linux-"
 "upgrade\"/>) bắt nguồn một phần từ tài liệu Tác quyền © Karsten M. Self."
 
+#. Tag: para
 #: administrivia.xml:142
 #, no-c-format
-#. Tag: para
 msgid ""
 "The section on installations over plip in this manual (<xref linkend=\"plip"
 "\"/>) was based on the <ulink url=\"&url-plip-install-howto;\">PLIP-Install-"
@@ -270,14 +270,14 @@ msgstr ""
 "\"plip\"/>) dựa vào tài liệu cài đặt PLIP thế nào <ulink url=\"&url-plip-"
 "install-howto;\">PLIP-Install-HOWTO</ulink> của Gilles Lamiral."
 
+#. Tag: title
 #: administrivia.xml:153
 #, no-c-format
-#. Tag: title
 msgid "Trademark Acknowledgement"
 msgstr "Lời báo nhận thương hiệu"
 
+#. Tag: para
 #: administrivia.xml:154
 #, no-c-format
-#. Tag: para
 msgid "All trademarks are property of their respective trademark owners."
 msgstr "Mọi thương hiệu do nhà chủ thương hiệu riêng từng sở hữu."
diff --git a/po/vi/bookinfo.po b/po/vi/bookinfo.po
index 3f35dbfdd..b9ac4b244 100644
--- a/po/vi/bookinfo.po
+++ b/po/vi/bookinfo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 19:27+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,21 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: bookinfo.xml:5
 #, no-c-format
-#. Tag: title
 msgid "&debian-gnu; Installation Guide"
 msgstr "Sổ tay Cài đặt &debian-gnu;"
 
+#. Tag: para
 #: bookinfo.xml:8
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This document contains installation instructions for the &debian-gnu; "
-#| "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
-#| "title; (<quote>&architecture;</quote>) architecture. It also contains "
-#| "pointers to more information and information on how to make the most of "
-#| "your new Debian system."
 msgid ""
 "This document contains installation instructions for the &debian-gnu; "
 "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
@@ -39,15 +33,18 @@ msgid ""
 "pointers to more information and information on how to make the most of your "
 "new &debian; system."
 msgstr ""
-"Tài liệu này chứa hướng dẫn cài đặt cho hệ thống &debian-gnu; &release; (tên mã <quote>&releasename;</quote>), cho kiến trúc &arch-title; (<quote>&architecture;</quote>). Nó cũng chứa liên kết đến thông tin bổ sung và thông tin về tận dụng hệ thống &debian; mới."
+"Tài liệu này chứa hướng dẫn cài đặt cho hệ thống &debian-gnu; &release; (tên "
+"mã <quote>&releasename;</quote>), cho kiến trúc &arch-title; "
+"(<quote>&architecture;</quote>). Nó cũng chứa liên kết đến thông tin bổ sung "
+"và thông tin về tận dụng hệ thống &debian; mới."
 
-#: bookinfo.xml:17
-#, no-c-format
 #. Tag: para
+#: bookinfo.xml:17
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This installation guide is based on an earlier manual written for the old "
-#| "Debian installation system (the <quote>boot-floppies</quote>), and has "
-#| "been updated to document the new Debian installer. However, for "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
 #| "&architecture;, the manual has not been fully updated and fact checked "
 #| "for the new installer. There may remain parts of the manual that are "
 #| "incomplete or outdated or that still document the boot-floppies "
@@ -57,21 +54,27 @@ msgstr ""
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
-"Sổ tay Cài đặt này dựa vào một sổ tay trước được viết cho hệ thống cài đặt &debian; cũ ( <quote>boot-floppies</quote>: đĩa mềm khởi động), và được cập nhật để diễn tả trình cài đặt &debian; mới. Tuy nhiên, thông tin về &architecture; có thể là không hoàn toàn. Vẫn có thể là phần của sổ tay này cũng không hoàn toàn, chưa cập nhật hoặc nói đến trình cài đặt boot-floppies. Một phiên bản mới của sổ tay này (có thể là chứa thêm thông tin về kiến trúc này) nằm trên <ulink url=\"&url-d-i;\">trang chủ &d-i;</"
-"ulink>. Ở đó cũng có thể cung cấp thêm bản dịch."
+"Sổ tay Cài đặt này dựa vào một sổ tay trước được viết cho hệ thống cài đặt "
+"&debian; cũ ( <quote>boot-floppies</quote>: đĩa mềm khởi động), và được cập "
+"nhật để diễn tả trình cài đặt &debian; mới. Tuy nhiên, thông tin về "
+"&architecture; có thể là không hoàn toàn. Vẫn có thể là phần của sổ tay này "
+"cũng không hoàn toàn, chưa cập nhật hoặc nói đến trình cài đặt boot-"
+"floppies. Một phiên bản mới của sổ tay này (có thể là chứa thêm thông tin về "
+"kiến trúc này) nằm trên <ulink url=\"&url-d-i;\">trang chủ &d-i;</ulink>. Ở "
+"đó cũng có thể cung cấp thêm bản dịch."
 
+#. Tag: para
 #: bookinfo.xml:30
 #, no-c-format
-#. Tag: para
 msgid ""
 "Although this installation guide for &architecture; is mostly up-to-date, we "
 "plan to make some changes and reorganize parts of the manual after the "
@@ -79,11 +82,15 @@ msgid ""
 "found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
 "ulink>. You may also be able to find additional translations there."
 msgstr ""
-"Mặc dù sổ tay cài đặt vào &architecture; này phần lớn được cập nhật, chúng tôi định sửa đổi nó và tổ hợp lại một số phần của sổ tay sau khi phát hành &releasename; một cách chính thức. Một phiên bản mới của sổ tay này (có thể là chứa thêm thông tin về kiến trúc này) nằm trên <ulink url=\"&url-d-i;\">trang chủ &d-i;</ulink>. Ở đó cũng có thể cung cấp thêm bản dịch"
+"Mặc dù sổ tay cài đặt vào &architecture; này phần lớn được cập nhật, chúng "
+"tôi định sửa đổi nó và tổ hợp lại một số phần của sổ tay sau khi phát hành "
+"&releasename; một cách chính thức. Một phiên bản mới của sổ tay này (có thể "
+"là chứa thêm thông tin về kiến trúc này) nằm trên <ulink url=\"&url-d-i;"
+"\">trang chủ &d-i;</ulink>. Ở đó cũng có thể cung cấp thêm bản dịch"
 
+#. Tag: para
 #: bookinfo.xml:39
 #, no-c-format
-#. Tag: para
 msgid ""
 "Translators can use this paragraph to provide some information about the "
 "status of the translation, for example if the translation is still being "
@@ -91,17 +98,19 @@ msgid ""
 "should be sent!). See build/lang-options/README on how to enable this "
 "paragraph. Its condition is \"translation-status\"."
 msgstr ""
-"Trạng thái của bản dịch: hoàn tất (mà có thể là không đẹp ;) ). Mời bạn gửi thông báo lỗi hoặc góp ý cho người dịch <email>clytie@riverland.net.au</email> và/hoặc hộp thư chung <email>hanoilug@lists.hanoilug.org</email>"
+"Trạng thái của bản dịch: hoàn tất (mà có thể là không đẹp ;) ). Mời bạn gửi "
+"thông báo lỗi hoặc góp ý cho người dịch <email>clytie@riverland.net.au</"
+"email> và/hoặc hộp thư chung <email>hanoilug@lists.hanoilug.org</email>"
 
+#. Tag: holder
 #: bookinfo.xml:52
 #, no-c-format
-#. Tag: holder
 msgid "the Debian Installer team"
 msgstr "nhóm trình cài đặt &debian;"
 
+#. Tag: para
 #: bookinfo.xml:56
 #, no-c-format
-#. Tag: para
 msgid ""
 "This manual is free software; you may redistribute it and/or modify it under "
 "the terms of the GNU General Public License. Please refer to the license in "
diff --git a/po/vi/boot-installer.po b/po/vi/boot-installer.po
index 0a36980d3..8cd0a5a6d 100644
--- a/po/vi/boot-installer.po
+++ b/po/vi/boot-installer.po
@@ -17,21 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: boot-installer.xml:4
 #, no-c-format
-#. Tag: title
 msgid "Booting the Installation System"
 msgstr "Khởi động Hệ thống Cài đặt"
 
+#. Tag: title
 #: boot-installer.xml:9
 #, no-c-format
-#. Tag: title
 msgid "Booting the Installer on &arch-title;"
 msgstr "Khởi động trình cài đặt trên &arch-title;"
 
+#. Tag: para
 #: boot-installer.xml:15
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have any other operating systems on your system that you wish to keep "
 "(dual boot setup), you should make sure that they have been properly shut "
@@ -46,9 +46,9 @@ msgstr ""
 "điều hành trong khi hệ điều hành khác ngủ động thì có thể gây ra dữ liệu bị "
 "mất hay bị hỏng trong hệ đó. (Sau đó thì có thể gặp lỗi khi khởi động lại.)"
 
+#. Tag: para
 #: boot-installer.xml:26
 #, no-c-format
-#. Tag: para
 msgid ""
 "For information on how to boot the graphical installer, see <xref linkend="
 "\"graphical\"/>."
@@ -56,19 +56,16 @@ msgstr ""
 "Để tìm thông tin thêm về cách khởi động bộ cài đặt đồ họa, xem <xref linkend="
 "\"graphical\"/>."
 
+#. Tag: title
 #: boot-installer.xml:37
 #, no-c-format
-#. Tag: title
 msgid "Booting from TFTP"
 msgstr "Khởi động từ TFTP"
 
-#: boot-installer.xml:43
-#: boot-installer.xml:653
-#: boot-installer.xml:1192
-#: boot-installer.xml:1683
-#: boot-installer.xml:1792
-#, no-c-format
 #. Tag: para
+#: boot-installer.xml:43 boot-installer.xml:653 boot-installer.xml:1192
+#: boot-installer.xml:1683 boot-installer.xml:1792
+#, no-c-format
 msgid ""
 "Booting from the network requires that you have a network connection and a "
 "TFTP network boot server (DHCP, RARP, or BOOTP)."
@@ -76,13 +73,10 @@ msgstr ""
 "Việc khởi động từ mạng cần thiết bạn có sự kết nối mạng và máy phục vụ khởi "
 "động mạng kiểu TFTP (DHCP, RARP, hay BOOTP)."
 
-#: boot-installer.xml:48
-#: boot-installer.xml:658
-#: boot-installer.xml:1197
-#: boot-installer.xml:1688
-#: boot-installer.xml:1797
-#, no-c-format
 #. Tag: para
+#: boot-installer.xml:48 boot-installer.xml:658 boot-installer.xml:1197
+#: boot-installer.xml:1688 boot-installer.xml:1797
+#, no-c-format
 msgid ""
 "Older systems such as the 715 might require the use of an RBOOT server "
 "instead of a BOOTP server."
@@ -90,13 +84,10 @@ msgstr ""
 "Hệ thống cũ hơn như 715 có thể cần thiết bạn dùng máy phục vụ kiểu RBOOT "
 "thay cho BOOTP."
 
-#: boot-installer.xml:53
-#: boot-installer.xml:663
-#: boot-installer.xml:1202
-#: boot-installer.xml:1693
-#: boot-installer.xml:1802
-#, no-c-format
 #. Tag: para
+#: boot-installer.xml:53 boot-installer.xml:663 boot-installer.xml:1202
+#: boot-installer.xml:1693 boot-installer.xml:1802
+#, no-c-format
 msgid ""
 "The installation method to support network booting is described in <xref "
 "linkend=\"install-tftp\"/>."
@@ -104,25 +95,16 @@ msgstr ""
 "Phương pháp cài đặt để hỗ trợ khả năng khởi động qua mạng được diễn tả trong "
 "<xref linkend=\"install-tftp\"/>."
 
+#. Tag: title
 #: boot-installer.xml:64
 #, no-c-format
-#. Tag: title
 msgid "Booting from CD-ROM"
 msgstr "Khởi động từ đĩa CD-ROM"
 
-#: boot-installer.xml:70
-#: boot-installer.xml:340
-#: boot-installer.xml:811
-#: boot-installer.xml:1469
-#: boot-installer.xml:1831
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "The easiest route for most people will be to use a set of Debian CDs. If "
-#| "you have a CD set, and if your machine supports booting directly off the "
-#| "CD, great! Simply <phrase arch=\"x86\"> configure your system for booting "
-#| "off a CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> "
-#| "insert your CD, reboot, and proceed to the next chapter."
+#: boot-installer.xml:70 boot-installer.xml:340 boot-installer.xml:811
+#: boot-installer.xml:1469 boot-installer.xml:1831
+#, no-c-format
 msgid ""
 "The easiest route for most people will be to use a set of &debian; CDs. If "
 "you have a CD set, and if your machine supports booting directly off the CD, "
@@ -130,15 +112,17 @@ msgid ""
 "CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> insert "
 "your CD, reboot, and proceed to the next chapter."
 msgstr ""
-"Phương pháp dễ nhất cho phần lớn các người là sử dụng một bộ đĩa CD &debian;. Nếu bạn có một bộ đĩa CD như vậy, và nếu máy tính của bạn có hỗ trợ chức năng khởi động trực tiếp từ đĩa CD, hay quá ! Đơn giản hãy <phrase arch=\"x86\"> cấu hình hệ thống để khởi động từ đĩa CD, như được diễn tả trong <xref linkend=\"boot-dev-select\"/>, </phrase> nạp đĩa CD, khởi động lại, và đi đến chương kế tiếp."
+"Phương pháp dễ nhất cho phần lớn các người là sử dụng một bộ đĩa CD "
+"&debian;. Nếu bạn có một bộ đĩa CD như vậy, và nếu máy tính của bạn có hỗ "
+"trợ chức năng khởi động trực tiếp từ đĩa CD, hay quá ! Đơn giản hãy <phrase "
+"arch=\"x86\"> cấu hình hệ thống để khởi động từ đĩa CD, như được diễn tả "
+"trong <xref linkend=\"boot-dev-select\"/>, </phrase> nạp đĩa CD, khởi động "
+"lại, và đi đến chương kế tiếp."
 
-#: boot-installer.xml:81
-#: boot-installer.xml:351
-#: boot-installer.xml:822
-#: boot-installer.xml:1480
-#: boot-installer.xml:1842
-#, no-c-format
 #. Tag: para
+#: boot-installer.xml:81 boot-installer.xml:351 boot-installer.xml:822
+#: boot-installer.xml:1480 boot-installer.xml:1842
+#, no-c-format
 msgid ""
 "Note that certain CD drives may require special drivers, and thus be "
 "inaccessible in the early installation stages. If it turns out the standard "
@@ -152,19 +136,10 @@ msgstr ""
 "hãy xem lại chương này và đọc về hạt nhân xen kẽ và phương pháp cài đặt có "
 "thể là thích hợp hơn."
 
-#: boot-installer.xml:89
-#: boot-installer.xml:359
-#: boot-installer.xml:830
-#: boot-installer.xml:1488
-#: boot-installer.xml:1850
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Even if you cannot boot from CD-ROM, you can probably install the Debian "
-#| "system components and any packages you want from CD-ROM. Simply boot "
-#| "using a different media, such as floppies. When it's time to install the "
-#| "operating system, base system, and any additional packages, point the "
-#| "installation system at the CD-ROM drive."
+#: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
+#: boot-installer.xml:1488 boot-installer.xml:1850
+#, no-c-format
 msgid ""
 "Even if you cannot boot from CD-ROM, you can probably install the &debian; "
 "system components and any packages you want from CD-ROM. Simply boot using a "
@@ -172,30 +147,31 @@ msgid ""
 "system, base system, and any additional packages, point the installation "
 "system at the CD-ROM drive."
 msgstr ""
-"Thậm chí nếu bạn không thể khởi động từ đĩa CD-ROM, bình thường bạn có khả năng cài đặt từ đĩa CD-ROM các thành phần của hệ thống &debian; và gói phần mềm bổ sung nào đã muốn. Đơn giản hãy khởi động bằng một vật chứa khác, như đĩa mềm. Vào lúc nên cài đặt hệ điều hành, hệ thống cơ bản và gói phần mềm bổ sung nào, hãy chỉ hệ thống cài đặt tới ổ đĩa CD-ROM."
+"Thậm chí nếu bạn không thể khởi động từ đĩa CD-ROM, bình thường bạn có khả "
+"năng cài đặt từ đĩa CD-ROM các thành phần của hệ thống &debian; và gói phần "
+"mềm bổ sung nào đã muốn. Đơn giản hãy khởi động bằng một vật chứa khác, như "
+"đĩa mềm. Vào lúc nên cài đặt hệ điều hành, hệ thống cơ bản và gói phần mềm "
+"bổ sung nào, hãy chỉ hệ thống cài đặt tới ổ đĩa CD-ROM."
 
-#: boot-installer.xml:97
-#: boot-installer.xml:367
-#: boot-installer.xml:838
-#: boot-installer.xml:1496
-#: boot-installer.xml:1858
-#, no-c-format
 #. Tag: para
+#: boot-installer.xml:97 boot-installer.xml:367 boot-installer.xml:838
+#: boot-installer.xml:1496 boot-installer.xml:1858
+#, no-c-format
 msgid ""
 "If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
 msgstr ""
 "Nếu bạn gặp khó khăn trong việc khởi động, xem <xref linkend=\"boot-"
 "troubleshooting\"/>."
 
+#. Tag: title
 #: boot-installer.xml:107
 #, no-c-format
-#. Tag: title
 msgid "Booting from Firmware"
 msgstr "Khởi động từ phần vững"
 
+#. Tag: para
 #: boot-installer.xml:113
 #, no-c-format
-#. Tag: para
 msgid ""
 "There is an increasing number of consumer devices that directly boot from a "
 "flash chip on the device. The installer can be written to flash so it will "
@@ -205,9 +181,9 @@ msgstr ""
 "phiến tinh thể cực nhanh trên thiết bị đó. Bộ cài đặt có thể được ghi vào "
 "cực nhanh, để khởi chạy tự động khi bạn khởi đông lại máy."
 
+#. Tag: para
 #: boot-installer.xml:119
 #, no-c-format
-#. Tag: para
 msgid ""
 "In many cases, changing the firmware of an embedded device voids your "
 "warranty. Sometimes you are also not able to recover your device if there "
@@ -218,27 +194,27 @@ msgstr ""
 "bảo hành. Đôi khi bạn cũng không thể phục hồi thiết bị nếu gặp khó khăn "
 "trong việc chớp. Vì vậy, hãy cẩn thận và theo những bước một cách chính xác."
 
+#. Tag: title
 #: boot-installer.xml:130
 #, no-c-format
-#. Tag: title
 msgid "Booting the NSLU2"
 msgstr "Khởi động NSLU2"
 
+#. Tag: para
 #: boot-installer.xml:131
 #, no-c-format
-#. Tag: para
 msgid "There are three ways how to put the installer firmware into flash:"
 msgstr "Có ba phương pháp chèn phần vững cài đặt vào bộ nhớ cực nhanh:"
 
+#. Tag: title
 #: boot-installer.xml:137
 #, no-c-format
-#. Tag: title
 msgid "Using the NSLU2 web interface"
 msgstr "Dùng giao diện Mạng của NSLU2"
 
+#. Tag: para
 #: boot-installer.xml:138
 #, no-c-format
-#. Tag: para
 msgid ""
 "Go to the administration section and choose the menu item <literal>Upgrade</"
 "literal>. You can then browse your disk for the installer image you have "
@@ -252,39 +228,15 @@ msgstr ""
 "nâng cấp), xác nhận, đợi vài phút rồi xác nhận lần nữa. Sau đó, hệ thống sẽ "
 "khởi động trực tiếp vào trình cài đặt."
 
+#. Tag: title
 #: boot-installer.xml:149
 #, no-c-format
-#. Tag: title
 msgid "Via the network using Linux/Unix"
 msgstr "Qua mạng bằng Linux/UNIX"
 
+#. Tag: para
 #: boot-installer.xml:150
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "You can use <command>upslug2</command> from any Linux or Unix machine to "
-#| "upgrade the machine via the network. This software is packaged for "
-#| "Debian. First, you have to put your NSLU2 in upgrade mode: <orderedlist> "
-#| "<listitem><para> Disconnect any disks and/or devices from the USB ports. "
-#| "</para></listitem> <listitem><para> Power off the NSLU2 </para></"
-#| "listitem> <listitem><para> Press and hold the reset button (accessible "
-#| "through the small hole on the back just above the power input). </para></"
-#| "listitem> <listitem><para> Press and release the power button to power on "
-#| "the NSLU2. </para></listitem> <listitem><para> Wait for 10 seconds "
-#| "watching the ready/status LED. After 10 seconds it will change from amber "
-#| "to red. Immediately release the reset button. </para></listitem> "
-#| "<listitem><para> The NSLU2 ready/status LED will flash alternately red/"
-#| "green (there is a 1 second delay before the first green). The NSLU2 is "
-#| "now in upgrade mode. </para></listitem> </orderedlist> See the <ulink url="
-#| "\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux "
-#| "pages</ulink> if you have problems with this. Once your NSLU2 is in "
-#| "upgrade mode, you can flash the new image: <informalexample><screen>\n"
-#| "sudo upslug2 -i di-nslu2.bin\n"
-#| "</screen></informalexample> Note that the tool also shows the MAC address "
-#| "of your NSLU2, which may come in handy to configure your DHCP server. "
-#| "After the whole image has been written and verified, the system will "
-#| "automatically reboot. Make sure you connect your USB disk again now, "
-#| "otherwise the installer won't be able to find it."
 msgid ""
 "You can use <command>upslug2</command> from any Linux or Unix machine to "
 "upgrade the machine via the network. This software is packaged for &debian;. "
@@ -310,26 +262,39 @@ msgid ""
 "reboot. Make sure you connect your USB disk again now, otherwise the "
 "installer won't be able to find it."
 msgstr ""
-"Để nâng cấp máy tính qua mạng thì bạn cũng có thể sử dụng công cụ <command>upslug2</command> tự bất cứ máy tính Linux hay Unix nào. Công cụ này được đóng gói cho &debian;. Trước tiên bạn cần phải lập NSLU2 thành chế độ nâng cấp: <orderedlist> "
-"<listitem><para> Tháo gắn kết bất cứ đĩa và/hay thiết bị ra cổng USB. </"
-"para></listitem> <listitem><para> Tắt điện của NSLU2 </para></listitem> "
-"<listitem><para> Ấn giữ nút đặt lại (truy cập được qua rỗ nhỏ trong mặt sau, đúng bên trên cổng điện năng vào). Cứ ấn giữ nút này đến dấu XXX bên dưới.</para></listitem> "
-"<listitem><para> Bấm và buông nút điện năng để mở điện của NSLU2.</"
-"para></listitem> <listitem><para> Đợi trong khoảng 10 giây, cũng theo dõi đèn LED trạng thái/sẵn sàng. Sau 10 giây, đèn này thay đổi từ màu vàng sang màu đỏ. XXX: ngay lập tức buông nút đặt lại. </para></listitem> <listitem><para> Đèn LED trạng thái/sẵn sàng NSLU2 thì chớp xen kẽ màu đỏ/lục (có một khoảng đợi một giây trước khi thấy màu lục đầu tiên). Lúc đó, NSLU2 đã vào chế độ nâng cấp. </para></"
-"listitem> </orderedlist> Gặp vấn đề thì xem các <ulink url=\"http://www.nslu2-linux.org/"
-"wiki/OpenSlug/UsingTheBinary\">trang NSLU2-Linux</ulink>. Một khi NSLU2 vào chế độ nâng cấp, bạn có thể chép ra ảnh mới: <informalexample><screen>\n"
+"Để nâng cấp máy tính qua mạng thì bạn cũng có thể sử dụng công cụ "
+"<command>upslug2</command> tự bất cứ máy tính Linux hay Unix nào. Công cụ "
+"này được đóng gói cho &debian;. Trước tiên bạn cần phải lập NSLU2 thành chế "
+"độ nâng cấp: <orderedlist> <listitem><para> Tháo gắn kết bất cứ đĩa và/hay "
+"thiết bị ra cổng USB. </para></listitem> <listitem><para> Tắt điện của NSLU2 "
+"</para></listitem> <listitem><para> Ấn giữ nút đặt lại (truy cập được qua rỗ "
+"nhỏ trong mặt sau, đúng bên trên cổng điện năng vào). Cứ ấn giữ nút này đến "
+"dấu XXX bên dưới.</para></listitem> <listitem><para> Bấm và buông nút điện "
+"năng để mở điện của NSLU2.</para></listitem> <listitem><para> Đợi trong "
+"khoảng 10 giây, cũng theo dõi đèn LED trạng thái/sẵn sàng. Sau 10 giây, đèn "
+"này thay đổi từ màu vàng sang màu đỏ. XXX: ngay lập tức buông nút đặt lại. </"
+"para></listitem> <listitem><para> Đèn LED trạng thái/sẵn sàng NSLU2 thì chớp "
+"xen kẽ màu đỏ/lục (có một khoảng đợi một giây trước khi thấy màu lục đầu "
+"tiên). Lúc đó, NSLU2 đã vào chế độ nâng cấp. </para></listitem> </"
+"orderedlist> Gặp vấn đề thì xem các <ulink url=\"http://www.nslu2-linux.org/"
+"wiki/OpenSlug/UsingTheBinary\">trang NSLU2-Linux</ulink>. Một khi NSLU2 vào "
+"chế độ nâng cấp, bạn có thể chép ra ảnh mới: <informalexample><screen>\n"
 "sudo upslug2 -i di-nslu2.bin\n"
-"</screen></informalexample> Ghi chú rằng công cụ này cũng hiển thị địa chỉ MAC (địa chỉ phần cứng riêng) của NSLU2 của bạn: thông tin này có thể hữu ích để cấu hình trình phục vụ DHCP. Một khi ghi nhớ và thẩm tra toàn bộ ảnh thì hệ thống tự động khởi động lại. Đảm bảo rằng bạn kết nối lại đĩa USB: không thì trình cài đặt không tìm thấy."
+"</screen></informalexample> Ghi chú rằng công cụ này cũng hiển thị địa chỉ "
+"MAC (địa chỉ phần cứng riêng) của NSLU2 của bạn: thông tin này có thể hữu "
+"ích để cấu hình trình phục vụ DHCP. Một khi ghi nhớ và thẩm tra toàn bộ ảnh "
+"thì hệ thống tự động khởi động lại. Đảm bảo rằng bạn kết nối lại đĩa USB: "
+"không thì trình cài đặt không tìm thấy."
 
+#. Tag: title
 #: boot-installer.xml:211
 #, no-c-format
-#. Tag: title
 msgid "Via the network using Windows"
 msgstr "Qua mạng bằng Windows"
 
+#. Tag: para
 #: boot-installer.xml:212
 #, no-c-format
-#. Tag: para
 msgid ""
 "There is <ulink url=\"http://www.everbesthk.com/8-download/sercomm/firmware/"
 "all_router_utility.zip\">a tool</ulink> for Windows to upgrade the firmware "
@@ -339,15 +304,15 @@ msgstr ""
 "all_router_utility.zip\">công cụ</ulink> Windows để nâng cấp phần vững qua "
 "mạng."
 
+#. Tag: title
 #: boot-installer.xml:223
 #, no-c-format
-#. Tag: title
 msgid "Booting the SS4000-E"
 msgstr "Khởi động SS4000-E"
 
+#. Tag: para
 #: boot-installer.xml:224
 #, no-c-format
-#. Tag: para
 msgid ""
 "Due to limitations in the SS4000-E firmware, it unfortunately is not "
 "possible to boot the installer without the use of a serial port at this "
@@ -367,17 +332,9 @@ msgstr ""
 "cuối đó<footnote id=\"arm-s4k-rib\"><para>Cáp này thường nằm trong máy tính "
 "để bàn cũ có cổng nối tiếp 9 đầu.</para> </footnote>."
 
+#. Tag: para
 #: boot-installer.xml:245
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "To boot the SS4000-E, use your serial nullmodem cable and the ribbon "
-#| "cable to connect to the serial port of the SS4000-E, and reboot the "
-#| "machine. You need to use a serial terminal application to communicate "
-#| "with the machine; a good option on a Debian GNU/Linux is to use the "
-#| "<command>cu</command> program, in the package of the same name. Assuming "
-#| "the serial port on your computer is to be found on <filename>/dev/ttyS0</"
-#| "filename>, use the following command line:"
 msgid ""
 "To boot the SS4000-E, use your serial nullmodem cable and the ribbon cable "
 "to connect to the serial port of the SS4000-E, and reboot the machine. You "
@@ -387,17 +344,23 @@ msgid ""
 "computer is to be found on <filename>/dev/ttyS0</filename>, use the "
 "following command line:"
 msgstr ""
-"Để khởi động máy SS4000-E, hãy sử dụng cáp nullmodem nối tiếp và cáp dải băng để kết nối đến cổng nối tiếp của máy SS4000-E, sau đó khởi động lại máy tính. Bạn cần phải sử dụng một ứng dụng thiết bị cuối kiểu nối tiếp để liên lạc với máy đó ; một sự chọn có ích trong &debian;/GNU Linux là sử dụng chương trình <command>cu</command> (nằm trong gói cùng tên). Giả sử là cổng nối tiếp trên máy tính nằm ở <filename>/dev/ttyS0</filename> thì dùng dòng lệnh theo đây:"
+"Để khởi động máy SS4000-E, hãy sử dụng cáp nullmodem nối tiếp và cáp dải "
+"băng để kết nối đến cổng nối tiếp của máy SS4000-E, sau đó khởi động lại máy "
+"tính. Bạn cần phải sử dụng một ứng dụng thiết bị cuối kiểu nối tiếp để liên "
+"lạc với máy đó ; một sự chọn có ích trong &debian;/GNU Linux là sử dụng "
+"chương trình <command>cu</command> (nằm trong gói cùng tên). Giả sử là cổng "
+"nối tiếp trên máy tính nằm ở <filename>/dev/ttyS0</filename> thì dùng dòng "
+"lệnh theo đây:"
 
+#. Tag: screen
 #: boot-installer.xml:257
 #, no-c-format
-#. Tag: screen
 msgid "cu -lttyS0 -s115200"
 msgstr "cu -lttyS0 -s115200"
 
+#. Tag: para
 #: boot-installer.xml:259
 #, no-c-format
-#. Tag: para
 msgid ""
 "If using Windows, you may want to consider using the program "
 "<classname>hyperterminal</classname>. Use a baud rate of 115200, 8 bits word "
@@ -407,15 +370,15 @@ msgstr ""
 "<classname>hyperterminal</classname>. Hãy lập một tỷ lệ baud 115200, chiều "
 "dài từ 8 bit, không có bit dừng, và một bit tính chẵn lẻ."
 
+#. Tag: para
 #: boot-installer.xml:265
 #, no-c-format
-#. Tag: para
 msgid "When the machine boots, you will see the following line of output:"
 msgstr "Khi máy khởi động thì bạn thấy dòng kết xuất theo đây:"
 
+#. Tag: screen
 #: boot-installer.xml:271
 #, no-c-format
-#. Tag: screen
 msgid ""
 "No network interfaces found\n"
 "\n"
@@ -427,9 +390,9 @@ msgstr ""
 "EM-7210 pb T04 2005-12-12 (Đối với ver.AA)\n"
 "== Sắp thực hiện văn lệnh khởi động (trong vòng 1.000 giây) — gõ ^C để hủy bỏ"
 
+#. Tag: para
 #: boot-installer.xml:273
 #, no-c-format
-#. Tag: para
 msgid ""
 "At this point, hit Control-C to interrupt the boot loader<footnote id=\"arm-"
 "s4ke-sec\"> <para> Note that you have only one second to do so; if you miss "
@@ -443,9 +406,9 @@ msgstr ""
 "lệnh theo đây:"
 
 # Nghĩa chữ
+#. Tag: screen
 #: boot-installer.xml:286
 #, no-c-format
-#. Tag: screen
 msgid ""
 "load -v -r -b 0x01800000 -m ymodem ramdisk.gz\n"
 "load -v -r -b 0x01008000 -m ymodem zImage\n"
@@ -457,9 +420,9 @@ msgstr ""
 "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
 "0x01800000"
 
+#. Tag: para
 #: boot-installer.xml:288
 #, no-c-format
-#. Tag: para
 msgid ""
 "After every <command>load</command> command, the system will expect a file "
 "to be transmitted using the YMODEM protocol. When using cu, make sure you "
@@ -475,9 +438,9 @@ msgstr ""
 "chương trình bên ngoài, và chạy câu lệnh <command>sb initrd.gz</command> "
 "hoặc <command>sb vmlinuz</command>."
 
+#. Tag: para
 #: boot-installer.xml:297
 #, no-c-format
-#. Tag: para
 msgid ""
 "Alternatively, it is possible to load the kernel and ramdisk using HTTP "
 "rather than YMODEM. This is faster, but requires a working HTTP server on "
@@ -489,9 +452,9 @@ msgstr ""
 "độ RAM:"
 
 # Nghĩa chữ
+#. Tag: screen
 #: boot-installer.xml:303
 #, no-c-format
-#. Tag: screen
 msgid ""
 "fis load rammode\n"
 "g"
@@ -499,9 +462,9 @@ msgstr ""
 "fis load rammode\n"
 "g"
 
+#. Tag: para
 #: boot-installer.xml:305
 #, no-c-format
-#. Tag: para
 msgid ""
 "This will seemingly restart the machine; but in reality, it loads reboot to "
 "RAM and restarts it from there. Not doing this step will cause the system to "
@@ -511,9 +474,9 @@ msgstr ""
 "động lại vào vùng nhớ RAM và khởi động nó từ đó. Không làm bước này thì gây "
 "ra hệ thống treo cứng trong bước địa chỉ IP cần thiết mà theo sau."
 
+#. Tag: para
 #: boot-installer.xml:311
 #, no-c-format
-#. Tag: para
 msgid ""
 "You will need to hit Ctrl-C again to interrupt the boot. Then: "
 "<informalexample><screen>\n"
@@ -541,30 +504,28 @@ msgstr ""
 "<replaceable>192.168.2.4</replaceable> là địa chỉ IP của máy phục vụ HTTP "
 "chứa hạt nhân và các tập tin đĩa RAM."
 
+#. Tag: para
 #: boot-installer.xml:321
 #, no-c-format
-#. Tag: para
 msgid "The installer will now start as usual."
 msgstr "Vậy trình cài đặt khởi chạy như bình thường."
 
-#: boot-installer.xml:334
-#: boot-installer.xml:805
-#: boot-installer.xml:1463
+#. Tag: title
+#: boot-installer.xml:334 boot-installer.xml:805 boot-installer.xml:1463
 #: boot-installer.xml:1825
 #, no-c-format
-#. Tag: title
 msgid "Booting from a CD-ROM"
 msgstr "Khởi động từ đĩa CD-ROM"
 
+#. Tag: title
 #: boot-installer.xml:441
 #, no-c-format
-#. Tag: title
 msgid "Booting from Windows"
 msgstr "Khởi động từ Windows"
 
+#. Tag: para
 #: boot-installer.xml:442
 #, no-c-format
-#. Tag: para
 msgid ""
 "To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM or "
 "USB memory stick installation media as described in <xref linkend=\"official-"
@@ -574,9 +535,9 @@ msgstr ""
 "DVD hoặc thanh USB chứa phần mềm cài đặt như được diễn tả trong <xref "
 "linkend=\"official-cdrom\"/> và <xref linkend=\"boot-usb-files\"/>."
 
+#. Tag: para
 #: boot-installer.xml:448
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you use an installation CD or DVD, a pre-installation program should be "
 "launched automatically when you insert the disc. In case Windows does not "
@@ -590,9 +551,9 @@ msgstr ""
 "nó bằng tay, bằng cách truy cập đến thiết bị, rồi thực hiện câu lệnh "
 "<command>setup.exe</command>."
 
+#. Tag: para
 #: boot-installer.xml:456
 #, no-c-format
-#. Tag: para
 msgid ""
 "After the program has been started, a few preliminary questions will be "
 "asked and the system will be prepared to start the &debian-gnu; installer."
@@ -600,24 +561,25 @@ msgstr ""
 "Một khi khởi chạy chương trình đó, vài câu mở đầu sẽ được hỏi để chuẩn bị hệ "
 "thống để khởi chạy tiến trình cài đặt &debian-gnu;."
 
+#. Tag: title
 #: boot-installer.xml:465
 #, no-c-format
-#. Tag: title
-#| msgid "Booting from CD-ROM"
 msgid "Booting from DOS"
 msgstr "Khởi động từ DOS"
 
+#. Tag: para
 #: boot-installer.xml:466
 #, no-c-format
-#. Tag: para
 msgid ""
 "Boot into DOS (not Windows). To do this, you can for instance boot from a "
 "recovery or diagnostic disk."
-msgstr "Khởi động vào DOS (không phải Windows). Chẳng hạn, bạn có thể khởi động từ một đĩa phục hồi hay địa chẩn đoán."
+msgstr ""
+"Khởi động vào DOS (không phải Windows). Chẳng hạn, bạn có thể khởi động từ "
+"một đĩa phục hồi hay địa chẩn đoán."
 
+#. Tag: para
 #: boot-installer.xml:471
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you can access the installation CD, change the current drive to the CD-"
 "ROM drive, e.g. <informalexample><screen>\n"
@@ -625,13 +587,17 @@ msgid ""
 "</screen></informalexample> else make sure you have first prepared your hard "
 "disk as explained in <xref linkend=\"files-loadlin\"/>, and change the "
 "current drive to it if needed."
-msgstr "Nếu bạn có truy cập đến đĩa CD cài đặt thì chuyển đổi ổ hiện thời sang ổ đĩa CD-ROM, v.d. <informalexample><screen>\n"
+msgstr ""
+"Nếu bạn có truy cập đến đĩa CD cài đặt thì chuyển đổi ổ hiện thời sang ổ đĩa "
+"CD-ROM, v.d. <informalexample><screen>\n"
 "d:\n"
-"</screen></informalexample> không thì kiểm tra lại bạn đã chuẩn bị đĩa cứng như diễn tả trong <xref linkend=\"files-loadlin\"/>, sau đó chuyển đổi ổ hiện thời nếu cần thiết."
+"</screen></informalexample> không thì kiểm tra lại bạn đã chuẩn bị đĩa cứng "
+"như diễn tả trong <xref linkend=\"files-loadlin\"/>, sau đó chuyển đổi ổ "
+"hiện thời nếu cần thiết."
 
+#. Tag: para
 #: boot-installer.xml:481
 #, no-c-format
-#. Tag: para
 msgid ""
 "Enter the subdirectory for the flavor you chose, e.g., "
 "<informalexample><screen>\n"
@@ -641,25 +607,26 @@ msgid ""
 "cd gtk\n"
 "</screen></informalexample> Next, execute <command>install.bat</command>. "
 "The kernel will load and launch the installer system."
-msgstr "Vào thư mục con của mủi vị đã chọn, v.d."
-"<informalexample><screen>\n"
+msgstr ""
+"Vào thư mục con của mủi vị đã chọn, v.d.<informalexample><screen>\n"
 "cd \\&x86-install-dir;\n"
-"</screen></informalexample> Thích sử dụng trình cài đặt đồ họa hơn thì vào thư mục con <filename>gtk</filename>. <informalexample><screen>\n"
+"</screen></informalexample> Thích sử dụng trình cài đặt đồ họa hơn thì vào "
+"thư mục con <filename>gtk</filename>. <informalexample><screen>\n"
 "cd gtk\n"
-"</screen></informalexample> Sau đó, thực hiện tập tin <command>install.bat</command>. "
-"Việc này nạp hạt nhân và khởi chạy hệ thống cài đặt."
+"</screen></informalexample> Sau đó, thực hiện tập tin <command>install.bat</"
+"command>. Việc này nạp hạt nhân và khởi chạy hệ thống cài đặt."
 
+#. Tag: title
 #: boot-installer.xml:499
 #, no-c-format
-#. Tag: title
 msgid ""
 "Booting from Linux Using <command>LILO</command> or <command>GRUB</command>"
 msgstr ""
 "Khởi động từ Linux bằng <command>LILO</command> hay <command>GRUB</command>"
 
+#. Tag: para
 #: boot-installer.xml:502
 #, no-c-format
-#. Tag: para
 msgid ""
 "To boot the installer from hard disk, you must first download and place the "
 "needed files as described in <xref linkend=\"boot-drive-files\"/>."
@@ -668,9 +635,9 @@ msgstr ""
 "các tập tin cần thiết, như được diễn tả trong <xref linkend=\"boot-drive-"
 "files\"/>."
 
+#. Tag: para
 #: boot-installer.xml:507
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you intend to use the hard drive only for booting and then download "
 "everything over the network, you should download the <filename>netboot/"
@@ -686,9 +653,9 @@ msgstr ""
 "vùng lại đĩa cứng nơi bạn khởi động bộ cài đặt, dù bạn nên làm như thế một "
 "cách cẩn thận."
 
+#. Tag: para
 #: boot-installer.xml:517
 #, no-c-format
-#. Tag: para
 msgid ""
 "Alternatively, if you intend to keep an existing partition on the hard drive "
 "unchanged during the install, you can download the <filename>hd-media/initrd."
@@ -704,9 +671,9 @@ msgstr ""
 "Trình cài đặt thì có khả năng khởi động từ ổ đĩa và cài đặt từ ảnh đĩa CD/"
 "DVD mà không cần chạy mạng."
 
+#. Tag: para
 #: boot-installer.xml:526
 #, no-c-format
-#. Tag: para
 msgid ""
 "For <command>LILO</command>, you will need to configure two essential things "
 "in <filename>/etc/lilo.conf</filename>: <itemizedlist> <listitem><para> to "
@@ -724,9 +691,9 @@ msgstr ""
 "filename>:"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: boot-installer.xml:547
 #, no-c-format
-#. Tag: screen
 msgid ""
 "image=/boot/newinstall/vmlinuz\n"
 "       label=newinstall\n"
@@ -736,9 +703,9 @@ msgstr ""
 "       label=newinstall\n"
 "       initrd=/boot/newinstall/initrd.gz"
 
+#. Tag: para
 #: boot-installer.xml:547
 #, no-c-format
-#. Tag: para
 msgid ""
 "For more details, refer to the <citerefentry><refentrytitle>initrd</"
 "refentrytitle> <manvolnum>4</manvolnum></citerefentry> and "
@@ -752,9 +719,9 @@ msgstr ""
 "refentrytitle> <manvolnum>5</manvolnum></citerefentry>. Bây giờ hãy chạy "
 "<userinput>lilo</userinput> rồi khởi động lại."
 
+#. Tag: para
 #: boot-installer.xml:556
 #, no-c-format
-#. Tag: para
 msgid ""
 "The procedure for <command>GRUB</command> is quite similar. Locate your "
 "<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> "
@@ -770,9 +737,9 @@ msgstr ""
 "thống):"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: boot-installer.xml:564
 #, no-c-format
-#. Tag: screen
 msgid ""
 "title  New Install\n"
 "root   (hd0,0)\n"
@@ -784,9 +751,9 @@ msgstr ""
 "kernel /boot/newinstall/vmlinuz\n"
 "initrd /boot/newinstall/initrd.gz"
 
+#. Tag: para
 #: boot-installer.xml:566
 #, no-c-format
-#. Tag: para
 msgid ""
 "From here on, there should be no difference between <command>GRUB</command> "
 "or <command>LILO</command>."
@@ -794,15 +761,15 @@ msgstr ""
 "Kể từ thời điểm này, không nên có sự khác nhau giữa tiến trình "
 "<command>GRUB</command> và <command>LILO</command>."
 
+#. Tag: title
 #: boot-installer.xml:575
 #, no-c-format
-#. Tag: title
 msgid "Booting from USB Memory Stick"
 msgstr "Khởi động từ thanh bộ nhớ USB"
 
+#. Tag: para
 #: boot-installer.xml:576
 #, no-c-format
-#. Tag: para
 msgid ""
 "Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
 "select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB "
@@ -816,17 +783,15 @@ msgstr ""
 "được, và bạn nên thấy dấu nhắc <prompt>boot:</prompt>. Vào đó bạn có thể "
 "nhập các đối số khởi động tùy chọn, hoặc chỉ bấm phím &enterkey;."
 
-#: boot-installer.xml:589
-#: boot-installer.xml:1732
-#, no-c-format
 #. Tag: title
+#: boot-installer.xml:589 boot-installer.xml:1732
+#, no-c-format
 msgid "Booting from Floppies"
 msgstr "Khởi động từ đĩa mềm"
 
-#: boot-installer.xml:590
-#: boot-installer.xml:1740
-#, no-c-format
 #. Tag: para
+#: boot-installer.xml:590 boot-installer.xml:1740
+#, no-c-format
 msgid ""
 "You will have already downloaded the floppy images you needed and created "
 "floppies from the images in <xref linkend=\"create-floppy\"/>."
@@ -834,9 +799,9 @@ msgstr ""
 "Trong bước <xref linkend=\"create-floppy\"/>, bạn đã tải về các ảnh đĩa mềm "
 "cần thiết và tạo đĩa mềm từ ảnh đó."
 
+#. Tag: para
 #: boot-installer.xml:597
 #, no-c-format
-#. Tag: para
 msgid ""
 "To boot from the installer boot floppy, place it in the primary floppy "
 "drive, shut down the system as you normally would, then turn it back on."
@@ -844,9 +809,9 @@ msgstr ""
 "Để khởi động từ đĩa mềm khởi động trình cài đặt, hãy nạp nó vào ổ đĩa mềm "
 "chính, tắt hệ thống một cách bình thường, rồi mở nó lần nữa."
 
+#. Tag: para
 #: boot-installer.xml:603
 #, no-c-format
-#. Tag: para
 msgid ""
 "For installing from an LS-120 drive (ATAPI version) with a set of floppies, "
 "you need to specify the virtual location for the floppy device. This is done "
@@ -863,9 +828,9 @@ msgstr ""
 "thứ hai, bạn hãy nhập lệnh <userinput>install root=/dev/hdc</userinput> ở "
 "dấu nhắc khởi động."
 
+#. Tag: para
 #: boot-installer.xml:613
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that on some machines, <keycombo><keycap>Control</keycap> <keycap>Alt</"
 "keycap> <keycap>Delete</keycap></keycombo> does not properly reset the "
@@ -880,9 +845,9 @@ msgstr ""
 "đó), bạn không thể chọn khác. Nếu không, hãy khởi động lại cứng khi khởi "
 "động máy."
 
+#. Tag: para
 #: boot-installer.xml:622
 #, no-c-format
-#. Tag: para
 msgid ""
 "The floppy disk will be accessed, and you should then see a screen that "
 "introduces the boot floppy and ends with the <prompt>boot:</prompt> prompt."
@@ -890,9 +855,9 @@ msgstr ""
 "Lúc đó, đĩa mềm sẽ được truy cập, vậy bạn nên thấy màn hình giới thiệu đĩa "
 "mềm khởi động mà kết thúc bằng dấu nhắc khởi động <prompt>boot:</prompt>."
 
+#. Tag: para
 #: boot-installer.xml:628
 #, no-c-format
-#. Tag: para
 msgid ""
 "Once you press &enterkey;, you should see the message "
 "<computeroutput>Loading...</computeroutput>, followed by "
@@ -908,9 +873,9 @@ msgstr ""
 "thống đó. Thông tin thêm về giải đoạn này của tiến trình khởi động nằm bên "
 "dưới trong <xref linkend=\"kernel-msgs\"/>."
 
+#. Tag: para
 #: boot-installer.xml:637
 #, no-c-format
-#. Tag: para
 msgid ""
 "After booting from the boot floppy, the root floppy is requested. Insert the "
 "root floppy and press &enterkey;, and the contents are loaded into memory. "
@@ -922,32 +887,28 @@ msgstr ""
 "nhớ. Chương trình cài đặt <command>debian-installer</command> được khởi chạy "
 "tự động."
 
-#: boot-installer.xml:647
-#: boot-installer.xml:1174
-#: boot-installer.xml:1315
-#: boot-installer.xml:1369
-#: boot-installer.xml:1677
-#: boot-installer.xml:1786
-#, no-c-format
 #. Tag: title
+#: boot-installer.xml:647 boot-installer.xml:1174 boot-installer.xml:1315
+#: boot-installer.xml:1369 boot-installer.xml:1677 boot-installer.xml:1786
+#, no-c-format
 msgid "Booting with TFTP"
 msgstr "Khởi động bằng TFTP"
 
+#. Tag: para
 #: boot-installer.xml:671
 #, no-c-format
-#. Tag: para
 msgid "There are various ways to do a TFTP boot on i386."
 msgstr "Có vài cách khác nhau để khởi động qua TFTP trên i386."
 
+#. Tag: title
 #: boot-installer.xml:677
 #, no-c-format
-#. Tag: title
 msgid "NIC or Motherboard that support PXE"
 msgstr "NIC hay bo mạch chủ có hỗ trợ PXE"
 
+#. Tag: para
 #: boot-installer.xml:678
 #, no-c-format
-#. Tag: para
 msgid ""
 "It could be that your Network Interface Card or Motherboard provides PXE "
 "boot functionality. This is a <trademark class=\"trade\">Intel</trademark> "
@@ -959,24 +920,24 @@ msgstr ""
 "của công ty <trademark class=\"trade\">Intel</trademark>. Nếu máy bạn có "
 "chức năng này, có lẽ bạn có khả năng cấu hình BIOS để khởi động qua mạng."
 
+#. Tag: title
 #: boot-installer.xml:689
 #, no-c-format
-#. Tag: title
 msgid "NIC with Network BootROM"
 msgstr "NIC với BootROM mạng"
 
+#. Tag: para
 #: boot-installer.xml:690
 #, no-c-format
-#. Tag: para
 msgid ""
 "It could be that your Network Interface Card provides TFTP boot "
 "functionality."
 msgstr ""
 "Có lẽ thẻ giao diện mạng (NIC) của bạn cung cấp chức năng khởi động qua TFTP."
 
+#. Tag: para
 #: boot-installer.xml:695
 #, no-c-format
-#. Tag: para
 msgid ""
 "Let us (<email>&email-debian-boot-list;</email>) know how did you manage it. "
 "Please refer to this document."
@@ -985,15 +946,15 @@ msgstr ""
 "phương pháp do bạn dùng, cũng tham khảo tài liệu này."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: title
 #: boot-installer.xml:703
 #, no-c-format
-#. Tag: title
 msgid "Etherboot"
 msgstr "Etherboot"
 
+#. Tag: para
 #: boot-installer.xml:704
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"http://www.etherboot.org\">etherboot project</ulink> "
 "provides bootdiskettes and even bootroms that do a TFTPboot."
@@ -1001,30 +962,16 @@ msgstr ""
 "<ulink url=\"http://www.etherboot.org\">Dự án Etherboot</ulink> cung cấp đĩa "
 "mềm khởi động, ngay cả bộ nhớ ROM khởi động, mà khởi động được qua TFTP."
 
+#. Tag: title
 #: boot-installer.xml:714
 #, no-c-format
-#. Tag: title
 msgid "The Boot Screen"
 msgstr "Màn hình khởi động"
 
 # Don't translate the screen example text / Đừng dịch đoạn mẫu màn hình
+#. Tag: para
 #: boot-installer.xml:715
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "When the installer boots, you should be presented with a friendly "
-#| "graphical screen showing the Debian logo and a menu: "
-#| "<informalexample><screen>\n"
-#| "Installer boot menu\n"
-#| "\n"
-#| "Install\n"
-#| "Graphical install\n"
-#| "Advanced options       >\n"
-#| "Help\n"
-#| "\n"
-#| "Press ENTER to boot or TAB to edit a menu entry\n"
-#| "</screen></informalexample> Depending on the installation method you are "
-#| "using, the <quote>Graphical install</quote> option may not be available."
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
 "screen showing the &debian; logo and a menu: <informalexample><screen>\n"
@@ -1039,8 +986,8 @@ msgid ""
 "</screen></informalexample> Depending on the installation method you are "
 "using, the <quote>Graphical install</quote> option may not be available."
 msgstr ""
-"Khi trình cài đặt khởi động, bạn nên thấy một màn hình đồ họa thân thiện hiển "
-"thị biểu hình &debian; và một trình đơn:<informalexample><screen>\n"
+"Khi trình cài đặt khởi động, bạn nên thấy một màn hình đồ họa thân thiện "
+"hiển thị biểu hình &debian; và một trình đơn:<informalexample><screen>\n"
 "Trình đơn khởi động trình cài đặt\n"
 "\n"
 "Cài đặt\n"
@@ -1049,11 +996,12 @@ msgstr ""
 "Trợ giúp\n"
 "\n"
 "Bấm phím ENTER để khởi động, hoặc TAB để chỉnh sửa một mục nhập trình đơn\n"
-"</screen></informalexample> Phụ thuộc vào phương pháp cài đặt đang dùng, sự chọn « Cài đặt đồ họa » có thể không sẵn sàng."
+"</screen></informalexample> Phụ thuộc vào phương pháp cài đặt đang dùng, sự "
+"chọn « Cài đặt đồ họa » có thể không sẵn sàng."
 
+#. Tag: para
 #: boot-installer.xml:725
 #, no-c-format
-#. Tag: para
 msgid ""
 "For a normal installation, select either the <quote>Install</quote> or the "
 "<quote>Graphical install</quote> entry &mdash; using either the arrow keys "
@@ -1065,9 +1013,9 @@ msgstr ""
 "những phím mũi tên trên bàn phím hoặc bằng cách gõ chữ đã tô sáng &mdash; "
 "rồi bấm phím &enterkey; để khởi động trình cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:732
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <quote>Advanced options</quote> entry gives access to a second menu that "
 "allows to boot the installer in expert mode, in rescue mode and for "
@@ -1077,9 +1025,9 @@ msgstr ""
 "hai mà cho phép khởi động trình cài đặt trong chế độ cấp cao, trong chế độ "
 "cứu và để tự động cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:738
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you wish or need to add any boot parameters for either the installer or "
 "the kernel, press &tabkey;. This will display the default boot command for "
@@ -1096,9 +1044,9 @@ msgstr ""
 "cú bấm &escapekey; sẽ trở về trình đơn khởi động và hủy bước thay đổi nào "
 "bạn đã làm."
 
+#. Tag: para
 #: boot-installer.xml:747
 #, no-c-format
-#. Tag: para
 msgid ""
 "Choosing the <quote>Help</quote> entry will result in the first help screen "
 "being displayed which gives an overview of all available help screens. Note "
@@ -1133,9 +1081,9 @@ msgstr ""
 "<userinput>install</userinput> (cài đặt)) và một dấu cách, phía trước tham "
 "số đầu tiên (v.d. <userinput>install fb=false</userinput>)."
 
+#. Tag: para
 #: boot-installer.xml:766
 #, no-c-format
-#. Tag: para
 msgid ""
 "The keyboard is assumed to have a default American English layout at this "
 "point. This means that if your keyboard has a different (language-specific) "
@@ -1151,9 +1099,9 @@ msgstr ""
 "một <ulink url=\"&url-us-keymap;\">giản đồ của bố trí bàn phím tiếng Anh Mỹ</"
 "ulink> đến đó bạn có thể tham chiếu để tìm những phím đúng cần gõ."
 
+#. Tag: para
 #: boot-installer.xml:776
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are using a system that has the BIOS configured to use serial "
 "console, you may not be able to see the initial graphical splash screen upon "
@@ -1172,9 +1120,9 @@ msgstr ""
 "<quote>integrated Lights Out</quote> (iLO) của công ty Compaq, và "
 "<quote>Integrated Remote Assistant</quote> (IRA) của công ty HP."
 
+#. Tag: para
 #: boot-installer.xml:786
 #, no-c-format
-#. Tag: para
 msgid ""
 "To bypass the graphical boot screen you can either blindly press &escapekey; "
 "to get a text boot prompt, or (equally blindly) press <quote>H</quote> "
@@ -1192,26 +1140,15 @@ msgstr ""
 "đặt, bạn cũng cần phải thêm tham số <userinput>fb=false</userinput> vào dấu "
 "nhắc khởi động, như được diễn tả trong đoạn văn trợ giúp."
 
+#. Tag: title
 #: boot-installer.xml:846
 #, no-c-format
-#. Tag: title
 msgid "CD Contents"
 msgstr "Nội dung đĩa CD"
 
+#. Tag: para
 #: boot-installer.xml:848
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "There are three basic variations of Debian Install CDs. The "
-#| "<emphasis>Business Card</emphasis> CD has a minimal installation that "
-#| "will fit on the small form factor CD media. It requires a network "
-#| "connection in order to install the rest of the base installation and make "
-#| "a usable system. The <emphasis>Network Install</emphasis> CD has all of "
-#| "the packages for a base install but requires a network connection to a "
-#| "Debian mirror site in order to install the extra packages one would want "
-#| "for a complete system . The set of Debian CDs can install a complete "
-#| "system from the wide range of packages without needing access to the "
-#| "network."
 msgid ""
 "There are three basic variations of &debian; Install CDs. The "
 "<emphasis>Business Card</emphasis> CD has a minimal installation that will "
@@ -1223,12 +1160,19 @@ msgid ""
 "The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
-"Có ba biến thể của đĩa CD cài đặt &debian;. Đĩa CD <emphasis>Danh Thiếp</emphasis> (Business Card) chứa một bản cài đặt tối thiểu vừa được trên vật chứa kiểu đĩa CD thích hợp với kích cỡ thiết bị nhỏ. Nó yêu cầu một sự kết nối đến mạng để cài đặt phần còn lại của bản cài đặt cơ sở, xây dựng hệ "
-"thống có ích. Đĩa CD <emphasis>Cài đặt qua mạng</emphasis> (Network Install) chứa tất cả các gói cấu thành bản cài đặt cơ sở, còn yêu cầu sự kết nối mạng đến một máy nhân bản &debian; để cài đặt các gói bổ sung cần thiết để xây dựng hệ thống hoàn toàn. Bộ đĩa CD &debian; có khả năng cài đặt hệ thống hoàn toàn từ phạm vị gói rộng rãi mà không cần truy cập đến mạng."
+"Có ba biến thể của đĩa CD cài đặt &debian;. Đĩa CD <emphasis>Danh Thiếp</"
+"emphasis> (Business Card) chứa một bản cài đặt tối thiểu vừa được trên vật "
+"chứa kiểu đĩa CD thích hợp với kích cỡ thiết bị nhỏ. Nó yêu cầu một sự kết "
+"nối đến mạng để cài đặt phần còn lại của bản cài đặt cơ sở, xây dựng hệ "
+"thống có ích. Đĩa CD <emphasis>Cài đặt qua mạng</emphasis> (Network Install) "
+"chứa tất cả các gói cấu thành bản cài đặt cơ sở, còn yêu cầu sự kết nối mạng "
+"đến một máy nhân bản &debian; để cài đặt các gói bổ sung cần thiết để xây "
+"dựng hệ thống hoàn toàn. Bộ đĩa CD &debian; có khả năng cài đặt hệ thống "
+"hoàn toàn từ phạm vị gói rộng rãi mà không cần truy cập đến mạng."
 
+#. Tag: para
 #: boot-installer.xml:864
 #, no-c-format
-#. Tag: para
 msgid ""
 "The IA-64 architecture uses the next generation Extensible Firmware "
 "Interface (EFI) from Intel. Unlike the traditional x86 BIOS which knows "
@@ -1252,16 +1196,9 @@ msgstr ""
 "một phân vùng đĩa thêm dành cho EFI, thay cho MBR hay khối tin khởi động đơn "
 "giản trên hệ thống quy ước hơn."
 
+#. Tag: para
 #: boot-installer.xml:880
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The Debian Installer CD contains a small EFI partition where the "
-#| "<command>ELILO</command> bootloader, its configuration file, the "
-#| "installer's kernel, and initial filesystem (initrd) are located. The "
-#| "running system also contains an EFI partition where the necessary files "
-#| "for booting the system reside. These files are readable from the EFI "
-#| "Shell as described below."
 msgid ""
 "The &debian; Installer CD contains a small EFI partition where the "
 "<command>ELILO</command> bootloader, its configuration file, the installer's "
@@ -1269,11 +1206,15 @@ msgid ""
 "contains an EFI partition where the necessary files for booting the system "
 "reside. These files are readable from the EFI Shell as described below."
 msgstr ""
-"Đĩa CD cài đặt &debian; chứa một phân vùng EFI nhỏ chứa bộ nạp khởi động <command>ELILO</command>, tập tin cấu hình của nó, hạt nhân của trình cài đặt, và hệ thống tập tin ban đầu (initrd). Hệ thống đang chạy cũng chứa một phân vùng EFI chứa những tập tin yêu cầu để khởi động hệ thống. Các tập tin này có thể được đọc từ trình bao EFI như được diễn tả bên dưới."
+"Đĩa CD cài đặt &debian; chứa một phân vùng EFI nhỏ chứa bộ nạp khởi động "
+"<command>ELILO</command>, tập tin cấu hình của nó, hạt nhân của trình cài "
+"đặt, và hệ thống tập tin ban đầu (initrd). Hệ thống đang chạy cũng chứa một "
+"phân vùng EFI chứa những tập tin yêu cầu để khởi động hệ thống. Các tập tin "
+"này có thể được đọc từ trình bao EFI như được diễn tả bên dưới."
 
+#. Tag: para
 #: boot-installer.xml:889
 #, no-c-format
-#. Tag: para
 msgid ""
 "Most of the details of how <command>ELILO</command> actually loads and "
 "starts a system are transparent to the system installer. However, the "
@@ -1293,9 +1234,9 @@ msgstr ""
 "vào đĩa hệ thống. Tác vụ phân vùng cũng thẩm tra có một phân vùng EFI thích "
 "hợp, trước khi cho phép tiến trình cài đặt tiếp tục lại."
 
+#. Tag: para
 #: boot-installer.xml:901
 #, no-c-format
-#. Tag: para
 msgid ""
 "The EFI Boot Manager is presented as the last step of the firmware "
 "initialization. It displays a menu list from which the user can select an "
@@ -1317,15 +1258,15 @@ msgstr ""
 "bạn bật tùy chọn thứ nhất; nếu nó không sẵn sàng, hoặc nếu đĩa CD vì lý do "
 "nào không khởi động được với nó, hãy bật tùy chọn thứ hai. "
 
+#. Tag: title
 #: boot-installer.xml:920
 #, no-c-format
-#. Tag: title
 msgid "IMPORTANT"
 msgstr "QUAN TRỌNG"
 
+#. Tag: para
 #: boot-installer.xml:921
 #, no-c-format
-#. Tag: para
 msgid ""
 "The EFI Boot Manager will select a default boot action, typically the first "
 "menu choice, within a pre-set number of seconds. This is indicated by a "
@@ -1342,15 +1283,15 @@ msgstr ""
 "động mặc định là Trình bao EFI, bạn có khả năng trở về Bộ quản lý khởi động "
 "bằng cách chạy lệnh <command>exit</command> (thoát) tại dấu nhắc trình bao."
 
+#. Tag: title
 #: boot-installer.xml:933
 #, no-c-format
-#. Tag: title
 msgid "Option 1: Booting from the Boot Option Maintenance Menu"
 msgstr "Tùy chọn 1: khởi động từ Trình đơn bảo dưỡng tùy chọn khởi động"
 
+#. Tag: para
 #: boot-installer.xml:940
 #, no-c-format
-#. Tag: para
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
 "display the EFI Boot Manager page and menu after it completes its system "
@@ -1360,9 +1301,9 @@ msgstr ""
 "trang và trình đơn của Bộ quản lý khởi động EFI sau khi nó sơ khởi xong hệ "
 "thống."
 
+#. Tag: para
 #: boot-installer.xml:946
 #, no-c-format
-#. Tag: para
 msgid ""
 "Select <command>Boot Maintenance Menu</command> from the menu with the arrow "
 "keys and press <command>ENTER</command>. This will display a new menu."
@@ -1371,9 +1312,9 @@ msgstr ""
 "khởi động) trong trình đơn bằng phím mũi tên, rồi bấm phím &enterkey;. Việc "
 "này sẽ hiển thị một trình đơn mới."
 
+#. Tag: para
 #: boot-installer.xml:952
 #, no-c-format
-#. Tag: para
 msgid ""
 "Select <command>Boot From a File</command> from the menu with the arrow keys "
 "and press <command>ENTER</command>. This will display a list of devices "
@@ -1390,9 +1331,9 @@ msgstr ""
 "xem lại phần còn lại của dòng trình đơn, bạn nên thấy biết rằng thông tin về "
 "thiết bị và thông tin về trình điều khiển là trùng."
 
+#. Tag: para
 #: boot-installer.xml:963
 #, no-c-format
-#. Tag: para
 msgid ""
 "You can choose either of the entries that refer to the CD/DVD drive. Select "
 "your choice with the arrow keys and press <command>ENTER</command>. If you "
@@ -1408,9 +1349,9 @@ msgstr ""
 "command>, nõ sẽ hiển thị danh sách các thư mục nằm trên phần đĩa CD có khả "
 "năng khởi động, cần thiết bạn tiếp tục đến bước kế tiếp (thêm)."
 
+#. Tag: para
 #: boot-installer.xml:974
 #, no-c-format
-#. Tag: para
 msgid ""
 "You will only need this step if you chose <command>Debian Inst [Acpi ...</"
 "command>. The directory listing will also show <command>[Treat like "
@@ -1424,45 +1365,41 @@ msgstr ""
 "chứa rời) trên dòng giáp cuối. Hãy chọn dòng này bằng phím mũi tên rồi bấm "
 "phím &enterkey;. Việc này sẽ khởi chạy tiến trình tải khởi động."
 
+#. Tag: para
 #: boot-installer.xml:986
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "These steps start the Debian boot loader which will display a menu page "
-#| "for you to select a boot kernel and options. Proceed to selecting the "
-#| "boot kernel and options."
 msgid ""
 "These steps start the &debian; boot loader which will display a menu page "
 "for you to select a boot kernel and options. Proceed to selecting the boot "
 "kernel and options."
 msgstr ""
-"Những bước này khởi chạy bộ nạp khởi &debian; mà hiển thị một trang trình đơn cho bạn chọn một hạt nhân khởi động và các tùy chọn tương ứng. Hãy tiếp tục tới giai đoạn đó."
+"Những bước này khởi chạy bộ nạp khởi &debian; mà hiển thị một trang trình "
+"đơn cho bạn chọn một hạt nhân khởi động và các tùy chọn tương ứng. Hãy tiếp "
+"tục tới giai đoạn đó."
 
+#. Tag: title
 #: boot-installer.xml:996
 #, no-c-format
-#. Tag: title
 msgid "Option 2: Booting from the EFI Shell"
 msgstr "Tùy chọn 2: khởi động từ trình bao EFI"
 
+#. Tag: para
 #: boot-installer.xml:997
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If, for some reason, option 1 is not successful, reboot the machine and "
-#| "when the EFI Boot Manager screen appears there should be one option "
-#| "called <command>EFI Shell [Built-in]</command>. Boot the Debian Installer "
-#| "CD with the following steps:"
 msgid ""
 "If, for some reason, option 1 is not successful, reboot the machine and when "
 "the EFI Boot Manager screen appears there should be one option called "
 "<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
-"Nếu, vì một lý do nào đó, tùy chọn 1 bị lỗi, bạn hãy khởi động lại máy. Việc này hiển thị màn hình của bộ quản lý khởi động EFI nên chứa một tùy chọn tên <command>EFI Shell [Built-in]</command> (Trình bao EFI [có sẵn]). Khởi động đĩa CD cài đặt &debian; bằng cách theo những bước này:"
+"Nếu, vì một lý do nào đó, tùy chọn 1 bị lỗi, bạn hãy khởi động lại máy. Việc "
+"này hiển thị màn hình của bộ quản lý khởi động EFI nên chứa một tùy chọn tên "
+"<command>EFI Shell [Built-in]</command> (Trình bao EFI [có sẵn]). Khởi động "
+"đĩa CD cài đặt &debian; bằng cách theo những bước này:"
 
+#. Tag: para
 #: boot-installer.xml:1008
 #, no-c-format
-#. Tag: para
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
 "display the EFI Boot Manager page and menu after it completes system "
@@ -1472,9 +1409,9 @@ msgstr ""
 "trang và trình đơn của Bộ quản lý khởi động EFI sau khi nó sơ khởi xong hệ "
 "thống."
 
+#. Tag: para
 #: boot-installer.xml:1014
 #, no-c-format
-#. Tag: para
 msgid ""
 "Select <command>EFI Shell</command> from the menu with the arrow keys and "
 "press <command>ENTER</command>. The EFI Shell will scan all of the bootable "
@@ -1495,9 +1432,9 @@ msgstr ""
 "đúng trước khi vào trình bao, việc này có thể mất vài giây thêm trong khi nó "
 "sơ khởi ổ đĩa CD."
 
+#. Tag: para
 #: boot-installer.xml:1028
 #, no-c-format
-#. Tag: para
 msgid ""
 "Examine the output from the shell looking for the CDROM drive. It is most "
 "likely the <filename>fs0:</filename> device although other devices with "
@@ -1508,9 +1445,9 @@ msgstr ""
 "<filename>fs0:</filename>, dù thiết bị khác có phân vùng khởi động được sẽ "
 "cũng hiển thị như là <filename>fs<replaceable>n</replaceable></filename>."
 
+#. Tag: para
 #: boot-installer.xml:1035
 #, no-c-format
-#. Tag: para
 msgid ""
 "Enter <command>fs<replaceable>n</replaceable>:</command> and press "
 "<command>ENTER</command> to select that device where <replaceable>n</"
@@ -1522,9 +1459,9 @@ msgstr ""
 "<replaceable>n</replaceable>. Sau đó, trình bao sẽ hiển thị số hiệu phân "
 "vùng như là dấu nhắc."
 
+#. Tag: para
 #: boot-installer.xml:1042
 #, no-c-format
-#. Tag: para
 msgid ""
 "Enter <command>elilo</command> and press <command>ENTER</command>. This will "
 "start the boot load sequence."
@@ -1532,15 +1469,9 @@ msgstr ""
 "Nhập <command>elilo</command> rồi bấm phím &enterkey;. Việc này sẽ bắt đầu "
 "tiến trình tải khởi động."
 
+#. Tag: para
 #: boot-installer.xml:1049
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "As with option 1, these steps start the Debian boot loader which will "
-#| "display a menu page for you to select a boot kernel and options. You can "
-#| "also enter the shorter <command>fs<replaceable>n</replaceable>:elilo</"
-#| "command> command at the shell prompt. Proceed to selecting the boot "
-#| "kernel and options."
 msgid ""
 "As with option 1, these steps start the &debian; boot loader which will "
 "display a menu page for you to select a boot kernel and options. You can "
@@ -1548,17 +1479,21 @@ msgid ""
 "command> command at the shell prompt. Proceed to selecting the boot kernel "
 "and options."
 msgstr ""
-"Cũng như tùy chọn 1, những bước này khởi chạy bộ nạp khởi động &debian; mà hiển thị một trang trình đơn cho bạn chọn hạt nhân và các tùy chọn tương ứng. (Để làm nhanh hơn, cũng có thể nhập lệnh <command>fs<replaceable>n</replaceable>:elilo</command> vào dấu nhắc trình bao.) Hãy tiếp tục đến giai đoạn chọn hạt nhân khởi động và các tùy chọn tương ứng."
+"Cũng như tùy chọn 1, những bước này khởi chạy bộ nạp khởi động &debian; mà "
+"hiển thị một trang trình đơn cho bạn chọn hạt nhân và các tùy chọn tương "
+"ứng. (Để làm nhanh hơn, cũng có thể nhập lệnh <command>fs<replaceable>n</"
+"replaceable>:elilo</command> vào dấu nhắc trình bao.) Hãy tiếp tục đến giai "
+"đoạn chọn hạt nhân khởi động và các tùy chọn tương ứng."
 
+#. Tag: title
 #: boot-installer.xml:1063
 #, no-c-format
-#. Tag: title
 msgid "Installing using a Serial Console"
 msgstr "Cài đặt bằng bàn điều khiển nối tiếp"
 
+#. Tag: para
 #: boot-installer.xml:1065
 #, no-c-format
-#. Tag: para
 msgid ""
 "You may choose to perform an install using a monitor and keyboard or using a "
 "serial connection. To use a monitor/keyboard setup, select an option "
@@ -1577,9 +1512,9 @@ msgstr ""
 "khiển nối tiếp đó. Trên thiết bị ttyS0, mục trình đơn cho những giá trị tốc "
 "độ truyền thường nhất đã được định sẵn."
 
+#. Tag: para
 #: boot-installer.xml:1076
 #, no-c-format
-#. Tag: para
 msgid ""
 "In most circumstances, you will want the installer to use the same baud rate "
 "as your connection to the EFI console. If you aren't sure what this setting "
@@ -1591,9 +1526,9 @@ msgstr ""
 "này, bạn có thể lấy nó bằng cách nhập lệnh <command>baud</command> (bốt) vào "
 "trình bao EFI."
 
+#. Tag: para
 #: boot-installer.xml:1083
 #, no-c-format
-#. Tag: para
 msgid ""
 "If there is not an option available that is configured for the serial device "
 "or baud rate you would like to use, you may override the console setting for "
@@ -1608,9 +1543,9 @@ msgstr ""
 "<command>console=ttyS1,57600n8</command> vào cửa sổ nhập thô <classname>Boot:"
 "</classname> (khởi động)."
 
+#. Tag: para
 #: boot-installer.xml:1094
 #, no-c-format
-#. Tag: para
 msgid ""
 "Most IA-64 boxes ship with a default console setting of 9600 baud. This "
 "setting is rather slow, and the normal installation process will take a "
@@ -1626,9 +1561,9 @@ msgstr ""
 "Thô (Text Mode). Xem trình đơn trợ giúp <classname>Params</classname> (Tham "
 "số) để tìm hướng dẫn về cách khởi chạy trình cài đặt trong Chế Độ Nhập Thô."
 
+#. Tag: para
 #: boot-installer.xml:1103
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you select the wrong console type, you will be able to select the kernel "
 "and enter parameters but both the display and your input will go dead as "
@@ -1640,15 +1575,15 @@ msgstr ""
 "đều sẽ bị tắt một khi hạt nhân khởi chạy, nên cần thiết bạn khởi động lại để "
 "bất đầu cài đặt."
 
+#. Tag: title
 #: boot-installer.xml:1112
 #, no-c-format
-#. Tag: title
 msgid "Selecting the Boot Kernel and Options"
 msgstr "Chọn hát nhân khởi động và các tùy chọn tương ứng"
 
+#. Tag: para
 #: boot-installer.xml:1114
 #, no-c-format
-#. Tag: para
 msgid ""
 "The boot loader will display a form with a menu list and a text window with "
 "a <classname>Boot:</classname> prompt. The arrow keys select an item from "
@@ -1667,9 +1602,9 @@ msgstr ""
 "còn màn hình  <classname>Params</classname> (Tham số) giải thích những tùy "
 "chọn dòng lệnh thường dùng."
 
+#. Tag: para
 #: boot-installer.xml:1126
 #, no-c-format
-#. Tag: para
 msgid ""
 "Consult the <classname>General</classname> help screen for the description "
 "of the kernels and install modes most appropriate for your installation. You "
@@ -1690,9 +1625,9 @@ msgstr ""
 "khó khăn trong tiến trình cài đặt, bạn sẽ có thể gặp cùng khó khăn khi chạy "
 "hệ thống được cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:1144
 #, no-c-format
-#. Tag: para
 msgid ""
 "Select the kernel version and installation mode most appropriate to your "
 "needs with the arrow keys."
@@ -1700,9 +1635,9 @@ msgstr ""
 "Bằng phím mũi tên, hãy chọn phiên bản hạt nhân và chế độ cài đặt thích hợp "
 "nhất với điều kiện của máy tính của bạn."
 
+#. Tag: para
 #: boot-installer.xml:1149
 #, no-c-format
-#. Tag: para
 msgid ""
 "Enter any boot parameters by typing at the keyboard. The text will be "
 "displayed directly in the text window. This is where kernel parameters (such "
@@ -1712,24 +1647,21 @@ msgstr ""
 "Đoạn đã gõ sẽ được hiển thị trực tiếp trong cửa sổ nhập thô. Ở đây bạn có "
 "thể xác định tham số hạt nhân như thiết lập bàn điều khiển nối tiếp."
 
+#. Tag: para
 #: boot-installer.xml:1156
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Press <command>ENTER</command>. This will load and start the kernel. The "
-#| "kernel will display its usual initialization messages followed by the "
-#| "first screen of the Debian Installer."
 msgid ""
 "Press <command>ENTER</command>. This will load and start the kernel. The "
 "kernel will display its usual initialization messages followed by the first "
 "screen of the &debian; Installer."
 msgstr ""
-"Bấm phím &enterkey;. Cú này sẽ nạp và khởi chạy hạt nhân. Hạt nhân sẽ hiển thị các thông điệp sơ khởi bình thường rồi màn hình thứ nhất của tiến trình cài đặt &debian;."
+"Bấm phím &enterkey;. Cú này sẽ nạp và khởi chạy hạt nhân. Hạt nhân sẽ hiển "
+"thị các thông điệp sơ khởi bình thường rồi màn hình thứ nhất của tiến trình "
+"cài đặt &debian;."
 
-#: boot-installer.xml:1165
-#: boot-installer.xml:1301
-#, no-c-format
 #. Tag: para
+#: boot-installer.xml:1165 boot-installer.xml:1301
+#, no-c-format
 msgid ""
 "Proceed to the next chapter to continue the installation where you will set "
 "up the language locale, network, and disk partitions."
@@ -1737,9 +1669,9 @@ msgstr ""
 "Sau đó, hãy tới chương kế tiếp, để tiếp tục tiến trình cài đặt bằng cách "
 "thiết lập miền địa phương (gồm ngôn ngữ), mạng và phân vùng đĩa."
 
+#. Tag: para
 #: boot-installer.xml:1176
 #, no-c-format
-#. Tag: para
 msgid ""
 "Booting an IA-64 system from the network is similar to a CD boot. The only "
 "difference is how the installation kernel is loaded. The EFI Boot Manager "
@@ -1757,9 +1689,9 @@ msgstr ""
 "ngoài lệ là các gói của bản cài đặt cơ sở sẽ được nạp qua mạng hơn là qua ổ "
 "đĩa CD."
 
+#. Tag: para
 #: boot-installer.xml:1210
 #, no-c-format
-#. Tag: para
 msgid ""
 "Network booting an IA-64 system requires two architecture-specific actions. "
 "On the boot server, DHCP and TFTP must be configured to deliver "
@@ -1772,15 +1704,15 @@ msgstr ""
 "chọn khởi động mới phải được xác định trong bộ quản lý khởi động EFI để hiệu "
 "lực khả năng nạp qua mạng."
 
+#. Tag: title
 #: boot-installer.xml:1221
 #, no-c-format
-#. Tag: title
 msgid "Configuring the Server"
 msgstr "Cấu hình máy phục vụ"
 
+#. Tag: para
 #: boot-installer.xml:1222
 #, no-c-format
-#. Tag: para
 msgid ""
 "A suitable TFTP entry for network booting an IA-64 system looks something "
 "like this: <informalexample><screen>\n"
@@ -1802,9 +1734,9 @@ msgstr ""
 "</screen></informalexample> Ghi chú rằng mục đích là làm cho <command>elilo."
 "efi</command> chạy được trên máy khách."
 
+#. Tag: para
 #: boot-installer.xml:1232
 #, no-c-format
-#. Tag: para
 msgid ""
 "Extract the <filename>netboot.tar.gz</filename> file into the directory used "
 "as the root for your tftp server. Typical tftp root directories include "
@@ -1819,9 +1751,9 @@ msgstr ""
 "cài đặt Debian) chứa các tập tin khởi động thích hợp với hệ thống kiểu IA-64."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: boot-installer.xml:1242
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# cd /var/lib/tftp\n"
 "# tar xvfz /home/user/netboot.tar.gz\n"
@@ -1837,9 +1769,9 @@ msgstr ""
 "./debian-installer/ia64/\n"
 "[...]"
 
+#. Tag: para
 #: boot-installer.xml:1242
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <filename>netboot.tar.gz</filename> contains an <filename>elilo.conf</"
 "filename> file that should work for most configurations. However, should you "
@@ -1859,15 +1791,15 @@ msgstr ""
 "tập tin gốc <filename>elilo.conf</filename>. Xem tài liệu có sẵn trong gói "
 "<classname>elilo</classname> để tìm chi tiết."
 
+#. Tag: title
 #: boot-installer.xml:1259
 #, no-c-format
-#. Tag: title
 msgid "Configuring the Client"
 msgstr "Cấu hình máy khách"
 
+#. Tag: para
 #: boot-installer.xml:1260
 #, no-c-format
-#. Tag: para
 msgid ""
 "To configure the client to support TFTP booting, start by booting to EFI and "
 "entering the <guimenu>Boot Option Maintenance Menu</guimenu>. <itemizedlist> "
@@ -1897,15 +1829,9 @@ msgstr ""
 "chỉ dẫn đến việc tải tập tin <filename>elilo.efi</filename> qua TFTP từ máy "
 "phục vụ."
 
+#. Tag: para
 #: boot-installer.xml:1292
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The boot loader will display its prompt after it has downloaded and "
-#| "processed its configuration file. At this point, the installation "
-#| "proceeds with the same steps as a CD install. Select a boot option as in "
-#| "above and when the kernel has completed installing itself from the "
-#| "network, it will start the Debian Installer."
 msgid ""
 "The boot loader will display its prompt after it has downloaded and "
 "processed its configuration file. At this point, the installation proceeds "
@@ -1913,27 +1839,21 @@ msgid ""
 "when the kernel has completed installing itself from the network, it will "
 "start the &debian; Installer."
 msgstr ""
-"Bộ nạp khởi động sẽ hiển thị dấu nhắc sở hữu sau khi nó tải về và xử lý tập tin cấu hình tương ứng. Tại điểm thời này, tiến trình cài đặt theo cùng một số bước với sự cài đặt từ đĩa CD. Kén một sự chọn khởi động (như nêu trên) và, một khi hạt nhân tự cài đặt qua mạng, nó sẽ khởi chạy trình cài đặt &debian;."
+"Bộ nạp khởi động sẽ hiển thị dấu nhắc sở hữu sau khi nó tải về và xử lý tập "
+"tin cấu hình tương ứng. Tại điểm thời này, tiến trình cài đặt theo cùng một "
+"số bước với sự cài đặt từ đĩa CD. Kén một sự chọn khởi động (như nêu trên) "
+"và, một khi hạt nhân tự cài đặt qua mạng, nó sẽ khởi chạy trình cài đặt "
+"&debian;."
 
-#: boot-installer.xml:1318
-#: boot-installer.xml:1342
-#, no-c-format
 #. Tag: title
+#: boot-installer.xml:1318 boot-installer.xml:1342
+#, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "Khởi động SGI qua TFTP"
 
+#. Tag: para
 #: boot-installer.xml:1319
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "After entering the command monitor use <informalexample><screen>\n"
-#| "bootp():\n"
-#| "</screen></informalexample> on SGI machines to boot linux and to begin "
-#| "installation of the Debian Software. In order to make this work you may "
-#| "have to unset the <envar>netaddr</envar> environment variable. Type "
-#| "<informalexample><screen>\n"
-#| "unsetenv netaddr\n"
-#| "</screen></informalexample> in the command monitor to do this."
 msgid ""
 "After entering the command monitor use <informalexample><screen>\n"
 "bootp():\n"
@@ -1946,21 +1866,22 @@ msgid ""
 msgstr ""
 "Sau khi vào bộ theo dõi lệnh, hãy gõ chuỗi <informalexample><screen>\n"
 "bootp():\n"
-"</screen></informalexample> trên máy kiểu SGI để khởi động Linux và bất đầu cài đặt phần mềm &debian;. Để làm thành công thì bạn có thể cần phải bỏ lập biến môi trường <envar>netaddr</envar> (địa chỉ mạng), bằng cách gõ câu lệnh <informalexample><screen>\n"
+"</screen></informalexample> trên máy kiểu SGI để khởi động Linux và bất đầu "
+"cài đặt phần mềm &debian;. Để làm thành công thì bạn có thể cần phải bỏ lập "
+"biến môi trường <envar>netaddr</envar> (địa chỉ mạng), bằng cách gõ câu lệnh "
+"<informalexample><screen>\n"
 "unsetenv netaddr\n"
 "</screen></informalexample> trong bộ theo dõi lệnh."
 
-#: boot-installer.xml:1339
-#: boot-installer.xml:1406
-#: boot-installer.xml:2007
-#, no-c-format
 #. Tag: title
+#: boot-installer.xml:1339 boot-installer.xml:1406 boot-installer.xml:2007
+#, no-c-format
 msgid "Boot Parameters"
 msgstr "Tham số khởi động"
 
+#. Tag: para
 #: boot-installer.xml:1343
 #, no-c-format
-#. Tag: para
 msgid ""
 "On SGI machines you can append boot parameters to the <command>bootp():</"
 "command> command in the command monitor."
@@ -1968,9 +1889,9 @@ msgstr ""
 "Trên máy kiểu SGI, bạn có khả năng phụ thêm một số tham số khởi động vào "
 "lệnh <command>bootp():</command> trong bộ theo dõi lệnh."
 
+#. Tag: para
 #: boot-installer.xml:1348
 #, no-c-format
-#. Tag: para
 msgid ""
 "Following the <command>bootp():</command> command you can give the path and "
 "name of the file to boot if you did not give an explicit name via your bootp/"
@@ -1987,22 +1908,21 @@ msgstr ""
 "<command>append</command> (phụ thêm):"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: boot-installer.xml:1358
 #, no-c-format
-#. Tag: screen
 msgid "bootp(): append=\"root=/dev/sda1\""
 msgstr "bootp(): append=\"root=/dev/sda1\""
 
-#: boot-installer.xml:1372
-#: boot-installer.xml:1409
-#, no-c-format
 #. Tag: title
+#: boot-installer.xml:1372 boot-installer.xml:1409
+#, no-c-format
 msgid "Cobalt TFTP Booting"
 msgstr "Khởi động TFTP Cobalt"
 
+#. Tag: para
 #: boot-installer.xml:1373
 #, no-c-format
-#. Tag: para
 msgid ""
 "Strictly speaking, Cobalt does not use TFTP but NFS to boot. You need to "
 "install an NFS server and put the installer files in <filename>/nfsroot</"
@@ -2018,9 +1938,9 @@ msgstr ""
 "rồi máy sẽ khởi động qua mạng từ NFS. Sau đó, nó sẽ hiển thị vài tùy chọn "
 "trên màn hình. Có những phương pháp cài đặt này:"
 
+#. Tag: para
 #: boot-installer.xml:1383
 #, no-c-format
-#. Tag: para
 msgid ""
 "Via SSH (default): In this case, the installer will configure the network "
 "via DHCP and start an SSH server. It will then display a random password and "
@@ -2034,9 +1954,9 @@ msgstr ""
 "màn hình LCD (phẳng) của máy Cobalt. Khi bạn kết nối đến máy đó bằng ứng "
 "dụng khách SSH, bạn có thể khởi chạy tiến trình cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:1392
 #, no-c-format
-#. Tag: para
 msgid ""
 "Via serial console: Using a null modem cable, you can connect to the serial "
 "port of your Cobalt machine (using 115200 bps) and perform the installation "
@@ -2046,9 +1966,9 @@ msgstr ""
 "modem), bạn có thể kết nối đến cổng nối tiếp của máy Cobalt (bằng 115200 "
 "bps) và thực hiện tiến trình cài đặt bằng cách này này."
 
+#. Tag: para
 #: boot-installer.xml:1410
 #, no-c-format
-#. Tag: para
 msgid ""
 "You cannot pass any boot parameters directly. Instead, you have to edit the "
 "<filename>/nfsroot/default.colo</filename> file on the NFS server and add "
@@ -2059,15 +1979,15 @@ msgstr ""
 "NFS, và thêm các tham số riêng của bạn vào biến <replaceable>args</"
 "replaceable> (đối số) trong nó."
 
+#. Tag: title
 #: boot-installer.xml:1425
 #, no-c-format
-#. Tag: title
 msgid "s390 Limitations"
 msgstr "Hạn chế S/390"
 
+#. Tag: para
 #: boot-installer.xml:1426
 #, no-c-format
-#. Tag: para
 msgid ""
 "In order to run the installation system a working network setup and ssh "
 "session is needed on S/390."
@@ -2075,9 +1995,9 @@ msgstr ""
 "Để chạy hệ thống cài đặt trên máy kiểu S/390, cần thiết một thiết lập mạng "
 "và phiên chạy SSH hoạt động."
 
+#. Tag: para
 #: boot-installer.xml:1431
 #, no-c-format
-#. Tag: para
 msgid ""
 "The booting process starts with a network setup that prompts you for several "
 "network parameters. If the setup is successful, you will login to the system "
@@ -2089,15 +2009,15 @@ msgstr ""
 "thống bằng cách sơ khởi một phiên chạy SSH mà sẽ khởi chạy hệ thống cài đặt "
 "chuẩn."
 
+#. Tag: title
 #: boot-installer.xml:1442
 #, no-c-format
-#. Tag: title
 msgid "s390 Boot Parameters"
 msgstr "Tham số khởi động S/390"
 
+#. Tag: para
 #: boot-installer.xml:1443
 #, no-c-format
-#. Tag: para
 msgid ""
 "On S/390 you can append boot parameters in the parm file. This file can "
 "either be in ASCII or EBCDIC format. A sample parm file <filename>parmfile."
@@ -2107,9 +2027,9 @@ msgstr ""
 "<filename>parm</filename>. Tập tin này có định dạng hoặc ASCII hoặc EBCDIC. "
 "Một tập tin parm mẫu được cung cấp cùng với ảnh cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:1503
 #, no-c-format
-#. Tag: para
 msgid ""
 "Currently, the only &arch-title; subarchitectures that support CD-ROM "
 "booting are PReP (though not all systems) and New World PowerMacs. On "
@@ -2125,15 +2045,9 @@ msgstr ""
 "keycap>, và <keycap>Delete</keycap> đồng thời trong khi khởi động, để khởi "
 "động từ đĩa CD-ROM."
 
+#. Tag: para
 #: boot-installer.xml:1512
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
-#| "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
-#| "software version of this driver is not available. All OldWorld systems "
-#| "have floppy drives, so use the floppy drive to launch the installer, and "
-#| "then point the installer to the CD for the needed files."
 msgid ""
 "OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
 "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
@@ -2141,16 +2055,16 @@ msgid ""
 "floppy drives, so use the floppy drive to launch the installer, and then "
 "point the installer to the CD for the needed files."
 msgstr ""
-"Máy PowerMac kiểu cũ sẽ không khởi động từ một đĩa CD-ROM &debian;, vì máy kiểu cũ "
-"này nhờ một trình điều khiển khởi động đĩa CD bộ nhớ ROM của MacOS nằm trên "
-"đĩa CD khởi động, và chưa có phiên bản phần mềm tự do của trình điều khiển "
-"này. Mọi hệ thống kiểu cũ có ổ đĩa mềm, vậy bạn hãy sử dụng ổ đĩa mềm để "
-"khởi chạy trình cài đặt, rồi chỉ trình cài đặt tới đĩa CD để lấy các tập tin "
-"cần thiết."
+"Máy PowerMac kiểu cũ sẽ không khởi động từ một đĩa CD-ROM &debian;, vì máy "
+"kiểu cũ này nhờ một trình điều khiển khởi động đĩa CD bộ nhớ ROM của MacOS "
+"nằm trên đĩa CD khởi động, và chưa có phiên bản phần mềm tự do của trình "
+"điều khiển này. Mọi hệ thống kiểu cũ có ổ đĩa mềm, vậy bạn hãy sử dụng ổ đĩa "
+"mềm để khởi chạy trình cài đặt, rồi chỉ trình cài đặt tới đĩa CD để lấy các "
+"tập tin cần thiết."
 
+#. Tag: para
 #: boot-installer.xml:1521
 #, no-c-format
-#. Tag: para
 msgid ""
 "If your system doesn't boot directly from CD-ROM, you can still use the CD-"
 "ROM to install the system. On NewWorlds, you can also use an OpenFirmware "
@@ -2166,21 +2080,21 @@ msgstr ""
 "command> nằm trên đĩa CD đó."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: boot-installer.xml:1530
 #, no-c-format
-#. Tag: screen
 msgid "0 &gt; boot cd:,\\install\\yaboot"
 msgstr "0 &gt; boot cd:,\\install\\yaboot"
 
+#. Tag: title
 #: boot-installer.xml:1536
 #, no-c-format
-#. Tag: title
 msgid "Booting from Hard Disk"
 msgstr "Khởi động từ đĩa cứng"
 
+#. Tag: para
 #: boot-installer.xml:1542
 #, no-c-format
-#. Tag: para
 msgid ""
 "Booting from an existing operating system is often a convenient option; for "
 "some systems it is the only supported method of installation."
@@ -2189,9 +2103,9 @@ msgstr ""
 "đối với một số hệ thống riêng, nó là phương pháp cài đặt duy nhất được hỗ "
 "trợ."
 
+#. Tag: para
 #: boot-installer.xml:1548
 #, no-c-format
-#. Tag: para
 msgid ""
 "To boot the installer from hard disk, you will have already completed "
 "downloading and placing the needed files as described in <xref linkend="
@@ -2201,15 +2115,15 @@ msgstr ""
 "những tập tin cần thiết như được diễn tả trong <xref linkend=\"boot-drive-"
 "files\"/>."
 
+#. Tag: title
 #: boot-installer.xml:1568
 #, no-c-format
-#. Tag: title
 msgid "Booting OldWorld PowerMacs from MacOS"
 msgstr "Khởi động PowerMac kiểu cũ từ MacOS"
 
+#. Tag: para
 #: boot-installer.xml:1569
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you set up BootX in <xref linkend=\"files-oldworld\"/>, you can use it to "
 "boot into the installation system. Double click the <guiicon>BootX</guiicon> "
@@ -2231,36 +2145,15 @@ msgstr ""
 "cái nút <guibutton>Linux</guibutton> để tắt hệ điều hành MacOS và khởi chạy "
 "trình cài đặt &d-i;."
 
+#. Tag: title
 #: boot-installer.xml:1587
 #, no-c-format
-#. Tag: title
 msgid "Booting NewWorld Macs from OpenFirmware"
 msgstr "Khởi động Mac kiểu mới từ OpenFirmware"
 
+#. Tag: para
 #: boot-installer.xml:1588
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "You will have already placed the <filename>vmlinux</filename>, "
-#| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
-#| "<filename>yaboot.conf</filename> files at the root level of your HFS "
-#| "partition in <xref linkend=\"files-newworld\"/>. You will now have to "
-#| "boot into OpenFirmware (see <xref linkend=\"invoking-openfirmware\"/>). "
-#| "At the prompt, type <informalexample><screen>\n"
-#| "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-#| "</screen></informalexample> replacing <replaceable>x</replaceable> with "
-#| "the partition number of the HFS partition where the kernel and yaboot "
-#| "files were placed, followed by a &enterkey;. On some machines, you may "
-#| "need to use <userinput>ide0:</userinput> instead of <userinput>hd:</"
-#| "userinput>. In a few more seconds you will see a yaboot prompt "
-#| "<informalexample><screen>\n"
-#| "boot:\n"
-#| "</screen></informalexample> At yaboot's <prompt>boot:</prompt> prompt, "
-#| "type either <userinput>install</userinput> or <userinput>install "
-#| "video=ofonly</userinput> followed by a &enterkey;. The "
-#| "<userinput>video=ofonly</userinput> argument is for maximum "
-#| "compatibility; you can try it if <userinput>install</userinput> doesn't "
-#| "work. The Debian installation program should start."
 msgid ""
 "You will have already placed the <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -2302,23 +2195,23 @@ msgstr ""
 "thích nhất, bạn cũng có thể thử dùng nó nếu <userinput>install</userinput> "
 "không đủ. Chương trình cài đặt &debian; nên khởi chạy."
 
+#. Tag: title
 #: boot-installer.xml:1620
 #, no-c-format
-#. Tag: title
 msgid "Booting from USB memory stick"
 msgstr "Khởi động từ thanh bộ nhớ USB"
 
+#. Tag: para
 #: boot-installer.xml:1621
 #, no-c-format
-#. Tag: para
 msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
 msgstr ""
 "Hiện thời, máy PowerMac kiểu mới được biết là hỗ trợ khả năng khởi động bằng "
 "USB."
 
+#. Tag: para
 #: boot-installer.xml:1627
 #, no-c-format
-#. Tag: para
 msgid ""
 "Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
 ">. To boot a Macintosh system from a USB stick, you will need to use the "
@@ -2330,9 +2223,9 @@ msgstr ""
 "sử dụng dấu nhắc Open Firmware, vì Open Firmware không tìm kiếm qua thiết bị "
 "lưu trữ USB theo mặc định. Xem <xref linkend=\"invoking-openfirmware\"/>."
 
+#. Tag: para
 #: boot-installer.xml:1636
 #, no-c-format
-#. Tag: para
 msgid ""
 "You will need to work out where the USB storage device appears in the device "
 "tree, since at the moment <command>ofpath</command> cannot work that out "
@@ -2353,9 +2246,9 @@ msgstr ""
 "<filename>/pci@f2000000/usb@1b,1/disk@1</filename> và <filename>/"
 "pci@f2000000/usb@1b,1/hub@1/disk@1</filename> hoạt động được."
 
+#. Tag: para
 #: boot-installer.xml:1648
 #, no-c-format
-#. Tag: para
 msgid ""
 "Having worked out the device path, use a command like this to boot the "
 "installer: <informalexample><screen>\n"
@@ -2379,9 +2272,9 @@ msgstr ""
 "tin có kiểu tập tin HFS « tbxi » (tức là <command>yaboot</command>) nằm "
 "trong thư mục đã được hiệu lực bằng lệnh <command>hattrib -b</command>."
 
+#. Tag: para
 #: boot-installer.xml:1662
 #, no-c-format
-#. Tag: para
 msgid ""
 "The system should now boot up, and you should be presented with the "
 "<prompt>boot:</prompt> prompt. Here you can enter optional boot arguments, "
@@ -2391,9 +2284,9 @@ msgstr ""
 "prompt> (khởi động). Vào đây bạn có thể nhập một số đối số khởi động tùy "
 "chọn, hoặc chỉ bấm phím &enterkey;."
 
+#. Tag: para
 #: boot-installer.xml:1668
 #, no-c-format
-#. Tag: para
 msgid ""
 "This boot method is new, and may be difficult to get to work on some "
 "NewWorld systems. If you have problems, please file an installation report, "
@@ -2403,17 +2296,17 @@ msgstr ""
 "trên một số hệ thống kiểu mới riêng. Nếu bạn có phải gặp khó khăn, xin hãy "
 "gởi báo cáo cài đặt, như được diễn tả trong <xref linkend=\"submit-bug\"/>."
 
+#. Tag: para
 #: boot-installer.xml:1701
 #, no-c-format
-#. Tag: para
 msgid "Currently, PReP and New World PowerMac systems support netbooting."
 msgstr ""
 "Hiện thời, các hệ thống PReP và PowerMac kiểu mới có hỗ trợ khả năng khởi "
 "động qua mạng."
 
+#. Tag: para
 #: boot-installer.xml:1705
 #, no-c-format
-#. Tag: para
 msgid ""
 "On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
 "monitor (see <xref linkend=\"invoking-openfirmware\"/>) and use the command "
@@ -2447,9 +2340,9 @@ msgstr ""
 "Motorola PowerStack), câu lệnh <userinput>help boot</userinput> cũng có thể "
 "diễn tả cú pháp và các tùy chọn sẵn sàng."
 
+#. Tag: para
 #: boot-installer.xml:1733
 #, no-c-format
-#. Tag: para
 msgid ""
 "Booting from floppies is supported for &arch-title;, although it is "
 "generally only applicable for OldWorld systems. NewWorld systems are not "
@@ -2460,9 +2353,9 @@ msgstr ""
 "dù nó thường thích hợp chỉ trên máy kiểu cũ. Máy kiểu mới không có ổ đĩa "
 "mềm, và khả năng khởi động từ ổ đĩa mềm USB đã gắn kết không được hỗ trợ."
 
+#. Tag: para
 #: boot-installer.xml:1745
 #, no-c-format
-#. Tag: para
 msgid ""
 "To boot from the <filename>boot-floppy-hfs.img</filename> floppy, place it "
 "in floppy drive after shutting the system down, and before pressing the "
@@ -2471,9 +2364,9 @@ msgstr ""
 "Để khởi động từ đĩa mềm <filename>boot-floppy-hfs.img</filename>, hãy nạp nó "
 "vào ổ đĩa mềm sau khi tắt hệ thống, còn trước khi bấm cái nút mở điện."
 
+#. Tag: para
 #: boot-installer.xml:1751
 #, no-c-format
-#. Tag: para
 msgid ""
 "For those not familiar with Macintosh floppy operations: a floppy placed in "
 "the machine prior to boot will be the first priority for the system to boot "
@@ -2485,9 +2378,9 @@ msgstr ""
 "khởi động hợp lệ sẽ bị đẩy ra, sau đó máy sẽ kiểm tra tìm phân vùng đĩa cứng "
 "có khả năng khởi động."
 
+#. Tag: para
 #: boot-installer.xml:1758
 #, no-c-format
-#. Tag: para
 msgid ""
 "After booting, the <filename>root.bin</filename> floppy is requested. Insert "
 "the root floppy and press &enterkey;. The installer program is automatically "
@@ -2497,15 +2390,15 @@ msgstr ""
 "nạp đĩa mềm gốc đó, rồi bấm phím &enterkey;. Chương trình cài đặt được khởi "
 "chạy tự động sau khi hệ thống gốc đã được tải vào bộ nhớ."
 
+#. Tag: title
 #: boot-installer.xml:1769
 #, no-c-format
-#. Tag: title
 msgid "PowerPC Boot Parameters"
 msgstr "Tham số khởi động máy PowerPC"
 
+#. Tag: para
 #: boot-installer.xml:1770
 #, no-c-format
-#. Tag: para
 msgid ""
 "Many older Apple monitors used a 640x480 67Hz mode. If your video appears "
 "skewed on an older Apple monitor, try appending the boot argument "
@@ -2520,9 +2413,9 @@ msgstr ""
 "128, đối số này thay đổi thành <userinput>video=aty128fb:vmode:6</"
 "userinput> ."
 
+#. Tag: para
 #: boot-installer.xml:1810
 #, no-c-format
-#. Tag: para
 msgid ""
 "On machines with OpenBoot, simply enter the boot monitor on the machine "
 "which is being installed (see <xref linkend=\"invoking-openboot\"/>). Use "
@@ -2540,9 +2433,9 @@ msgstr ""
 "TFTP và BOOTP hay DHCP. Cũng có thể gửi thêm tham số khởi động cho &d-i; ở "
 "kết thúc của lệnh <userinput>boot</userinput>."
 
+#. Tag: para
 #: boot-installer.xml:1865
 #, no-c-format
-#. Tag: para
 msgid ""
 "Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
 "which is simply an alias to boot from the SCSI device on ID 6 (or the "
@@ -2552,15 +2445,15 @@ msgstr ""
 "(khởi động đĩa CD-ROM) mà đơn giản là bí danh để khởi động từ thiết bị SCSI "
 "trên ID 6 (hay cái chủ phụ trên máy dựa vào IDE)."
 
+#. Tag: title
 #: boot-installer.xml:1874
 #, no-c-format
-#. Tag: title
 msgid "IDPROM Messages"
 msgstr "Thông điệp IDPROM"
 
+#. Tag: para
 #: boot-installer.xml:1875
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you cannot boot because you get messages about a problem with "
 "<quote>IDPROM</quote>, then it's possible that your NVRAM battery, which "
@@ -2573,15 +2466,15 @@ msgstr ""
 "<ulink url=\"&url-sun-nvram-faq;\">Sun NVRAM FAQ</ulink> để tìm thông tin "
 "thêm."
 
+#. Tag: title
 #: boot-installer.xml:1894
 #, no-c-format
-#. Tag: title
 msgid "Accessibility"
 msgstr "Khả năng truy cập"
 
+#. Tag: para
 #: boot-installer.xml:1895
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some users may need specific support because of e.g. some visual impairment. "
 "<phrase arch=\"ia64;powerpc;x86\">USB braille displays are detected "
@@ -2606,15 +2499,15 @@ msgstr ""
 "các kiến trúc, bộ nạp khởi động đọc bàn phím của bạn là một bàn phím kiểu "
 "QWERTY."
 
+#. Tag: title
 #: boot-installer.xml:1914
 #, no-c-format
-#. Tag: title
 msgid "USB Braille Displays"
 msgstr "Thiết bị chữ nổi USB"
 
+#. Tag: para
 #: boot-installer.xml:1915
 #, no-c-format
-#. Tag: para
 msgid ""
 "USB braille displays should be automatically detected. A textual version of "
 "the installer will then be automatically selected, and support for the "
@@ -2634,15 +2527,15 @@ msgstr ""
 "thiết bị chữ nổi cũng sẵn sàng ở trang Web của <ulink url=\"&url-brltty-"
 "driver-help;\"><classname>brltty</classname></ulink>."
 
+#. Tag: title
 #: boot-installer.xml:1930
 #, no-c-format
-#. Tag: title
 msgid "Serial Braille Displays"
 msgstr "Thiết bị chữ nổi nối tiếp"
 
+#. Tag: para
 #: boot-installer.xml:1931
 #, no-c-format
-#. Tag: para
 msgid ""
 "Serial braille displays cannot safely be automatically detected (since that "
 "may damage some of them). You thus need to append the "
@@ -2678,15 +2571,15 @@ msgstr ""
 "sẵn sàng trên trang Web của <ulink url=\"&url-brltty-driver-help;"
 "\"><classname>brltty</classname></ulink>."
 
+#. Tag: title
 #: boot-installer.xml:1953
 #, no-c-format
-#. Tag: title
 msgid "Hardware Speech Synthesis"
 msgstr "Phần cứng tổng hợp giọng nói"
 
+#. Tag: para
 #: boot-installer.xml:1954
 #, no-c-format
-#. Tag: para
 msgid ""
 "Support for hardware speech synthesis devices is available only alongside "
 "support for graphical installer. You thus need to select the "
@@ -2696,9 +2589,9 @@ msgstr ""
 "cài đặt đồ họa. Vì vậy bạn cần phải chọn mục <quote>Cài đặt đồ họa</quote> "
 "trong trình đơn khởi động."
 
+#. Tag: para
 #: boot-installer.xml:1960
 #, no-c-format
-#. Tag: para
 msgid ""
 "Hardware speech synthesis devices cannot be automatically detected. You thus "
 "need to append the <userinput>speakup.synth=<replaceable>driver</"
@@ -2717,15 +2610,15 @@ msgstr ""
 "bằng mã trình điều khiển cho thiết bị đó (xem <ulink url=\"&url-speakup-"
 "driver-codes;\">danh sách các mã trình điều khiển</ulink>)."
 
+#. Tag: title
 #: boot-installer.xml:1975
 #, no-c-format
-#. Tag: title
 msgid "Board Devices"
 msgstr "Thiết bị bảng"
 
+#. Tag: para
 #: boot-installer.xml:1976
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some accessibility devices are actual boards that are plugged inside the "
 "machine and that read text directly from the video memory. To get them to "
@@ -2740,9 +2633,9 @@ msgstr ""
 "<userinput>fb=false</userinput>. Tuy nhiên, việc này cũng giảm số các ngôn "
 "ngữ sẵn sàng."
 
+#. Tag: para
 #: boot-installer.xml:1984
 #, no-c-format
-#. Tag: para
 msgid ""
 "If desired a textual version of the bootloader can be activated before "
 "adding the boot parameter by typing <userinput>h</userinput> &enterkey;."
@@ -2751,15 +2644,15 @@ msgstr ""
 "động trước khi thêm tham số khởi động, bằng cách gõ chuỗi « <userinput>h</"
 "userinput> &enterkey; »."
 
+#. Tag: title
 #: boot-installer.xml:1992
 #, no-c-format
-#. Tag: title
 msgid "High-Contrast Theme"
 msgstr "Sắc thái cao tương phản"
 
+#. Tag: para
 #: boot-installer.xml:1993
 #, no-c-format
-#. Tag: para
 msgid ""
 "For users with low vision, the installer can use a high-contrast theme that "
 "makes it more readable. To enable it, append the <userinput>theme=dark</"
@@ -2769,9 +2662,9 @@ msgstr ""
 "tương phản mà làm cho nó dễ đọc hơn. Để hiệu lực sắc thái này, hãy phụ thêm "
 "tham số khởi động <userinput>theme=dark</userinput>."
 
+#. Tag: para
 #: boot-installer.xml:2008
 #, no-c-format
-#. Tag: para
 msgid ""
 "Boot parameters are Linux kernel parameters which are generally used to make "
 "sure that peripherals are dealt with properly. For the most part, the kernel "
@@ -2783,9 +2676,9 @@ msgstr ""
 "phát hiện tự động thông tin về các ngoại của máy tính. Tuy nhiên, trong một "
 "số trường hợp, bạn cần phải giúp đỡ hạt nhân một ít."
 
+#. Tag: para
 #: boot-installer.xml:2015
 #, no-c-format
-#. Tag: para
 msgid ""
 "If this is the first time you're booting the system, try the default boot "
 "parameters (i.e., don't try setting parameters) and see if it works "
@@ -2798,9 +2691,9 @@ msgstr ""
 "không, bạn có thể khởi động lại sau, cũng tìm tham số đặc biệt có thể báo hệ "
 "thống biết về phần cứng đó."
 
+#. Tag: para
 #: boot-installer.xml:2022
 #, no-c-format
-#. Tag: para
 msgid ""
 "Information on many boot parameters can be found in the <ulink url=\"http://"
 "www.tldp.org/HOWTO/BootPrompt-HOWTO.html\"> Linux BootPrompt HOWTO</ulink>, "
@@ -2815,9 +2708,9 @@ msgstr ""
 "đề thường cũng được bao gồm bên dưới trong <xref linkend=\"boot-"
 "troubleshooting\"/>."
 
+#. Tag: para
 #: boot-installer.xml:2031
 #, no-c-format
-#. Tag: para
 msgid ""
 "When the kernel boots, a message <informalexample><screen>\n"
 "Memory:<replaceable>avail</replaceable>k/<replaceable>total</replaceable>k "
@@ -2843,9 +2736,9 @@ msgstr ""
 "quote> đại diện megabyte. Ví dụ, mỗi chuỗi <userinput>mem=65536k</userinput> "
 "và <userinput>mem=64m</userinput> có nghĩa là 64MB bộ nhớ RAM."
 
+#. Tag: para
 #: boot-installer.xml:2047
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are booting with a serial console, generally the kernel will "
 "autodetect this. If you have a videocard (framebuffer) and a keyboard also "
@@ -2876,9 +2769,9 @@ msgstr ""
 "literal>, <literal>dumb</literal>. Giá trị mặc định cho bàn giáo tiếp nối "
 "tiếp trong &d-i; là <userinput>vt102</userinput>. </para> </footnote>."
 
+#. Tag: para
 #: boot-installer.xml:2071
 #, no-c-format
-#. Tag: para
 msgid ""
 "For &arch-title; the serial devices are <filename>ttya</filename> or "
 "<filename>ttyb</filename>. Alternatively, set the <envar>input-device</"
@@ -2890,16 +2783,15 @@ msgstr ""
 "bị nhập <envar>input-device</envar> và thiết bị xuất <envar>output-device</"
 "envar> thành <filename>ttya</filename>."
 
+#. Tag: title
 #: boot-installer.xml:2082
 #, no-c-format
-#. Tag: title
-#| msgid "Debian Installer Parameters"
 msgid "&debian; Installer Parameters"
 msgstr "Tham số trình cài đặt &debian;"
 
+#. Tag: para
 #: boot-installer.xml:2083
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installation system recognizes a few additional boot "
 "parameters<footnote> <para> With current kernels (2.6.9 or newer) you can "
@@ -2911,9 +2803,9 @@ msgstr ""
 "32 tùy chọn dòng lệnh và 32 tùy chọn môi trường. Vượt quá số này thì hạt "
 "nhân không thể phục hồi.</para> </footnote> có thể hữu ích."
 
+#. Tag: para
 #: boot-installer.xml:2096
 #, no-c-format
-#. Tag: para
 msgid ""
 "A number of parameters have a <quote>short form</quote> that helps avoid the "
 "limitations of the kernel command line options and makes entering the "
@@ -2927,21 +2819,21 @@ msgstr ""
 "thí dụ trong sổ tay này cũng thường dùng dạng ngắn."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2108
 #, no-c-format
-#. Tag: term
 msgid "debconf/priority (priority)"
 msgstr "debconf/priority (priority)"
 
+#. Tag: para
 #: boot-installer.xml:2109
 #, no-c-format
-#. Tag: para
 msgid "This parameter sets the lowest priority of messages to be displayed."
 msgstr "Tham số này đặt ưu tiên thấp nhất cho những thông điệp cần hiển thị."
 
+#. Tag: para
 #: boot-installer.xml:2113
 #, no-c-format
-#. Tag: para
 msgid ""
 "The default installation uses <userinput>priority=high</userinput>. This "
 "means that both high and critical priority messages are shown, but medium "
@@ -2953,9 +2845,9 @@ msgstr ""
 "hạn, còn bỏ qua những thông điệp ưu tiên vừa và thấp. Nếu gặp lỗi, trình cài "
 "đặt điều chỉnh ưu tiên như cần thiết."
 
+#. Tag: para
 #: boot-installer.xml:2120
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you add <userinput>priority=medium</userinput> as boot parameter, you "
 "will be shown the installation menu and gain more control over the "
@@ -2975,15 +2867,15 @@ msgstr ""
 "tương tác nhiều."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2134
 #, no-c-format
-#. Tag: term
 msgid "DEBIAN_FRONTEND"
 msgstr "DEBIAN_FRONTEND"
 
+#. Tag: para
 #: boot-installer.xml:2135
 #, no-c-format
-#. Tag: para
 msgid ""
 "This boot parameter controls the type of user interface used for the "
 "installer. The current possible parameter settings are: <itemizedlist> "
@@ -3015,15 +2907,15 @@ msgstr ""
 "<userinput>gtk</userinput>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2164
 #, no-c-format
-#. Tag: term
 msgid "BOOT_DEBUG"
 msgstr "BOOT_DEBUG"
 
+#. Tag: para
 #: boot-installer.xml:2165
 #, no-c-format
-#. Tag: para
 msgid ""
 "Setting this boot parameter to 2 will cause the installer's boot process to "
 "be verbosely logged. Setting it to 3 makes debug shells available at "
@@ -3037,54 +2929,54 @@ msgstr ""
 "trình khởi động.)"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: userinput
 #: boot-installer.xml:2174
 #, no-c-format
-#. Tag: userinput
 msgid "BOOT_DEBUG=0"
 msgstr "BOOT_DEBUG=0"
 
+#. Tag: para
 #: boot-installer.xml:2175
 #, no-c-format
-#. Tag: para
 msgid "This is the default."
 msgstr "Đây là giá trị mặc định."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: userinput
 #: boot-installer.xml:2179
 #, no-c-format
-#. Tag: userinput
 msgid "BOOT_DEBUG=1"
 msgstr "BOOT_DEBUG=1"
 
+#. Tag: para
 #: boot-installer.xml:2180
 #, no-c-format
-#. Tag: para
 msgid "More verbose than usual."
 msgstr "Chi tiết hơn cấp thường."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: userinput
 #: boot-installer.xml:2184
 #, no-c-format
-#. Tag: userinput
 msgid "BOOT_DEBUG=2"
 msgstr "BOOT_DEBUG=2"
 
+#. Tag: para
 #: boot-installer.xml:2185
 #, no-c-format
-#. Tag: para
 msgid "Lots of debugging information."
 msgstr "Xuất rất nhiều thông tin gỡ lỗi."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: userinput
 #: boot-installer.xml:2189
 #, no-c-format
-#. Tag: userinput
 msgid "BOOT_DEBUG=3"
 msgstr "BOOT_DEBUG=3"
 
+#. Tag: para
 #: boot-installer.xml:2190
 #, no-c-format
-#. Tag: para
 msgid ""
 "Shells are run at various points in the boot process to allow detailed "
 "debugging. Exit the shell to continue the boot."
@@ -3094,29 +2986,27 @@ msgstr ""
 "động."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2204
 #, no-c-format
-#. Tag: term
 msgid "INSTALL_MEDIA_DEV"
 msgstr "INSTALL_MEDIA_DEV"
 
+#. Tag: para
 #: boot-installer.xml:2205
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The value of the parameter is the path to the device to load the Debian "
-#| "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
-#| "userinput>"
 msgid ""
 "The value of the parameter is the path to the device to load the &debian; "
 "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
 "userinput>"
 msgstr ""
-"Giá trị của tham số này (thiết bị vật chứa cài đặt) là đường dẫn đến thiết bị từ đó cần nạp trình cài đặt &debian;. Ví dụ, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
+"Giá trị của tham số này (thiết bị vật chứa cài đặt) là đường dẫn đến thiết "
+"bị từ đó cần nạp trình cài đặt &debian;. Ví dụ, "
+"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
 
+#. Tag: para
 #: boot-installer.xml:2211
 #, no-c-format
-#. Tag: para
 msgid ""
 "The boot floppy, which normally scans all floppies it can to find the root "
 "floppy, can be overridden by this parameter to only look at the one device."
@@ -3125,15 +3015,15 @@ msgstr ""
 "thể bị lọc bởi tham số này để phát hiện chỉ một thiết bị thôi."
 
 # Name: don't translate/Tên: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2221
 #, no-c-format
-#. Tag: term
 msgid "lowmem"
 msgstr "lowmem"
 
+#. Tag: para
 #: boot-installer.xml:2222
 #, no-c-format
-#. Tag: para
 msgid ""
 "Can be used to force the installer to a lowmem level higher than the one the "
 "installer sets by default based on available memory. Possible values are 1 "
@@ -3144,15 +3034,15 @@ msgstr ""
 "Giá trị có thể là 1 và 2. Xem thêm <xref linkend=\"lowmem\"/>."
 
 # nghĩa chữ ?
+#. Tag: term
 #: boot-installer.xml:2232
 #, no-c-format
-#. Tag: term
 msgid "noshell"
 msgstr "noshell"
 
+#. Tag: para
 #: boot-installer.xml:2233
 #, no-c-format
-#. Tag: para
 msgid ""
 "Prevents the installer from offering interactive shells on tty2 and tty3. "
 "Useful for unattended installations where physical security is limited."
@@ -3162,15 +3052,15 @@ msgstr ""
 "nhập."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2242
 #, no-c-format
-#. Tag: term
 msgid "debian-installer/framebuffer (fb)"
 msgstr "debian-installer/framebuffer (fb)"
 
+#. Tag: para
 #: boot-installer.xml:2243
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some architectures use the kernel framebuffer to offer installation in a "
 "number of languages. If framebuffer causes a problem on your system you can "
@@ -3187,15 +3077,15 @@ msgstr ""
 "filename> hay <filename>bogl</filename>, màn hình trống hay hệ thống đông "
 "đặc trong vòng vài phút sau khi khởi chạy tiến trình cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:2252
 #, no-c-format
-#. Tag: para
 msgid "Such problems have been reported on hppa."
 msgstr "Lỗi như vậy đã được thông báo trên máy kiểu hppa."
 
+#. Tag: para
 #: boot-installer.xml:2256
 #, no-c-format
-#. Tag: para
 msgid ""
 "Because of display problems on some systems, framebuffer support is "
 "<emphasis>disabled by default</emphasis> for &arch-title;. This can result "
@@ -3213,15 +3103,15 @@ msgstr ""
 "đúng); dạng ngắn là <userinput>fb=true</userinput>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2270
 #, no-c-format
-#. Tag: term
 msgid "debian-installer/theme (theme)"
 msgstr "debian-installer/theme (theme)"
 
+#. Tag: para
 #: boot-installer.xml:2271
 #, no-c-format
-#. Tag: para
 msgid ""
 "A theme determines how the user interface of the installer looks (colors, "
 "icons, etc.). What themes are available differs per frontend. Currently both "
@@ -3236,16 +3126,15 @@ msgstr ""
 "tham số <userinput>theme=<replaceable>dark</replaceable></userinput>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: boot-installer.xml:2283
-#: boot-installer.xml:2514
-#, no-c-format
 #. Tag: term
+#: boot-installer.xml:2283 boot-installer.xml:2514
+#, no-c-format
 msgid "netcfg/disable_dhcp"
 msgstr "netcfg/disable_dhcp"
 
+#. Tag: para
 #: boot-installer.xml:2284
 #, no-c-format
-#. Tag: para
 msgid ""
 "By default, the &d-i; automatically probes for network configuration via "
 "DHCP. If the probe succeeds, you won't have a chance to review and change "
@@ -3257,9 +3146,9 @@ msgstr ""
 "được lấy. Bạn có thể tới bước tự thiết lập mạng chỉ trong trường hợp gặp lỗi "
 "thăm dò DCHP."
 
+#. Tag: para
 #: boot-installer.xml:2291
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have a DHCP server on your local network, but want to avoid it "
 "because e.g. it gives wrong answers, you can use the parameter "
@@ -3272,15 +3161,15 @@ msgstr ""
 "bằng DHCP, cũng để tự nhập thông tin đó."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2302
 #, no-c-format
-#. Tag: term
 msgid "hw-detect/start_pcmcia"
 msgstr "hw-detect/start_pcmcia"
 
+#. Tag: para
 #: boot-installer.xml:2303
 #, no-c-format
-#. Tag: para
 msgid ""
 "Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
 "that causes problems. Some laptops are well known for this misbehavior."
@@ -3290,21 +3179,15 @@ msgstr ""
 "tiếng do trường hợp lỗi này."
 
 # Literal: don't translate/Nghĩa chữ : đừng dịch
+#. Tag: term
 #: boot-installer.xml:2313
 #, no-c-format
-#. Tag: term
 msgid "disk-detect/dmraid/enable (dmraid)"
 msgstr "disk-detect/dmraid/enable (dmraid)"
 
+#. Tag: para
 #: boot-installer.xml:2314
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
-#| "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. "
-#| "Note that this support is currently experimental. Additional information "
-#| "can be found on the <ulink url=\"&url-d-i-wiki;\">Debian Installer Wiki</"
-#| "ulink>."
 msgid ""
 "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
 "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. Note "
@@ -3313,18 +3196,20 @@ msgid ""
 msgstr ""
 "Lập thành <userinput>true</userinput> (đúng) để hiệu lực hỗ trợ đĩa kiểu "
 "RAID ATA nối tiếp (Serial ATA RAID, cũng được gọi là ATA RAID, BIOS RAID hay "
-"RAID giả) trong trình cài đặt. Ghi chú rằng hỗ trợ này hiện thời vẫn còn thực nghiệm. Tìm thêm thông tin ở <ulink url=\"&url-d-i-wiki;\">Wiki Cài Đặt &debian;</ulink>."
+"RAID giả) trong trình cài đặt. Ghi chú rằng hỗ trợ này hiện thời vẫn còn "
+"thực nghiệm. Tìm thêm thông tin ở <ulink url=\"&url-d-i-wiki;\">Wiki Cài Đặt "
+"&debian;</ulink>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2325
 #, no-c-format
-#. Tag: term
 msgid "preseed/url (url)"
 msgstr "preseed/url (url)"
 
+#. Tag: para
 #: boot-installer.xml:2326
 #, no-c-format
-#. Tag: para
 msgid ""
 "Specify the url to a preconfiguration file to download and use for "
 "automating the install. See <xref linkend=\"automatic-install\"/>."
@@ -3333,15 +3218,15 @@ msgstr ""
 "tự động hoá tiến trình cài đặt. Xem <xref linkend=\"automatic-install\"/>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2335
 #, no-c-format
-#. Tag: term
 msgid "preseed/file (file)"
 msgstr "preseed/file (file)"
 
+#. Tag: para
 #: boot-installer.xml:2336
 #, no-c-format
-#. Tag: para
 msgid ""
 "Specify the path to a preconfiguration file to load for automating the "
 "install. See <xref linkend=\"automatic-install\"/>."
@@ -3350,15 +3235,15 @@ msgstr ""
 "trình cài đặt. Xem <xref linkend=\"automatic-install\"/>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2345
 #, no-c-format
-#. Tag: term
 msgid "preseed/interactive"
 msgstr "preseed/interactive"
 
+#. Tag: para
 #: boot-installer.xml:2346
 #, no-c-format
-#. Tag: para
 msgid ""
 "Set to <userinput>true</userinput> to display questions even if they have "
 "been preseeded. Can be useful for testing or debugging a preconfiguration "
@@ -3373,15 +3258,15 @@ msgstr ""
 "Xem thêm <xref linkend=\"preseed-seenflag\"/>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2358
 #, no-c-format
-#. Tag: term
 msgid "auto-install/enable (auto)"
 msgstr "auto-install/enable (auto)"
 
+#. Tag: para
 #: boot-installer.xml:2359
 #, no-c-format
-#. Tag: para
 msgid ""
 "Delay questions that are normally asked before preseeding is possible until "
 "after the network is configured. See <xref linkend=\"preseed-auto\"/> for "
@@ -3392,15 +3277,15 @@ msgstr ""
 "về cách sử dụng tùy chọn này để tự động hoá tiến trình cài đặt."
 
 # Literal: don't translate/Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2370
 #, no-c-format
-#. Tag: term
 msgid "finish-install/keep-consoles"
 msgstr "finish-install/keep-consoles"
 
+#. Tag: para
 #: boot-installer.xml:2371
 #, no-c-format
-#. Tag: para
 msgid ""
 "During installations from serial or management console, the regular virtual "
 "consoles (VT1 to VT6) are normally disabled in <filename>/etc/inittab</"
@@ -3412,15 +3297,15 @@ msgstr ""
 "trường hợp này."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2382
 #, no-c-format
-#. Tag: term
 msgid "cdrom-detect/eject"
 msgstr "cdrom-detect/eject"
 
+#. Tag: para
 #: boot-installer.xml:2383
 #, no-c-format
-#. Tag: para
 msgid ""
 "By default, before rebooting, &d-i; automatically ejects the optical media "
 "used during the installation. This can be unnecessary if the system does not "
@@ -3437,9 +3322,9 @@ msgstr ""
 "nạp. Nhiều ổ đĩa nạp khe, hình thon, và kiểu ngăn kéo không thể tải lại tự "
 "động vật chứa."
 
+#. Tag: para
 #: boot-installer.xml:2392
 #, no-c-format
-#. Tag: para
 msgid ""
 "Set to <userinput>false</userinput> to disable automatic ejection, and be "
 "aware that you may need to ensure that the system does not automatically "
@@ -3450,15 +3335,15 @@ msgstr ""
 "động từ ổ đĩa quang sau khi việc cài đặt ban đầu."
 
 # nghĩa chữ ?
+#. Tag: term
 #: boot-installer.xml:2403
 #, no-c-format
-#. Tag: term
 msgid "base-installer/install-recommends (recommends)"
 msgstr "base-installer/install-recommends (khuyến khích)"
 
+#. Tag: para
 #: boot-installer.xml:2404
 #, no-c-format
-#. Tag: para
 msgid ""
 "By setting this option to <userinput>false</userinput>, the package "
 "management system will be configured to not automatically install "
@@ -3470,9 +3355,9 @@ msgstr ""
 "các gói có nhãn <quote>Khuyên</quote>, cả hai trong tiến trình cài đặt và "
 "cho hệ thống được cài đặt. Xem thêm <xref linkend=\"di-install-base\"/>."
 
+#. Tag: para
 #: boot-installer.xml:2411
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that this option allows to have a leaner system, but can also result in "
 "features being missing that you might normally expect to be available. You "
@@ -3487,15 +3372,15 @@ msgstr ""
 "dùng cấp cao."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2423
 #, no-c-format
-#. Tag: term
 msgid "debian-installer/allow_unauthenticated"
 msgstr "debian-installer/allow_unauthenticated"
 
+#. Tag: para
 #: boot-installer.xml:2424
 #, no-c-format
-#. Tag: para
 msgid ""
 "By default the installer requires that repositories be authenticated using a "
 "known gpg key. Set to <userinput>true</userinput> to disable that "
@@ -3508,15 +3393,15 @@ msgstr ""
 "khuyến khích.</emphasis>"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2435
 #, no-c-format
-#. Tag: term
 msgid "ramdisk_size"
 msgstr "ramdisk_size"
 
+#. Tag: para
 #: boot-installer.xml:2436
 #, no-c-format
-#. Tag: para
 msgid ""
 "This parameter should already be set to a correct value where needed; set it "
 "only it you see errors during the boot that indicate the ramdisk could not "
@@ -3527,15 +3412,15 @@ msgstr ""
 "(Giá trị theo kB.)"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2446
 #, no-c-format
-#. Tag: term
 msgid "rescue/enable"
 msgstr "rescue/enable"
 
+#. Tag: para
 #: boot-installer.xml:2447
 #, no-c-format
-#. Tag: para
 msgid ""
 "Set to <userinput>true</userinput> to enter rescue mode rather than "
 "performing a normal installation. See <xref linkend=\"rescue\"/>."
@@ -3543,15 +3428,15 @@ msgstr ""
 "(Cứu/bật) Đặt thành <userinput>true</userinput> (đúng) để vào chế độ cứu, "
 "hơn là chạy tiến trình cài đặt chuẩn. Xem <xref linkend=\"rescue\"/>."
 
+#. Tag: title
 #: boot-installer.xml:2458
 #, no-c-format
-#. Tag: title
 msgid "Using boot parameters to answer questions"
 msgstr "Dùng tham số khởi động để trả lời câu hỏi"
 
+#. Tag: para
 #: boot-installer.xml:2459
 #, no-c-format
-#. Tag: para
 msgid ""
 "With some exceptions, a value can be set at the boot prompt for any question "
 "asked during the installation, though this is only really useful in specific "
@@ -3563,29 +3448,29 @@ msgstr ""
 "một số trường hợp riêng."
 
 # nghĩa chữ ?
+#. Tag: term
 #: boot-installer.xml:2471
 #, no-c-format
-#. Tag: term
 msgid "debian-installer/language (language)"
 msgstr "debian-installer/language (ngôn ngữ)"
 
 # nghĩa chữ ?
+#. Tag: term
 #: boot-installer.xml:2472
 #, no-c-format
-#. Tag: term
 msgid "debian-installer/country (country)"
 msgstr "debian-installer/country (quốc gia)"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: term
 #: boot-installer.xml:2473
 #, no-c-format
-#. Tag: term
 msgid "debian-installer/locale (locale)"
 msgstr "debian-installer/locale (locale)"
 
+#. Tag: para
 #: boot-installer.xml:2474
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are two ways to specify the language, country and locale to use for "
 "the installation and the installed system."
@@ -3593,9 +3478,9 @@ msgstr ""
 "Có hai phương pháp ghi rõ ngôn ngữ, quốc gia và miền địa phương cần dùng cho "
 "tiến trình cài đặt và hệ thống được cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:2479
 #, no-c-format
-#. Tag: para
 msgid ""
 "The first and easiest is to pass only the parameter <literal>locale</"
 "literal>. Language and country will then be derived from its value. You can "
@@ -3613,9 +3498,9 @@ msgstr ""
 "cài đặt). Tuy nhiên, chỉ có thể truy cập đến những miền địa phương có sẵn "
 "trong hệ thống thôi."
 
+#. Tag: para
 #: boot-installer.xml:2488
 #, no-c-format
-#. Tag: para
 msgid ""
 "The second, more flexible option is to specify <literal>language</literal> "
 "and <literal>country</literal> separately. In this case <literal>locale</"
@@ -3630,15 +3515,15 @@ msgstr ""
 "<userinput>language=vi country=AU locale=vi.UTF-8</userinput>."
 
 # Literal: don't translate/Nghĩa chữ : đừng dịch
+#. Tag: term
 #: boot-installer.xml:2500
 #, no-c-format
-#. Tag: term
 msgid "anna/choose_modules (modules)"
 msgstr "anna/choose_modules (modules)"
 
+#. Tag: para
 #: boot-installer.xml:2501
 #, no-c-format
-#. Tag: para
 msgid ""
 "Can be used to automatically load installer components that are not loaded "
 "by default. Examples of optional components that may be useful are "
@@ -3652,9 +3537,9 @@ msgstr ""
 "command> trong khi cài đặt)<phrase arch=\"not-s390\"> và <classname>ppp-"
 "udeb</classname> (xem <xref linkend=\"pppoe\"/>)</phrase>."
 
+#. Tag: para
 #: boot-installer.xml:2515
 #, no-c-format
-#. Tag: para
 msgid ""
 "Set to <userinput>true</userinput> if you want to disable DHCP and instead "
 "force static network configuration."
@@ -3662,22 +3547,15 @@ msgstr ""
 "Đặt thành <userinput>true</userinput> (đúng) nếu bạn muốn tắt dịch vụ DHCP "
 "và ép buộc cấu hình mạng tĩnh thay thế."
 
+#. Tag: term
 #: boot-installer.xml:2524
 #, no-c-format
-#. Tag: term
 msgid "mirror/protocol (protocol)"
 msgstr "mirror/protocol (protocol)"
 
+#. Tag: para
 #: boot-installer.xml:2525
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "By default the installer will use the http protocol to download files "
-#| "from Debian mirrors and changing that to ftp is not possible during "
-#| "installations at normal priority. By setting this parameter to "
-#| "<userinput>ftp</userinput>, you can force the installer to use that "
-#| "protocol instead. Note that you cannot select an ftp mirror from a list, "
-#| "you have to enter the hostname manually."
 msgid ""
 "By default the installer will use the http protocol to download files from "
 "&debian; mirrors and changing that to ftp is not possible during "
@@ -3686,18 +3564,23 @@ msgid ""
 "instead. Note that you cannot select an ftp mirror from a list, you have to "
 "enter the hostname manually."
 msgstr ""
-"Mặc định là trình cài đặt sử dụng giao thức HTTP để tải các tập tin xuống máy nhân bản &debian;. Không thể thay đổi sang FTP trong khi cài đặt ở mức ưu tiên bình thường. Bằng cách lập tham số này thành <userinput>ftp</userinput>, bạn ép buộc trình cài đặt sử dụng giao thức FTP thay cho HTTP. Ghi chú rằng bạn không thể chọn một máy nhân bản FTP từ danh sách: bạn cần phải tự gõ tên máy."
+"Mặc định là trình cài đặt sử dụng giao thức HTTP để tải các tập tin xuống "
+"máy nhân bản &debian;. Không thể thay đổi sang FTP trong khi cài đặt ở mức "
+"ưu tiên bình thường. Bằng cách lập tham số này thành <userinput>ftp</"
+"userinput>, bạn ép buộc trình cài đặt sử dụng giao thức FTP thay cho HTTP. "
+"Ghi chú rằng bạn không thể chọn một máy nhân bản FTP từ danh sách: bạn cần "
+"phải tự gõ tên máy."
 
 # Literal: don't translate/Nghĩa chữ : đừng dịch
+#. Tag: term
 #: boot-installer.xml:2538
 #, no-c-format
-#. Tag: term
 msgid "tasksel:tasksel/first (tasks)"
 msgstr "tasksel:tasksel/first (tasks)"
 
+#. Tag: para
 #: boot-installer.xml:2539
 #, no-c-format
-#. Tag: para
 msgid ""
 "Can be used to select tasks that are not available from the interactive task "
 "list, such as the <literal>kde-desktop</literal> task. See <xref linkend="
@@ -3707,15 +3590,15 @@ msgstr ""
 "việc tương tác, v.d. công việc  <literal>kde-desktop</literal>. Xem <xref "
 "linkend=\"pkgsel\"/> để tìm thông tin thêm."
 
+#. Tag: title
 #: boot-installer.xml:2553
 #, no-c-format
-#. Tag: title
 msgid "Passing parameters to kernel modules"
 msgstr "Gửi tham số cho mô-đun hạt nhân"
 
+#. Tag: para
 #: boot-installer.xml:2554
 #, no-c-format
-#. Tag: para
 msgid ""
 "If drivers are compiled into the kernel, you can pass parameters to them as "
 "described in the kernel documentation. However, if drivers are compiled as "
@@ -3737,9 +3620,9 @@ msgstr ""
 "dùng khi mô-đun thật được nạp. Các tham số này cũng sẽ tự động được gồm "
 "trong cấu hình cho hệ thống đã cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:2567
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that it is now quite rare that parameters need to be passed to modules. "
 "In most cases the kernel will be able to probe the hardware present in a "
@@ -3751,9 +3634,9 @@ msgstr ""
 "các giá trị mặc định có ích. Tuy nhiên, trong một số trường hợp riêng, vẫn "
 "cần phải tự đặt tham số."
 
+#. Tag: para
 #: boot-installer.xml:2574
 #, no-c-format
-#. Tag: para
 msgid ""
 "The syntax to use to set parameters for modules is: "
 "<informalexample><screen>\n"
@@ -3773,21 +3656,21 @@ msgstr ""
 "IRQ10, bạn cần gửi:"
 
 # Literal: don't translate/Nghĩa chữ : đừng dịch
+#. Tag: screen
 #: boot-installer.xml:2584
 #, no-c-format
-#. Tag: screen
 msgid "3c509.xcvr=3 3c509.irq=10"
 msgstr "3c509.xcvr=3 3c509.irq=10"
 
+#. Tag: title
 #: boot-installer.xml:2590
 #, no-c-format
-#. Tag: title
 msgid "Blacklisting kernel modules"
 msgstr "Cấm mô-đun hạt nhân"
 
+#. Tag: para
 #: boot-installer.xml:2591
 #, no-c-format
-#. Tag: para
 msgid ""
 "Sometimes it may be necessary to blacklist a module to prevent it from being "
 "loaded automatically by the kernel and udev. One reason could be that a "
@@ -3803,9 +3686,9 @@ msgstr ""
 "hoạt động được nếu những trình điều khiển xung đột, hoặc nếu trình điều "
 "khiển không đúng được nạp trước."
 
+#. Tag: para
 #: boot-installer.xml:2600
 #, no-c-format
-#. Tag: para
 msgid ""
 "You can blacklist a module using the following syntax: "
 "<userinput><replaceable>module_name</replaceable>.blacklist=yes</userinput>. "
@@ -3819,9 +3702,9 @@ msgstr ""
 "blacklist.local</filename>, cả hai trong tiến trình cài đặt, và trên hệ "
 "thống được cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:2608
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that a module may still be loaded by the installation system itself. "
 "You can prevent that from happening by running the installation in expert "
@@ -3833,21 +3716,21 @@ msgstr ""
 "đặt trong chế độ chuyên môn và bỏ chọn mô-đun đó trong danh sách các mô-đun "
 "được hiển thị trong những giải đoạn phát hiện phần cứng."
 
+#. Tag: title
 #: boot-installer.xml:2625
 #, no-c-format
-#. Tag: title
 msgid "Troubleshooting the Installation Process"
 msgstr "Giải đáp thắc mắc trong tiến trình cài đặt"
 
+#. Tag: title
 #: boot-installer.xml:2630
 #, no-c-format
-#. Tag: title
 msgid "CD-ROM Reliability"
 msgstr "Sự đáng tin cậy của đĩa CD-ROM"
 
+#. Tag: para
 #: boot-installer.xml:2631
 #, no-c-format
-#. Tag: para
 msgid ""
 "Sometimes, especially with older CD-ROM drives, the installer may fail to "
 "boot from a CD-ROM. The installer may also &mdash; even after booting "
@@ -3859,9 +3742,9 @@ msgstr ""
 "từ đĩa CD-ROM &mdash; có thể không nhận ra đĩa CD-ROM đó, hoặc trả lại lỗi "
 "trong khi đọc nó trong tiến trình cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:2638
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are many different possible causes for these problems. We can only "
 "list some common issues and provide general suggestions on how to deal with "
@@ -3871,15 +3754,15 @@ msgstr ""
 "thể liệt kê một số vấn đề thường và cung cấp lời đề nghị chung về cách quyết "
 "định chúng. Theo bạn sửa."
 
+#. Tag: para
 #: boot-installer.xml:2644
 #, no-c-format
-#. Tag: para
 msgid "There are two very simple things that you should try first."
 msgstr "Khuyên bạn trước tiên thử hai việc rất đơn giản."
 
+#. Tag: para
 #: boot-installer.xml:2649
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the CD-ROM does not boot, check that it was inserted correctly and that "
 "it is not dirty."
@@ -3887,9 +3770,9 @@ msgstr ""
 "Nếu đĩa CD-ROM không khởi động được, hãy kiểm tra xem nó đã được nạp đúng và "
 "nó không dơ bẩn."
 
+#. Tag: para
 #: boot-installer.xml:2655
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the installer fails to recognize a CD-ROM, try just running the option "
 "<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </"
@@ -3901,9 +3784,9 @@ msgstr ""
 "menuchoice> lần thứ hai. Đối với ổ đĩa CD-ROM cũ, một số vấn đề liên quan "
 "đến DMA đã được quyết định bằng cách này."
 
+#. Tag: para
 #: boot-installer.xml:2665
 #, no-c-format
-#. Tag: para
 msgid ""
 "If this does not work, then try the suggestions in the subsections below. "
 "Most, but not all, suggestions discussed there are valid for both CD-ROM and "
@@ -3913,9 +3796,9 @@ msgstr ""
 "lớn, nhưng không phải tất cả các lời đề nghị được nói ở đó vẫn còn hợp lệ "
 "cho cả hai đĩa CD và DVD, nhưng nói về đĩa CD-ROM vì đơn giản hơn."
 
+#. Tag: para
 #: boot-installer.xml:2671
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you cannot get the installation working from CD-ROM, try one of the other "
 "installation methods that are available."
@@ -3923,15 +3806,15 @@ msgstr ""
 "Không cài đặt được từ đĩa CD-ROM thì hãy thử một của những phương pháp cài "
 "đặt khác sẵn sàng."
 
+#. Tag: title
 #: boot-installer.xml:2679
 #, no-c-format
-#. Tag: title
 msgid "Common issues"
 msgstr "Vấn đề thường gặp"
 
+#. Tag: para
 #: boot-installer.xml:2682
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some older CD-ROM drives do not support reading from discs that were burned "
 "at high speeds using a modern CD writer."
@@ -3939,9 +3822,9 @@ msgstr ""
 "Một số ổ đĩa CD-ROM cũ không hỗ trợ khả năng đọc từ đĩa đã được chép ra ở "
 "tốc độ cao bằng bộ ghi CD hiện đại."
 
+#. Tag: para
 #: boot-installer.xml:2688
 #, no-c-format
-#. Tag: para
 msgid ""
 "If your system boots correctly from the CD-ROM, it does not necessarily mean "
 "that &arch-kernel; also supports the CD-ROM (or, more correctly, the "
@@ -3951,9 +3834,9 @@ msgstr ""
 "&arch-kernel; cũng hỗ trợ đĩa CD-ROM đó (hoặc, đúng hơn, bộ điều khiển tới "
 "đó ổ đĩa CD-ROM được kết nối)."
 
+#. Tag: para
 #: boot-installer.xml:2695
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some older CD-ROM drives do not work correctly if <quote>direct memory "
 "access</quote> (DMA) is enabled."
@@ -3961,22 +3844,22 @@ msgstr ""
 "Một số ổ đĩa CD-ROM cũ không hoạt động được nếu <quote>khả năng truy cập bộ "
 "nhớ trực tiếp</quote> (DMA) được hiệu lực."
 
+#. Tag: title
 #: boot-installer.xml:2706
 #, no-c-format
-#. Tag: title
 msgid "How to investigate and maybe solve issues"
 msgstr "Cách xem xét và có thể quyết định vấn đề"
 
+#. Tag: para
 #: boot-installer.xml:2707
 #, no-c-format
-#. Tag: para
 msgid "If the CD-ROM fails to boot, try the suggestions listed below."
 msgstr ""
 "Đĩa CD-ROM không khởi động được thì hãy thử những lời đề nghị bên dưới."
 
+#. Tag: para
 #: boot-installer.xml:2712
 #, no-c-format
-#. Tag: para
 msgid ""
 "Check that your BIOS actually supports booting from CD-ROM (older systems "
 "possibly don't) and that your CD-ROM drive supports the media you are using."
@@ -3984,9 +3867,9 @@ msgstr ""
 "Kiểm tra xem BIOS thật hỗ trợ khả năng khởi động từ đĩa CD-ROM (có lẽ hệ "
 "thống cũ không phải) và ổ đĩa CD-ROM hỗ trợ kiểu vật chứa đang được dùng."
 
+#. Tag: para
 #: boot-installer.xml:2718
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you downloaded an iso image, check that the md5sum of that image matches "
 "the one listed for the image in the <filename>MD5SUMS</filename> file that "
@@ -4011,9 +3894,9 @@ msgstr ""
 "để đọc số byte đúng từ đĩa CD-ROM."
 
 # Literal: don't translate/Nghĩa chữ : đừng dịch
+#. Tag: screen
 #: boot-installer.xml:2731
 #, no-c-format
-#. Tag: screen
 msgid ""
 "$ dd if=/dev/cdrom | \\\n"
 "> head -c `stat --format=%s <replaceable>debian-testing-i386-netinst.iso</"
@@ -4037,9 +3920,9 @@ msgstr ""
 "copied\t\tđã sao chép\n"
 "seconds\t\tgiây]"
 
+#. Tag: para
 #: boot-installer.xml:2736
 #, no-c-format
-#. Tag: para
 msgid ""
 "If, after the installer has been booted successfully, the CD-ROM is not "
 "detected, sometimes simply trying again may solve the problem. If you have "
@@ -4058,9 +3941,9 @@ msgstr ""
 "làm như thế. Để chạy lệnh nào nói dưới, trước tiên bạn cần chuyển đổi sang "
 "bản giao tiếp ảo thứ hai (VT2) rồi kích hoạt trình bao ở đó."
 
+#. Tag: para
 #: boot-installer.xml:2748
 #, no-c-format
-#. Tag: para
 msgid ""
 "Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
 "(use <command>nano</command> as editor) to check for any specific error "
@@ -4071,9 +3954,9 @@ msgstr ""
 "có thông điệp lỗi dứt khoát không. Sau đó, kiểm tra kết xuất của lệnh "
 "<command>dmesg</command>."
 
+#. Tag: para
 #: boot-installer.xml:2755
 #, no-c-format
-#. Tag: para
 msgid ""
 "Check in the output of <command>dmesg</command> if your CD-ROM drive was "
 "recognized. You should see something like (the lines do not necessarily have "
@@ -4107,9 +3990,9 @@ msgstr ""
 "bằng cách nào cả. Nếu bạn biết trình điều khiển nào được dùng cho bộ kết "
 "nối, bạn có thể thử tự nạp nó bằng <command>modprobe</command>."
 
+#. Tag: para
 #: boot-installer.xml:2769
 #, no-c-format
-#. Tag: para
 msgid ""
 "Check that there is a device node for your CD-ROM drive under <filename>/dev/"
 "</filename>. In the example above, this would be <filename>/dev/hdc</"
@@ -4120,9 +4003,9 @@ msgstr ""
 "nút thiết bị là <filename>/dev/hdc</filename>. Cũng cần có một <filename>/"
 "dev/cdroms/cdrom0</filename>."
 
+#. Tag: para
 #: boot-installer.xml:2777
 #, no-c-format
-#. Tag: para
 msgid ""
 "Use the <command>mount</command> command to check if the CD-ROM is already "
 "mounted; if not, try mounting it manually: <informalexample><screen>\n"
@@ -4136,9 +4019,9 @@ msgstr ""
 "</screen></informalexample> Kiểm tra xem có thông điệp lỗi nào được xuất bởi "
 "lệnh đó."
 
+#. Tag: para
 #: boot-installer.xml:2787
 #, no-c-format
-#. Tag: para
 msgid ""
 "Check if DMA is currently enabled: <informalexample><screen>\n"
 "$ cd /proc/<replaceable>ide</replaceable>/<replaceable>hdc</replaceable>\n"
@@ -4162,9 +4045,9 @@ msgstr ""
 "</screen></informalexample> Đảm bảo bạn nằm trong thư mục chứa thiết bị "
 "tương ứng với ổ đĩa CD-ROM đó."
 
+#. Tag: para
 #: boot-installer.xml:2802
 #, no-c-format
-#. Tag: para
 msgid ""
 "If there are any problems during the installation, try checking the "
 "integrity of the CD-ROM using the option near the bottom of the installer's "
@@ -4176,27 +4059,25 @@ msgstr ""
 "này cũng có thể được dùng như là việc thử ra chung nếu đĩa CD-ROM vẫn được "
 "đọc đáng tin cây."
 
+#. Tag: title
 #: boot-installer.xml:2817
 #, no-c-format
-#. Tag: title
 msgid "Floppy Disk Reliability"
 msgstr "Sự đáng tin cậy của đĩa mềm"
 
+#. Tag: para
 #: boot-installer.xml:2819
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The biggest problem for people using floppy disks to install Debian seems "
-#| "to be floppy disk reliability."
 msgid ""
 "The biggest problem for people using floppy disks to install &debian; seems "
 "to be floppy disk reliability."
 msgstr ""
-"Có vẻ là vấn đề lớn nhất cho người sử dụng đĩa mềm để cài đặt &debian; là sự đáng tin cậy của đĩa mềm."
+"Có vẻ là vấn đề lớn nhất cho người sử dụng đĩa mềm để cài đặt &debian; là sự "
+"đáng tin cậy của đĩa mềm."
 
+#. Tag: para
 #: boot-installer.xml:2824
 #, no-c-format
-#. Tag: para
 msgid ""
 "The boot floppy is the floppy with the worst problems, because it is read by "
 "the hardware directly, before Linux boots. Often, the hardware doesn't read "
@@ -4212,9 +4093,9 @@ msgstr ""
 "trong những đĩa mềm trình điều khiển, thường được ngụ ý bởi rất nhiều thông "
 "điệp về lỗi nhập/xuất trên đĩa."
 
+#. Tag: para
 #: boot-installer.xml:2833
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are having the installation stall at a particular floppy, the first "
 "thing you should do is write the image to a <emphasis>different</emphasis> "
@@ -4230,9 +4111,9 @@ msgstr ""
 "một cách không có lỗi. Thỉnh thoảng có ích khi thử ghi đĩa mềm trên hệ thống "
 "khác."
 
+#. Tag: para
 #: boot-installer.xml:2842
 #, no-c-format
-#. Tag: para
 msgid ""
 "One user reports he had to write the images to floppy <emphasis>three</"
 "emphasis> times before one worked, and then everything was fine with the "
@@ -4242,9 +4123,9 @@ msgstr ""
 "mềm <emphasis>ba</emphasis> lần trước khi gặp một đĩa mềm hoạt động được, "
 "còn sau đó, mọi thứ thì tốt với đĩa mềm thứ ba."
 
+#. Tag: para
 #: boot-installer.xml:2848
 #, no-c-format
-#. Tag: para
 msgid ""
 "Normally you should not have to download a floppy image again, but if you "
 "are experiencing problems it is always useful to verify that the images were "
@@ -4254,9 +4135,9 @@ msgstr ""
 "luôn luôn có ích khi thẩm tra ảnh đã được tải về đúng bằng cách kiểm tra "
 "tổng MD5SUM của nó."
 
+#. Tag: para
 #: boot-installer.xml:2854
 #, no-c-format
-#. Tag: para
 msgid ""
 "Other users have reported that simply rebooting a few times with the same "
 "floppy in the floppy drive can lead to a successful boot. This is all due to "
@@ -4266,15 +4147,15 @@ msgstr ""
 "đĩa mềm trong ổ đĩa mềm có thể chỉ tới việc khởi động thành công. Các vấn đề "
 "này do lỗi trong trình điều khiển đĩa mềm kiểu phần vững hay phần cứng."
 
+#. Tag: title
 #: boot-installer.xml:2863
 #, no-c-format
-#. Tag: title
 msgid "Boot Configuration"
 msgstr "Cấu hình khởi động"
 
+#. Tag: para
 #: boot-installer.xml:2865
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have problems and the kernel hangs during the boot process, doesn't "
 "recognize peripherals you actually have, or drives are not recognized "
@@ -4286,9 +4167,9 @@ msgstr ""
 "phải xem lại các tham số khởi động, như được thảo luận trong <xref linkend="
 "\"boot-parms\"/>."
 
+#. Tag: para
 #: boot-installer.xml:2872
 #, no-c-format
-#. Tag: para
 msgid ""
 "Often, problems can be solved by removing add-ons and peripherals, and then "
 "trying booting again. <phrase arch=\"any-x86\">Internal modems, sound cards, "
@@ -4298,9 +4179,9 @@ msgstr ""
 "thử lại khởi động. <phrase arch=\"any-x86\">Bộ điều giải nội bộ, thẻ âm "
 "thanh và thiết bị cầm-và-chơi có thể gây ra nhiều vấn đề.</phrase>"
 
+#. Tag: para
 #: boot-installer.xml:2878
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have a large amount of memory installed in your machine, more than "
 "512M, and the installer hangs when booting the kernel, you may need to "
@@ -4312,16 +4193,15 @@ msgstr ""
 "đối số khởi động để hạn chế số lượng bộ nhớ do hạt nhân xem, v.d. "
 "<userinput>mem=512m</userinput> (bộ nhớ)."
 
-#: boot-installer.xml:2889
-#: boot-installer.xml:2991
-#, no-c-format
 #. Tag: title
+#: boot-installer.xml:2889 boot-installer.xml:2991
+#, no-c-format
 msgid "Common &arch-title; Installation Problems"
 msgstr "Vấn đề cài đặt &arch-title; thường"
 
+#. Tag: para
 #: boot-installer.xml:2890
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are some common installation problems that can be solved or avoided by "
 "passing certain boot parameters to the installer."
@@ -4329,9 +4209,9 @@ msgstr ""
 "Có một số vấn đề cài đặt thường có thể được giải quyết hay được tránh bằng "
 "cách gởi đối số khởi động riêng cho trình cài đặt."
 
+#. Tag: para
 #: boot-installer.xml:2895
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
 "errors reading from the floppy, even when you know the floppy is good, try "
@@ -4341,9 +4221,9 @@ msgstr ""
 "lỗi khi đọc đĩa mềm, ngay cả khi bạn biết được đĩa mềm đó là tốt, hãy thử "
 "nhập tham số <userinput>floppy=thinkpad</userinput> (đĩa mềm=vùng nghĩ)."
 
+#. Tag: para
 #: boot-installer.xml:2901
 #, no-c-format
-#. Tag: para
 msgid ""
 "On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
 "drivers), the IDE drive may not be properly recognized. Again, try it first "
@@ -4361,9 +4241,9 @@ msgstr ""
 "<userinput>hd=<replaceable>trụ</replaceable>,<replaceable>đầu</replaceable>, "
 "<replaceable>rãnh ghi</replaceable></userinput>."
 
+#. Tag: para
 #: boot-installer.xml:2910
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have a very old machine, and the kernel hangs after saying "
 "<computeroutput>Checking 'hlt' instruction...</computeroutput>, then you "
@@ -4375,9 +4255,9 @@ msgstr ""
 "tra câu lệnh « đánh »), rồi bạn nên thử nhập tham số <userinput>no-hlt</"
 "userinput> (không đánh), mà tất khả năng kiểm tra này."
 
+#. Tag: para
 #: boot-installer.xml:2917
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some systems (especially laptops) that have a native resolution that is not "
 "a 4:3 ratio (i.e. not for example 800x600 or 1024x768) may have a blank "
@@ -4401,9 +4281,9 @@ msgstr ""
 "nhưng danh sách này có thể không phải hoàn toàn. </para> </footnote> có thể "
 "giúp. Không thì thử thêm tham số khởi động <userinput>fb=false</userinput>."
 
+#. Tag: para
 #: boot-installer.xml:2935
 #, no-c-format
-#. Tag: para
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
 "pure white, pure black or colored pixel garbage, your system may contain a "
@@ -4422,15 +4302,15 @@ msgstr ""
 "bàn điều khiển bị hạn chế. Xem <xref linkend=\"boot-parms\"/> để tìm chi "
 "tiết."
 
+#. Tag: title
 #: boot-installer.xml:2949
 #, no-c-format
-#. Tag: title
 msgid "System Freeze During the PCMCIA Configuration Phase"
 msgstr "Hệ thống đông đặc trong giai đoạn cấu hình PCMCIA"
 
+#. Tag: para
 #: boot-installer.xml:2950
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some laptop models produced by Dell are known to crash when PCMCIA device "
 "detection tries to access some hardware addresses. Other laptops may display "
@@ -4448,9 +4328,9 @@ msgstr ""
 "userinput> (phát hiện phần cứng/khởi chạy PCMCIA=sai). Sau khi cài đặt xong, "
 "bạn có thể cấu hình PCMCIA, và loại trừ phạm vị tài nguyên gây ra lỗi đó."
 
+#. Tag: para
 #: boot-installer.xml:2960
 #, no-c-format
-#. Tag: para
 msgid ""
 "Alternatively, you can boot the installer in expert mode. You will then be "
 "asked to enter the resource range options your hardware needs. For example, "
@@ -4471,15 +4351,15 @@ msgstr ""
 "Thế Nào</ulink>. Ghi chú rằng bạn cần phải bỏ dấu phẩy, nếu có, khi nhập giá "
 "trị này vào trình cài đặt."
 
+#. Tag: title
 #: boot-installer.xml:2977
 #, no-c-format
-#. Tag: title
 msgid "System Freeze while Loading USB Modules"
 msgstr "Hệ thống đông đặc trong khi tải mô-đun USB"
 
+#. Tag: para
 #: boot-installer.xml:2978
 #, no-c-format
-#. Tag: para
 msgid ""
 "The kernel normally tries to install USB modules and the USB keyboard driver "
 "in order to support some non-standard USB keyboards. However, there are some "
@@ -4495,21 +4375,21 @@ msgstr ""
 "Một tùy chọn khác là gửi tham số <userinput>nousb</userinput> ở dấu nhắc "
 "khởi động."
 
+#. Tag: para
 #: boot-installer.xml:2992
 #, no-c-format
-#. Tag: para
 msgid "There are some common installation problems that are worth mentioning."
 msgstr "Một số vấn đề cài đặt thường gặp."
 
+#. Tag: title
 #: boot-installer.xml:2998
 #, no-c-format
-#. Tag: title
 msgid "Misdirected video output"
 msgstr "Kết xuất ảnh động bị hướng sai"
 
+#. Tag: para
 #: boot-installer.xml:2999
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is fairly common for &arch-title; to have two video cards in one machine, "
 "for example an ATI card and a Sun Creator 3D. In some cases, this may result "
@@ -4535,9 +4415,9 @@ msgstr ""
 "thẻ ATI, hãy khởi động bộ cài đặt với <userinput>video=atyfb:off</userinput> "
 "(ảnh động=atyfb:tắt)."
 
+#. Tag: para
 #: boot-installer.xml:3013
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that you may also have to manually add this parameter to the silo "
 "configuration (edit <filename>/target/etc/silo.conf</filename> before "
@@ -4549,15 +4429,15 @@ msgstr ""
 "lại). Cài đặt X11 thì cũng sửa đổi trình điều khiển ảnh động trong tập tin "
 "cấu hình <filename>/etc/X11/xorg.conf</filename>."
 
+#. Tag: title
 #: boot-installer.xml:3024
 #, no-c-format
-#. Tag: title
 msgid "Failure to Boot or Install from CD-ROM"
 msgstr "Lỗi khởi động hay cài đặt từ đĩa CD-ROM"
 
+#. Tag: para
 #: boot-installer.xml:3025
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
 "they do boot, there may be inexplicable failures during the installation. "
@@ -4568,23 +4448,23 @@ msgstr ""
 "thể giải thích được. Lỗi nhiều nhất đã được thông báo đối với hệ thống "
 "SunBlade."
 
+#. Tag: para
 #: boot-installer.xml:3031
 #, no-c-format
-#. Tag: para
 msgid "We recommend to install such systems by netbooting the installer."
 msgstr ""
 "Khuyên bạn cài đặt vào hệ thống như thế bằng cách khởi động bộ cài đặt qua "
 "mạng."
 
+#. Tag: title
 #: boot-installer.xml:3040
 #, no-c-format
-#. Tag: title
 msgid "Interpreting the Kernel Startup Messages"
 msgstr "Giải thích thông điệp khởi chạy hạt nhân"
 
+#. Tag: para
 #: boot-installer.xml:3042
 #, no-c-format
-#. Tag: para
 msgid ""
 "During the boot sequence, you may see many messages in the form "
 "<computeroutput>can't find <replaceable>something</replaceable></"
@@ -4619,15 +4499,15 @@ msgstr ""
 "khởi động hệ thống chạy quá lâu, bạn có thể tạo một hạt nhân riêng về sau "
 "<phrase arch=\"linux-any\">(xem <xref linkend=\"kernel-baking\"/>)</phrase>."
 
+#. Tag: title
 #: boot-installer.xml:3067
 #, no-c-format
-#. Tag: title
 msgid "Reporting Installation Problems"
 msgstr "Thông báo vấn đề cài đặt"
 
+#. Tag: para
 #: boot-installer.xml:3068
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
 "the menu option <guimenuitem>Save debug logs</guimenuitem> may be helpful. "
@@ -4644,9 +4524,9 @@ msgstr ""
 "Thông tin này có thể giúp đỡ bạn tìm biết nguyên nhân lỗi và cách sửa chữa "
 "nó. Khi thông báo lỗi, khuyên bạn đính kèm thông tin này."
 
+#. Tag: para
 #: boot-installer.xml:3079
 #, no-c-format
-#. Tag: para
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
 "filename> during the installation, and <filename>/var/log/installer/</"
@@ -4656,15 +4536,15 @@ msgstr ""
 "filename> trong khi cài đặt, rồi trong thư mục <filename>/var/log/installer/"
 "</filename> sau khi máy tính đã khởi động vào hệ thống mới được cài đặt."
 
+#. Tag: title
 #: boot-installer.xml:3090
 #, no-c-format
-#. Tag: title
 msgid "Submitting Installation Reports"
 msgstr "Đệ trình báo cáo cài đặt"
 
+#. Tag: para
 #: boot-installer.xml:3091
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you still have problems, please submit an installation report. We also "
 "encourage installation reports to be sent even if the installation is "
@@ -4678,9 +4558,9 @@ msgstr ""
 "tiếng Anh, bạn viết bằng tiếng Việt và gởi báo cáo cho Nhóm Việt Hoá Tự Do "
 "<email>vi-VN@googlegroups.com</email> nhé. Chúng tôi sẽ dịch cho bạn.]"
 
+#. Tag: para
 #: boot-installer.xml:3098
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that your installation report will be published in the Debian Bug "
 "Tracking System (BTS) and forwarded to a public mailing list. Make sure that "
@@ -4690,17 +4570,9 @@ msgstr ""
 "Dõi Lỗi Debian (BTS) và được chuyển tiếp cho hộp thư chung công cộng. Hãy "
 "đảm bảo bạn sử dụng một địa chỉ thư điện tử cũng công cộng."
 
+#. Tag: para
 #: boot-installer.xml:3104
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you have a working Debian system, the easiest way to send an "
-#| "installation report is to install the <classname>installation-report</"
-#| "classname> and <classname>reportbug</classname> packages "
-#| "(<command>aptitude install installation-report reportbug</command>), "
-#| "configure <classname>reportbug</classname> as explained in <xref linkend="
-#| "\"mail-outgoing\"/>, and run the command <command>reportbug installation-"
-#| "reports</command>."
 msgid ""
 "If you have a working &debian; system, the easiest way to send an "
 "installation report is to install the <classname>installation-report</"
@@ -4710,11 +4582,17 @@ msgid ""
 "outgoing\"/>, and run the command <command>reportbug installation-reports</"
 "command>."
 msgstr ""
-"Nếu bạn có một hệ thống &debian; đang chạy, phương pháp dễ nhất gửi một thông báo cài đặt là cài đặt hai gói <classname>installation-report</classname> và <classname>reportbug</classname> (dùng câu lệnh <command>aptitude install installation-report reportbug</command>), cấu hình <classname>reportbug</classname> như diễn tả trong <xref linkend=\"mail-outgoing\"/>, và chạy câu lệnh <command>reportbug installation-reports</command>."
+"Nếu bạn có một hệ thống &debian; đang chạy, phương pháp dễ nhất gửi một "
+"thông báo cài đặt là cài đặt hai gói <classname>installation-report</"
+"classname> và <classname>reportbug</classname> (dùng câu lệnh "
+"<command>aptitude install installation-report reportbug</command>), cấu hình "
+"<classname>reportbug</classname> như diễn tả trong <xref linkend=\"mail-"
+"outgoing\"/>, và chạy câu lệnh <command>reportbug installation-reports</"
+"command>."
 
+#. Tag: para
 #: boot-installer.xml:3114
 #, no-c-format
-#. Tag: para
 msgid ""
 "Alternatively you can use this template when filling out installation "
 "reports, and file the report as a bug report against the "
diff --git a/po/vi/boot-new.po b/po/vi/boot-new.po
index 7cf9d2904..24df68c6d 100644
--- a/po/vi/boot-new.po
+++ b/po/vi/boot-new.po
@@ -17,22 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: boot-new.xml:5
 #, no-c-format
-#. Tag: title
-#| msgid "Booting Into Your New Debian System"
 msgid "Booting Into Your New &debian; System"
 msgstr "Khởi động vào hệ thống &debian; mới"
 
+#. Tag: title
 #: boot-new.xml:7
 #, no-c-format
-#. Tag: title
 msgid "The Moment of Truth"
 msgstr "Giờ phút thử thách"
 
+#. Tag: para
 #: boot-new.xml:8
 #, no-c-format
-#. Tag: para
 msgid ""
 "Your system's first boot on its own power is what electrical engineers call "
 "the <quote>smoke test</quote>."
@@ -40,16 +39,9 @@ msgstr ""
 "Việc khởi động một mình ban đầu của hệ thống là trường hợp do kỹ sư điện tử "
 "gọi <quote>thử thách khói</quote>."
 
+#. Tag: para
 #: boot-new.xml:13
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you did a default installation, the first thing you should see when "
-#| "you boot the system is the menu of the <classname>grub</classname> or "
-#| "possibly the <classname>lilo</classname> bootloader. The first choices in "
-#| "the menu will be for your new Debian system. If you had any other "
-#| "operating systems on your computer (like Windows) that were detected by "
-#| "the installation system, those will be listed lower down in the menu."
 msgid ""
 "If you did a default installation, the first thing you should see when you "
 "boot the system is the menu of the <classname>grub</classname><phrase arch="
@@ -59,19 +51,16 @@ msgid ""
 "detected by the installation system, those will be listed lower down in the "
 "menu."
 msgstr ""
-"Nếu bạn đã chạy một tiến trình cài đặt mặc định thì việc khởi động hệ thống nên hiển thị đầu tiên trình đơn của bộ nạp khởi động <classname>grub</classname><phrase arch=\"x86\"> hoặc <classname>lilo</classname> </phrase>. "
-"Những sự chọn đầu tiên trong trình đơn cũng thích hợp với hệ thống &debian; mới của bạn. Bất cứ mục nào dành cho hệ điều hành khác đã có thì nằm dưới trong trình đơn."
+"Nếu bạn đã chạy một tiến trình cài đặt mặc định thì việc khởi động hệ thống "
+"nên hiển thị đầu tiên trình đơn của bộ nạp khởi động <classname>grub</"
+"classname><phrase arch=\"x86\"> hoặc <classname>lilo</classname> </phrase>. "
+"Những sự chọn đầu tiên trong trình đơn cũng thích hợp với hệ thống &debian; "
+"mới của bạn. Bất cứ mục nào dành cho hệ điều hành khác đã có thì nằm dưới "
+"trong trình đơn."
 
+#. Tag: para
 #: boot-new.xml:23
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If the system fails to start up correctly, don't panic. If the "
-#| "installation was successful, chances are good that there is only a "
-#| "relatively minor problem that is preventing the system from booting "
-#| "Debian. In most cases such problems can be fixed without having to repeat "
-#| "the installation. One available option to fix boot problems is to use the "
-#| "installer's built-in rescue mode (see <xref linkend=\"rescue\"/>)."
 msgid ""
 "If the system fails to start up correctly, don't panic. If the installation "
 "was successful, chances are good that there is only a relatively minor "
@@ -80,23 +69,16 @@ msgid ""
 "available option to fix boot problems is to use the installer's built-in "
 "rescue mode (see <xref linkend=\"rescue\"/>)."
 msgstr ""
-"Nếu hệ thống không khởi động được, hãy bình tĩnh. Đã chạy thành công tiến trình cài đặt thì rất có thể là chỉ gặp một lỗi tương đối nhỏ mà ngăn cản hệ thống khởi động &debian;. Trong phần lớn các trường hợp, vấn đề như vậy có thể được sửa chữa mà không cần chạy lại tiến trình cài đặt. Một lựa chọn sẵn sàng để sửa chữa vấn đề khởi động là sử dụng chế độ cứu có sẵn của trình cài đặt (xem <xref linkend=\"rescue\"/>)."
+"Nếu hệ thống không khởi động được, hãy bình tĩnh. Đã chạy thành công tiến "
+"trình cài đặt thì rất có thể là chỉ gặp một lỗi tương đối nhỏ mà ngăn cản hệ "
+"thống khởi động &debian;. Trong phần lớn các trường hợp, vấn đề như vậy có "
+"thể được sửa chữa mà không cần chạy lại tiến trình cài đặt. Một lựa chọn sẵn "
+"sàng để sửa chữa vấn đề khởi động là sử dụng chế độ cứu có sẵn của trình cài "
+"đặt (xem <xref linkend=\"rescue\"/>)."
 
+#. Tag: para
 #: boot-new.xml:32
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you are new to Debian and &arch-kernel;, you may need some help from "
-#| "more experienced users. <phrase arch=\"x86\">For direct on-line help you "
-#| "can try the IRC channels #debian or #debian-boot on the OFTC network. "
-#| "Alternatively you can contact the <ulink url=\"&url-list-subscribe;"
-#| "\">debian-user mailing list</ulink>.</phrase> <phrase arch=\"not-"
-#| "x86\">For less common architectures like &arch-title;, your best option "
-#| "is to ask on the <ulink url=\"&url-list-subscribe;\">debian-&arch-"
-#| "listname; mailing list</ulink>.</phrase> You can also file an "
-#| "installation report as described in <xref linkend=\"submit-bug\"/>. "
-#| "Please make sure that you describe your problem clearly and include any "
-#| "messages that are displayed and may help others to diagnose the issue."
 msgid ""
 "If you are new to &debian; and &arch-kernel;, you may need some help from "
 "more experienced users. <phrase arch=\"x86\">For direct on-line help you can "
@@ -110,11 +92,23 @@ msgid ""
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
 msgstr ""
-"Nếu bạn bắt đầu sử dụng &debian; và &arch-kernel;, thì có thể yêu cầu sự giúp đỡ của những người dùng có kinh nghiệm nhiều hơn. <phrase arch=\"x86\">Để được giúp đỡ trực tiếp trên Internet, vào kênh IRC #debian hay #debian-boot trên mạng OFTC. Hoặc bạn có thể hỏi câu trong <ulink url=\"&url-list-subscribe;\">hộp thư chung debian-user</ulink>.</phrase> <phrase arch=\"not-x86\">Đối với kiến trúc ít thường gặp hơn như &arch-title;, khuyên bạn hỏi câu trong <ulink url=\"&url-list-subscribe;\">hộp thư chung debian-&arch-listname; </ulink>.</phrase> Bạn cũng có thể gửi một thông báo cài đặt như được diễn tả trong <xref linkend=\"submit-bug\"/>. Xin hãy kiểm tra lại bạn đã diễn tả rõ ràng vấn đề, và bao gồm thông điệp nào được hiển thị, để giúp đỡ người khác chẩn đoán vấn đề. (Viết thông báo lỗi bằng tiếng Việt thì cũng bao gồm tiêu đề tiếng Anh này: \"THIS REPORT IS WRITTEN IN VIETNAMESE\" [ thông báo này được viết bằng Tiếng Việt])."
+"Nếu bạn bắt đầu sử dụng &debian; và &arch-kernel;, thì có thể yêu cầu sự "
+"giúp đỡ của những người dùng có kinh nghiệm nhiều hơn. <phrase arch="
+"\"x86\">Để được giúp đỡ trực tiếp trên Internet, vào kênh IRC #debian hay "
+"#debian-boot trên mạng OFTC. Hoặc bạn có thể hỏi câu trong <ulink url=\"&url-"
+"list-subscribe;\">hộp thư chung debian-user</ulink>.</phrase> <phrase arch="
+"\"not-x86\">Đối với kiến trúc ít thường gặp hơn như &arch-title;, khuyên bạn "
+"hỏi câu trong <ulink url=\"&url-list-subscribe;\">hộp thư chung debian-&arch-"
+"listname; </ulink>.</phrase> Bạn cũng có thể gửi một thông báo cài đặt như "
+"được diễn tả trong <xref linkend=\"submit-bug\"/>. Xin hãy kiểm tra lại bạn "
+"đã diễn tả rõ ràng vấn đề, và bao gồm thông điệp nào được hiển thị, để giúp "
+"đỡ người khác chẩn đoán vấn đề. (Viết thông báo lỗi bằng tiếng Việt thì cũng "
+"bao gồm tiêu đề tiếng Anh này: \"THIS REPORT IS WRITTEN IN VIETNAMESE"
+"\" [ thông báo này được viết bằng Tiếng Việt])."
 
+#. Tag: para
 #: boot-new.xml:48
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you had any other operating systems on your computer that were not "
 "detected or not detected correctly, please file an installation report."
@@ -122,15 +116,15 @@ msgstr ""
 "Nếu tiến trình cài đặt đã không phát hiện được hệ điều hành khác nào cũng "
 "nằm trên máy tính đó, hãy gửi một báo cáo cài đặt."
 
+#. Tag: title
 #: boot-new.xml:56
 #, no-c-format
-#. Tag: title
 msgid "OldWorld PowerMacs"
 msgstr "PowerMac kiểu cũ"
 
+#. Tag: para
 #: boot-new.xml:57
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the machine fails to boot after completing the installation, and stops "
 "with a <prompt>boot:</prompt> prompt, try typing <userinput>Linux</"
@@ -154,9 +148,9 @@ msgstr ""
 "về cách sử dụng <command>quik</command> có sẵn sàng trong <ulink url=\"&url-"
 "powerpc-quik-faq;\">Hỏi đáp Quik-PowerPC</ulink>."
 
+#. Tag: para
 #: boot-new.xml:71
 #, no-c-format
-#. Tag: para
 msgid ""
 "To boot back into MacOS without resetting the nvram, type <userinput>bye</"
 "userinput> at the OpenFirmware prompt (assuming MacOS has not been removed "
@@ -179,9 +173,9 @@ msgstr ""
 "<keycap>p</keycap> <keycap>r</keycap> </keycombo> trong khi khởi động lạnh "
 "máy đó."
 
+#. Tag: para
 #: boot-new.xml:84
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you use <command>BootX</command> to boot into the installed system, just "
 "select your desired kernel in the <filename>Linux Kernels</filename> folder, "
@@ -194,15 +188,15 @@ msgstr ""
 "tạm), và thêm một thiết bị gốc tương ứng với bản cài đặt hiện thời, v.d. "
 "<userinput>/dev/hda8</userinput>."
 
+#. Tag: title
 #: boot-new.xml:96
 #, no-c-format
-#. Tag: title
 msgid "NewWorld PowerMacs"
 msgstr "PowerMac kiểu mới"
 
+#. Tag: para
 #: boot-new.xml:97
 #, no-c-format
-#. Tag: para
 msgid ""
 "On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
 "and get a graphical screen with a button for each bootable OS, &debian-gnu; "
@@ -213,9 +207,9 @@ msgstr ""
 "màn hình đồ họa có một cái nút dành cho mỗi hệ điều hành khởi động được: "
 "&debian-gnu; sẽ là cái nút có hình chím cụt nhỏ."
 
+#. Tag: para
 #: boot-new.xml:104
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you kept MacOS and at some point it changes the OpenFirmware <envar>boot-"
 "device</envar> variable you should reset OpenFirmware to its default "
@@ -229,9 +223,9 @@ msgstr ""
 "<keycap>command</keycap> <keycap>option</keycap> <keycap>p</keycap> "
 "<keycap>r</keycap> </keycombo> trong khi khởi động lạnh máy đó."
 
+#. Tag: para
 #: boot-new.xml:112
 #, no-c-format
-#. Tag: para
 msgid ""
 "The labels defined in <filename>yaboot.conf</filename> will be displayed if "
 "you press the <keycap>Tab</keycap> key at the <prompt>boot:</prompt> prompt."
@@ -240,9 +234,9 @@ msgstr ""
 "filename> sẽ được hiển thị nếu bạn bấm phím <keycap>Tab</keycap> tại dấu "
 "nhắc<prompt>boot:</prompt>."
 
+#. Tag: para
 #: boot-new.xml:118
 #, no-c-format
-#. Tag: para
 msgid ""
 "Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-"
 "gnu; by default (if you correctly partitioned and placed the Apple_Bootstrap "
@@ -259,9 +253,9 @@ msgstr ""
 "lập biến <envar>boot-device</envar> (thiết bị khởi động); lệnh "
 "<command>ybin</command> bình thường làm như thế một cách tự động."
 
+#. Tag: para
 #: boot-new.xml:127
 #, no-c-format
-#. Tag: para
 msgid ""
 "After you boot &debian-gnu; for the first time you can add any additional "
 "options you desire (such as dual boot options) to <filename>/etc/yaboot."
@@ -276,15 +270,15 @@ msgstr ""
 "liệu Cách Làm <ulink url=\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</ulink> "
 "để tìm thông tin thêm."
 
+#. Tag: title
 #: boot-new.xml:145
 #, no-c-format
-#. Tag: title
 msgid "Mounting encrypted volumes"
 msgstr "Gắn kết khối tin đã mật mã"
 
+#. Tag: para
 #: boot-new.xml:147
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you created encrypted volumes during the installation and assigned them "
 "mount points, you will be asked to enter the passphrase for each of these "
@@ -297,15 +291,15 @@ msgstr ""
 "crypt</filename> và <filename>loop-AES</filename>."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: title
 #: boot-new.xml:157
 #, no-c-format
-#. Tag: title
 msgid "dm-crypt"
 msgstr "dm-crypt"
 
+#. Tag: para
 #: boot-new.xml:159
 #, no-c-format
-#. Tag: para
 msgid ""
 "For partitions encrypted using dm-crypt you will be shown the following "
 "prompt during the boot: <informalexample><screen>\n"
@@ -346,9 +340,9 @@ msgstr ""
 "trong tập tin <filename>/etc/crypttab</filename> và <filename>/etc/fstab</"
 "filename> của hệ thống mới."
 
+#. Tag: para
 #: boot-new.xml:182
 #, no-c-format
-#. Tag: para
 msgid ""
 "The prompt may look somewhat different when an encrypted root file system is "
 "mounted. This depends on which initramfs generator was used to generate the "
@@ -360,9 +354,9 @@ msgstr ""
 "initrd được dùng lần lượt để khởi động hệ thống đó. Mẫu bên dưới thuộc về "
 "initrd được tạo ra bằng <classname>initramfs-tools</classname>:"
 
+#. Tag: screen
 #: boot-new.xml:189
 #, no-c-format
-#. Tag: screen
 msgid ""
 "Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
 "Begin: Running /scripts/local-top ...\n"
@@ -375,10 +369,9 @@ msgstr ""
 "Bắt đầu : Đang chạy /tập_lệnh/local-top ...\n"
 "Nhập cụm từ mật khẩu LUKS:]"
 
-#: boot-new.xml:191
-#: boot-new.xml:216
-#, no-c-format
 #. Tag: para
+#: boot-new.xml:191 boot-new.xml:216
+#, no-c-format
 msgid ""
 "No characters (even asterisks) will be shown while entering the passphrase. "
 "If you enter the wrong passphrase, you have two more tries to correct it. "
@@ -392,25 +385,24 @@ msgstr ""
 "thống tập tin tới. Xem <xref linkend=\"crypto-troubleshooting\"/> để tìm "
 "thông tin thêm."
 
-#: boot-new.xml:199
-#: boot-new.xml:224
-#, no-c-format
 #. Tag: para
+#: boot-new.xml:199 boot-new.xml:224
+#, no-c-format
 msgid "After entering all passphrases the boot should continue as usual."
 msgstr ""
 "Sau khi nhập tất cả các cụm từ mật khẩu, tiến trình khởi động nên tiếp tục "
 "như bình thường."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: title
 #: boot-new.xml:207
 #, no-c-format
-#. Tag: title
 msgid "loop-AES"
 msgstr "loop-AES"
 
+#. Tag: para
 #: boot-new.xml:209
 #, no-c-format
-#. Tag: para
 msgid ""
 "For partitions encrypted using loop-AES you will be shown the following "
 "prompt during the boot:"
@@ -418,9 +410,9 @@ msgstr ""
 "Đối với phân vùng được mật mã bằng loop-AES, bạn sẽ xem dấu nhắc này trong "
 "khi khởi động:"
 
+#. Tag: screen
 #: boot-new.xml:214
 #, no-c-format
-#. Tag: screen
 msgid ""
 "Checking loop-encrypted file systems.\n"
 "Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
@@ -435,15 +427,15 @@ msgstr ""
 "Đang thiết lập X\n"
 "Mật khẩu :]"
 
+#. Tag: title
 #: boot-new.xml:232
 #, no-c-format
-#. Tag: title
 msgid "Troubleshooting"
 msgstr "Giải đáp thắc mắc"
 
+#. Tag: para
 #: boot-new.xml:234
 #, no-c-format
-#. Tag: para
 msgid ""
 "If some of the encrypted volumes could not be mounted because a wrong "
 "passphrase was entered, you will have to mount them manually after the boot. "
@@ -453,9 +445,9 @@ msgstr ""
 "mật khẩu bị nhập sai, bạn sẽ cần phải tự gắn kết mỗi khối tin như vậy sau "
 "khi khởi động. Có vài trường hợp có thể."
 
+#. Tag: para
 #: boot-new.xml:243
 #, no-c-format
-#. Tag: para
 msgid ""
 "The first case concerns the root partition. When it is not mounted "
 "correctly, the boot process will halt and you will have to reboot the "
@@ -465,9 +457,9 @@ msgstr ""
 "đúng, tiến trình khởi động sẽ tạm dừng lại nên bạn cần phải khởi động lại "
 "máy tính để thử lại."
 
+#. Tag: para
 #: boot-new.xml:250
 #, no-c-format
-#. Tag: para
 msgid ""
 "The easiest case is for encrypted volumes holding data like <filename>/home</"
 "filename> or <filename>/srv</filename>. You can simply mount them manually "
@@ -493,9 +485,9 @@ msgstr ""
 "filename>). Sự khác duy nhất với việc gắn kết bình thường là bạn sẽ được "
 "nhắc nhập cụm từ mật khẩu dành cho khối tin này."
 
+#. Tag: para
 #: boot-new.xml:264
 #, no-c-format
-#. Tag: para
 msgid ""
 "For dm-crypt this is a bit trickier. First you need to register the volumes "
 "with <application>device mapper</application> by running: "
@@ -520,9 +512,9 @@ msgstr ""
 "vì vậy bạn có thể chạy lệnh này vài lần, không có sao.) Sau khi đăng ký "
 "được, bạn có khả năng đơn giản gắn kết những khối tin bằng cách bình thường."
 
+#. Tag: screen
 #: boot-new.xml:279
 #, no-c-format
-#. Tag: screen
 msgid ""
 "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
 "userinput>"
@@ -530,9 +522,9 @@ msgstr ""
 "<prompt>#</prompt> <userinput>mount <replaceable>/điểm_lắp</replaceable></"
 "userinput>"
 
+#. Tag: para
 #: boot-new.xml:282
 #, no-c-format
-#. Tag: para
 msgid ""
 "If any volume holding noncritical system files could not be mounted "
 "(<filename>/usr</filename> or <filename>/var</filename>), the system should "
@@ -559,15 +551,15 @@ msgstr ""
 "<keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo> khi mật "
 "khẩu chủ được yêu cầu."
 
+#. Tag: title
 #: boot-new.xml:305
 #, no-c-format
-#. Tag: title
 msgid "Log In"
 msgstr "Đăng nhập"
 
+#. Tag: para
 #: boot-new.xml:307
 #, no-c-format
-#. Tag: para
 msgid ""
 "Once your system boots, you'll be presented with the login prompt. Log in "
 "using the personal login and password you selected during the installation "
@@ -577,9 +569,9 @@ msgstr ""
 "nhập, dùng tên đăng nhập cá nhân và mật khẩu bạn đã chọn trong tiến trình "
 "cài đặt. Hệ thống của bạn lúc bây giờ sẵn sàng sử dụng."
 
+#. Tag: para
 #: boot-new.xml:313
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are a new user, you may want to explore the documentation which is "
 "already installed on your system as you start to use it. There are currently "
@@ -591,18 +583,9 @@ msgstr ""
 "trình cố gắng hợp nhất những kiểu tài liệu khác nhau. Đây là một số điểm bắt "
 "đầu đọc."
 
+#. Tag: para
 #: boot-new.xml:321
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Documentation accompanying programs you have installed can be found in "
-#| "<filename>/usr/share/doc/</filename>, under a subdirectory named after "
-#| "the program (or, more precise, the Debian package that contains the "
-#| "program). However, more extensive documentation is often packaged "
-#| "separately in special documentation packages that are mostly not "
-#| "installed by default. For example, documentation about the package "
-#| "management tool <command>apt</command> can be found in the packages "
-#| "<classname>apt-doc</classname> or <classname>apt-howto</classname>."
 msgid ""
 "Documentation accompanying programs you have installed can be found in "
 "<filename>/usr/share/doc/</filename>, under a subdirectory named after the "
@@ -613,12 +596,17 @@ msgid ""
 "command> can be found in the packages <classname>apt-doc</classname> or "
 "<classname>apt-howto</classname>."
 msgstr ""
-"Tài liệu hướng dẫn có sẵn với chương trình được cài đặt thì nằm trong <filename>/usr/share/doc/</filename>, dưới một thư mục con đặt tên theo gói &debian; chứa chương trình đó. Tuy nhiên, tài liệu hướng dẫn rộng rãi hơn thường được đóng gói một cách riêng trong gói tài liệu đặc biệt bình thường không phải được cài đặt theo mặc định. Chẳng hạn, tài liệu hướng dẫn về công cụ quản lý gói <command>apt</command> nằm trong hai gói riêng <classname>apt-doc</classname> và "
-"<classname>apt-howto</classname>."
+"Tài liệu hướng dẫn có sẵn với chương trình được cài đặt thì nằm trong "
+"<filename>/usr/share/doc/</filename>, dưới một thư mục con đặt tên theo gói "
+"&debian; chứa chương trình đó. Tuy nhiên, tài liệu hướng dẫn rộng rãi hơn "
+"thường được đóng gói một cách riêng trong gói tài liệu đặc biệt bình thường "
+"không phải được cài đặt theo mặc định. Chẳng hạn, tài liệu hướng dẫn về công "
+"cụ quản lý gói <command>apt</command> nằm trong hai gói riêng <classname>apt-"
+"doc</classname> và <classname>apt-howto</classname>."
 
+#. Tag: para
 #: boot-new.xml:332
 #, no-c-format
-#. Tag: para
 msgid ""
 "In addition, there are some special folders within the <filename>/usr/share/"
 "doc/</filename> hierarchy. Linux HOWTOs are installed in <emphasis>.gz</"
@@ -634,9 +622,9 @@ msgstr ""
 "một mục lục tài liệu có khả năng duyệt qua nằm trong <filename>/usr/share/"
 "doc/HTML/index.html</filename>."
 
+#. Tag: para
 #: boot-new.xml:341
 #, no-c-format
-#. Tag: para
 msgid ""
 "One easy way to view these documents using a text based browser is to enter "
 "the following commands: <informalexample><screen>\n"
@@ -652,22 +640,22 @@ msgstr ""
 "</screen></informalexample> Dấu chấm nằm sau lệnh <command>w3m</command> thì "
 "báo nó hiển thị nội dung của thư mục hiện có."
 
+#. Tag: para
 #: boot-new.xml:351
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have a graphical desktop environment installed, you can also use its "
 "web browser. Start the web browser from the application menu and enter "
 "<userinput>/usr/share/doc/</userinput> in the address bar."
 msgstr ""
 "Nếu máy tính có môi trường đồ họa được cài đặt, bạn cũng có khả năng sử dụng "
-"trình duyệt Web để xem tài liệu. Hãy khởi chạy trình duyệt Web từ trình "
-"đơn ứng dụng, rồi gõ địa chỉ <userinput>/usr/share/doc/</userinput> vào "
-"thanh địa chỉ."
+"trình duyệt Web để xem tài liệu. Hãy khởi chạy trình duyệt Web từ trình đơn "
+"ứng dụng, rồi gõ địa chỉ <userinput>/usr/share/doc/</userinput> vào thanh "
+"địa chỉ."
 
+#. Tag: para
 #: boot-new.xml:357
 #, no-c-format
-#. Tag: para
 msgid ""
 "You can also type <userinput>info <replaceable>command</replaceable></"
 "userinput> or <userinput>man <replaceable>command</replaceable></userinput> "
diff --git a/po/vi/hardware.po b/po/vi/hardware.po
index 0ce8e448f..86ec2e12c 100644
--- a/po/vi/hardware.po
+++ b/po/vi/hardware.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-24 16:57+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,43 +17,33 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: hardware.xml:5
 #, no-c-format
-#. Tag: title
 msgid "System Requirements"
 msgstr "Hệ thống Yêu cầu"
 
+#. Tag: para
 #: hardware.xml:7
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This section contains information about what hardware you need to get "
-#| "started with Debian. You will also find links to further information "
-#| "about hardware supported by GNU and &arch-kernel;."
 msgid ""
 "This section contains information about what hardware you need to get "
 "started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
-"Tiết đoạn này chứa thông tin về phần cứng yêu cầu để bắt đầu sử dụng &debian;. Cũng có liên kết đến thông tin bổ sung về phần cứng do GNU/&arch-kernel; hỗ trợ."
+"Tiết đoạn này chứa thông tin về phần cứng yêu cầu để bắt đầu sử dụng "
+"&debian;. Cũng có liên kết đến thông tin bổ sung về phần cứng do GNU/&arch-"
+"kernel; hỗ trợ."
 
+#. Tag: title
 #: hardware.xml:20
 #, no-c-format
-#. Tag: title
 msgid "Supported Hardware"
 msgstr "Phần cứng được hỗ trợ"
 
+#. Tag: para
 #: hardware.xml:21
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian does not impose hardware requirements beyond the requirements of "
-#| "the Linux kernel and the GNU tool-sets. Therefore, any architecture or "
-#| "platform to which the Linux kernel, libc, <command>gcc</command>, etc. "
-#| "have been ported, and for which a Debian port exists, can run Debian. "
-#| "Please refer to the Ports pages at <ulink url=\"&url-ports;\"></ulink> "
-#| "for more details on &arch-title; architecture systems which have been "
-#| "tested with &debian-gnu;."
 msgid ""
 "&debian; does not impose hardware requirements beyond the requirements of "
 "the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
@@ -63,12 +53,18 @@ msgid ""
 "\"&url-ports;\"></ulink> for more details on &arch-title; architecture "
 "systems which have been tested with &debian-gnu;."
 msgstr ""
-"&debian; không yêu cầu phần cứng đặc biệt khác với yêu cầu của hạt nhân Linux hay kFreeBSD và các bộ công cụ GNU. Vì vậy, bất kỳ kiến trúc hay nền tảng nào sang đó hạt nhân Linux hay kFreeBSD, thư viện C libc, bộ biên dịch <command>gcc</command> v.v. đã được chuyển, cũng cho đó có một bản chuyển &debian;, có khả năng chạy được hệ thống &debian;. Xem những trang <emphasis>Bản Chuyển</emphasis> (Ports) tại <ulink url=\"&url-ports;\"></ulink> để tìm thêm thông tin về hệ thống kiến "
-"trúc &arch-title; đã được thử ra với &debian-gnu;."
+"&debian; không yêu cầu phần cứng đặc biệt khác với yêu cầu của hạt nhân "
+"Linux hay kFreeBSD và các bộ công cụ GNU. Vì vậy, bất kỳ kiến trúc hay nền "
+"tảng nào sang đó hạt nhân Linux hay kFreeBSD, thư viện C libc, bộ biên dịch "
+"<command>gcc</command> v.v. đã được chuyển, cũng cho đó có một bản chuyển "
+"&debian;, có khả năng chạy được hệ thống &debian;. Xem những trang "
+"<emphasis>Bản Chuyển</emphasis> (Ports) tại <ulink url=\"&url-ports;\"></"
+"ulink> để tìm thêm thông tin về hệ thống kiến trúc &arch-title; đã được thử "
+"ra với &debian-gnu;."
 
+#. Tag: para
 #: hardware.xml:32
 #, no-c-format
-#. Tag: para
 msgid ""
 "Rather than attempting to describe all the different hardware configurations "
 "which are supported for &arch-title;, this section contains general "
@@ -78,417 +74,402 @@ msgstr ""
 "trúc &arch-title;, tiết đoạn này chứa thông tin chung và liên kết đến thông "
 "tin thêm."
 
+#. Tag: title
 #: hardware.xml:41
 #, no-c-format
-#. Tag: title
 msgid "Supported Architectures"
 msgstr "Kiến trúc được hỗ trợ"
 
+#. Tag: para
 #: hardware.xml:42
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian GNU/Linux &release; supports eleven major architectures and "
-#| "several variations of each architecture known as <quote>flavors</quote>."
 msgid ""
 "&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
-"Bản phát hành &debian; GNU/Linux &release; hỗ trợ mười một kiến trúc chính và vài biến thể của mỗi kiến trúc, được gọi như là <quote>mùi vị</quote> (flavor)."
+"Bản phát hành &debian; GNU/Linux &release; hỗ trợ mười một kiến trúc chính "
+"và vài biến thể của mỗi kiến trúc, được gọi như là <quote>mùi vị</quote> "
+"(flavor)."
 
-#: hardware.xml:53
-#: hardware.xml:179
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:53 hardware.xml:179
+#, no-c-format
 msgid "Architecture"
 msgstr "Kiến trúc"
 
-#: hardware.xml:53
-#: hardware.xml:179
-#, no-c-format
 #. Tag: entry
-#| msgid "Debian Designation"
+#: hardware.xml:53 hardware.xml:179
+#, no-c-format
 msgid "&debian; Designation"
 msgstr "Tên &debian;"
 
+#. Tag: entry
 #: hardware.xml:54
 #, no-c-format
-#. Tag: entry
 msgid "Subarchitecture"
 msgstr "Kiến trúc phụ"
 
+#. Tag: entry
 #: hardware.xml:54
 #, no-c-format
-#. Tag: entry
 msgid "Flavor"
 msgstr "Mùi vị"
 
-#: hardware.xml:60
-#: hardware.xml:185
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:60 hardware.xml:185
+#, no-c-format
 msgid "Intel x86-based"
 msgstr "Dựa vào x86 Intel"
 
+#. Tag: entry
 #: hardware.xml:61
 #, no-c-format
-#. Tag: entry
 msgid "i386"
 msgstr "i386"
 
 # Name: don't translate/Tên: đừng dịch
-#: hardware.xml:67
-#: hardware.xml:190
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:67 hardware.xml:190
+#, no-c-format
 msgid "AMD64 &amp; Intel EM64T"
 msgstr "AMD64 &amp; Intel EM64T"
 
 # Name: don't translate/Tên: đừng dịch
+#. Tag: entry
 #: hardware.xml:68
 #, no-c-format
-#. Tag: entry
 msgid "amd64"
 msgstr "amd64"
 
+#. Tag: entry
 #: hardware.xml:74
 #, no-c-format
-#. Tag: entry
 msgid "<entry>ARM</entry>"
 msgstr "<entry>ARM</entry>"
 
+#. Tag: entry
 #: hardware.xml:75
 #, no-c-format
-#. Tag: entry
 msgid "armel"
 msgstr "armel"
 
+#. Tag: entry
 #: hardware.xml:76
 #, no-c-format
-#. Tag: entry
 msgid "Intel IOP32x"
 msgstr "Intel IOP32x"
 
+#. Tag: entry
 #: hardware.xml:77
 #, no-c-format
-#. Tag: entry
 msgid "iop32x"
 msgstr "iop32x"
 
+#. Tag: entry
 #: hardware.xml:79
 #, no-c-format
-#. Tag: entry
 msgid "Intel IXP4xx"
 msgstr "Intel IXP4xx"
 
+#. Tag: entry
 #: hardware.xml:80
 #, no-c-format
-#. Tag: entry
 msgid "ixp4xx"
 msgstr "ixp4xx"
 
 # Tên
+#. Tag: entry
 #: hardware.xml:82
 #, no-c-format
-#. Tag: entry
 msgid "Marvell Kirkwood"
 msgstr "Marvell Kirkwood"
 
 # Tên
+#. Tag: entry
 #: hardware.xml:83
 #, no-c-format
-#. Tag: entry
 msgid "kirkwood"
 msgstr "kirkwood"
 
+#. Tag: entry
 #: hardware.xml:85
 #, no-c-format
-#. Tag: entry
 msgid "Marvell Orion"
 msgstr "Marvell Orion"
 
+#. Tag: entry
 #: hardware.xml:86
 #, no-c-format
-#. Tag: entry
 msgid "orion5x"
 msgstr "orion5x"
 
+#. Tag: entry
 #: hardware.xml:88
 #, no-c-format
-#. Tag: entry
 msgid "<entry>Versatile</entry>"
 msgstr "<entry>Versatile</entry>"
 
+#. Tag: entry
 #: hardware.xml:89
 #, no-c-format
-#. Tag: entry
 msgid "versatile"
 msgstr "versatile"
 
+#. Tag: entry
 #: hardware.xml:93
 #, no-c-format
-#. Tag: entry
 msgid "HP PA-RISC"
 msgstr "HP PA-RISC"
 
+#. Tag: entry
 #: hardware.xml:94
 #, no-c-format
-#. Tag: entry
 msgid "hppa"
 msgstr "hppa"
 
+#. Tag: entry
 #: hardware.xml:95
 #, no-c-format
-#. Tag: entry
 msgid "PA-RISC 1.1"
 msgstr "PA-RISC 1.1"
 
+#. Tag: entry
 #: hardware.xml:96
 #, no-c-format
-#. Tag: entry
 msgid "<entry>32</entry>"
 msgstr "<entry>32</entry>"
 
+#. Tag: entry
 #: hardware.xml:98
 #, no-c-format
-#. Tag: entry
 msgid "PA-RISC 2.0"
 msgstr "PA-RISC 2.0"
 
+#. Tag: entry
 #: hardware.xml:99
 #, no-c-format
-#. Tag: entry
 msgid "<entry>64</entry>"
 msgstr "<entry>64</entry>"
 
+#. Tag: entry
 #: hardware.xml:103
 #, no-c-format
-#. Tag: entry
 msgid "Intel IA-64"
 msgstr "Intel IA-64"
 
+#. Tag: entry
 #: hardware.xml:104
 #, no-c-format
-#. Tag: entry
 msgid "ia64"
 msgstr "ia64"
 
+#. Tag: entry
 #: hardware.xml:110
 #, no-c-format
-#. Tag: entry
 msgid "MIPS (big endian)"
 msgstr "MIPS (về cuối lớn)"
 
+#. Tag: entry
 #: hardware.xml:111
 #, no-c-format
-#. Tag: entry
 msgid "mips"
 msgstr "mips"
 
+#. Tag: entry
 #: hardware.xml:112
 #, no-c-format
-#. Tag: entry
 msgid "SGI IP22 (Indy/Indigo 2)"
 msgstr "SGI IP22 (Indy/Indigo 2)"
 
+#. Tag: entry
 #: hardware.xml:113
 #, no-c-format
-#. Tag: entry
 msgid "r4k-ip22"
 msgstr "r4k-ip22"
 
+#. Tag: entry
 #: hardware.xml:115
 #, no-c-format
-#. Tag: entry
 msgid "SGI IP32 (O2)"
 msgstr "SGI IP32 (O2)"
 
+#. Tag: entry
 #: hardware.xml:116
 #, no-c-format
-#. Tag: entry
 msgid "r5k-ip32"
 msgstr "r5k-ip32"
 
-#: hardware.xml:118
-#: hardware.xml:131
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:118 hardware.xml:131
+#, no-c-format
 msgid "MIPS Malta (32 bit)"
 msgstr "MIPS Malta (32 bit)"
 
-#: hardware.xml:119
-#: hardware.xml:132
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:119 hardware.xml:132
+#, no-c-format
 msgid "4kc-malta"
 msgstr "4kc-malta"
 
-#: hardware.xml:121
-#: hardware.xml:134
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:121 hardware.xml:134
+#, no-c-format
 msgid "MIPS Malta (64 bit)"
 msgstr "MIPS Malta (64 bit)"
 
-#: hardware.xml:122
-#: hardware.xml:135
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:122 hardware.xml:135
+#, no-c-format
 msgid "5kc-malta"
 msgstr "5kc-malta"
 
+#. Tag: entry
 #: hardware.xml:126
 #, no-c-format
-#. Tag: entry
 msgid "MIPS (little endian)"
 msgstr "MIPS (về cuối nhỏ)"
 
+#. Tag: entry
 #: hardware.xml:127
 #, no-c-format
-#. Tag: entry
 msgid "mipsel"
 msgstr "mipsel"
 
+#. Tag: entry
 #: hardware.xml:128
 #, no-c-format
-#. Tag: entry
 msgid "Cobalt"
 msgstr "Cobalt"
 
+#. Tag: entry
 #: hardware.xml:129
 #, no-c-format
-#. Tag: entry
 msgid "cobalt"
 msgstr "cobalt"
 
+#. Tag: entry
 #: hardware.xml:139
 #, no-c-format
-#. Tag: entry
 msgid "IBM/Motorola PowerPC"
 msgstr "IBM/Motorola PowerPC"
 
+#. Tag: entry
 #: hardware.xml:140
 #, no-c-format
-#. Tag: entry
 msgid "<entry>powerpc</entry>"
 msgstr "<entry>powerpc</entry>"
 
+#. Tag: entry
 #: hardware.xml:141
 #, no-c-format
-#. Tag: entry
 msgid "PowerMac"
 msgstr "PowerMac"
 
+#. Tag: entry
 #: hardware.xml:142
 #, no-c-format
-#. Tag: entry
 msgid "pmac"
 msgstr "pmac"
 
+#. Tag: entry
 #: hardware.xml:144
 #, no-c-format
-#. Tag: entry
 msgid "PReP"
 msgstr "PReP"
 
+#. Tag: entry
 #: hardware.xml:145
 #, no-c-format
-#. Tag: entry
 msgid "prep"
 msgstr "prep"
 
+#. Tag: entry
 #: hardware.xml:149
 #, no-c-format
-#. Tag: entry
 msgid "Sun SPARC"
 msgstr "Sun SPARC"
 
+#. Tag: entry
 #: hardware.xml:150
 #, no-c-format
-#. Tag: entry
 msgid "sparc"
 msgstr "sparc"
 
+#. Tag: entry
 #: hardware.xml:151
 #, no-c-format
-#. Tag: entry
 msgid "<entry>sun4u</entry>"
 msgstr "<entry>sun4u</entry>"
 
+#. Tag: entry
 #: hardware.xml:152
 #, no-c-format
-#. Tag: entry
 msgid "sparc64"
 msgstr "sparc64"
 
+#. Tag: entry
 #: hardware.xml:154
 #, no-c-format
-#. Tag: entry
 msgid "<entry>sun4v</entry>"
 msgstr "<entry>sun4v</entry>"
 
+#. Tag: entry
 #: hardware.xml:158
 #, no-c-format
-#. Tag: entry
 msgid "IBM S/390"
 msgstr "IBM S/390"
 
+#. Tag: entry
 #: hardware.xml:159
 #, no-c-format
-#. Tag: entry
 msgid "s390"
 msgstr "s390"
 
+#. Tag: entry
 #: hardware.xml:160
 #, no-c-format
-#. Tag: entry
 msgid "IPL from VM-reader and DASD"
 msgstr "IPL từ bộ đọc VM-reader và DASD"
 
+#. Tag: entry
 #: hardware.xml:161
 #, no-c-format
-#. Tag: entry
 msgid "generic"
 msgstr "giống loài"
 
+#. Tag: entry
 #: hardware.xml:163
 #, no-c-format
-#. Tag: entry
 msgid "IPL from tape"
 msgstr "IPL từ băng"
 
+#. Tag: entry
 #: hardware.xml:164
 #, no-c-format
-#. Tag: entry
 msgid "tape"
 msgstr "băng"
 
+#. Tag: para
 #: hardware.xml:169
 #, no-c-format
-#. Tag: para
 msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr "&debian; GNU/kFreeBSD &release; hỗ trợ hai kiến trúc khác nhau."
 
+#. Tag: entry
 #: hardware.xml:186
 #, no-c-format
-#. Tag: entry
 msgid "kfreebsd-i386"
 msgstr "kfreebsd-i386"
 
+#. Tag: entry
 #: hardware.xml:191
 #, no-c-format
-#. Tag: entry
 msgid "kfreebsd-amd64"
 msgstr "kfreebsd-amd64"
 
+#. Tag: para
 #: hardware.xml:196
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This document covers installation for the <emphasis>&arch-title;</"
-#| "emphasis> architecture. If you are looking for information on any of the "
-#| "other Debian-supported architectures take a look at the <ulink url="
-#| "\"http://www.debian.org/ports/\">Debian-Ports</ulink> pages."
 msgid ""
 "This document covers installation for the <emphasis>&arch-title;</emphasis> "
 "architecture using the <emphasis>&arch-kernel;</emphasis> kernel. If you are "
@@ -496,11 +477,14 @@ msgid ""
 "take a look at the <ulink url=\"http://www.debian.org/ports/\">&debian;-"
 "Ports</ulink> pages."
 msgstr ""
-"Tài liệu này bao quát sự cài đặt cho kiến trúc <emphasis>&arch-title;</emphasis> dùng hạt nhân <emphasis>&arch-kernel;</emphasis>. Nếu bạn tìm thông tin về bất cứ kiến trúc khác nào được &debian; hỗ trợ, xem trang <ulink url=\"http://www.debian.org/ports/\">Bản Chuyển &debian;</ulink>."
+"Tài liệu này bao quát sự cài đặt cho kiến trúc <emphasis>&arch-title;</"
+"emphasis> dùng hạt nhân <emphasis>&arch-kernel;</emphasis>. Nếu bạn tìm "
+"thông tin về bất cứ kiến trúc khác nào được &debian; hỗ trợ, xem trang "
+"<ulink url=\"http://www.debian.org/ports/\">Bản Chuyển &debian;</ulink>."
 
+#. Tag: para
 #: hardware.xml:206
 #, no-c-format
-#. Tag: para
 msgid ""
 "The &arch-title; architecture only supports Intel Itanium processors and not "
 "the much more common 64-bit processors from the EM64T family (including e.g. "
@@ -514,18 +498,9 @@ msgstr ""
 "emphasis>, hoặc nếu bạn thích sử dụng một vùng người dùng 32-bit, bởi kiến "
 "trúc <emphasis>i386</emphasis>."
 
+#. Tag: para
 #: hardware.xml:216
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This is the first official release of &debian-gnu; for the &arch-title; "
-#| "architecture. We feel that it has proven itself sufficiently to be "
-#| "released. However, because it has not had the exposure (and hence testing "
-#| "by users) that some other architectures have had, you may encounter a few "
-#| "bugs. Use our <ulink url=\"&url-bts;\">Bug Tracking System</ulink> to "
-#| "report any problems; make sure to mention the fact that the bug is on the "
-#| "&arch-title; platform. It can be necessary to use the <ulink url=\"&url-"
-#| "list-subscribe;\">debian-&arch-listname; mailing list</ulink> as well."
 msgid ""
 "This is the first official release of &debian-gnu; for the &arch-title; "
 "architecture. We feel that it has proven itself sufficiently to be released. "
@@ -537,27 +512,26 @@ msgid ""
 "necessary to use the <ulink url=\"&url-list-subscribe;\">debian-&arch-"
 "listname; mailing list</ulink> as well."
 msgstr ""
-"Đây là bản phát hành &debian-gnu; chính thức thứ nhất cho kiến trúc &arch-title;. Chúng tôi xem là nó đủ hữu hiệu để được phát hành. Tuy nhiên, vì nó chưa được thử ra bởi cùng một số người dùng với các kiến trúc khác, bạn có thể gặp vài lỗi. Xin hãy sử dụng <ulink url=\"&url-bts;\">Hệ thống theo dõi lỗi</"
-"ulink> của &debian; để thông báo lỗi nào; kiểm tra lại bạn nói rằng lỗi đó xảy ra trên nền tảng &arch-title; dùng hạt nhân <emphasis>&arch-kernel;</emphasis>. Cũng đề nghị bạn thảo luận vấn đề đó trong "
-"hộp thư chung <ulink url=\"&url-list-subscribe;\">debian-&arch-listname;</ulink>."
+"Đây là bản phát hành &debian-gnu; chính thức thứ nhất cho kiến trúc &arch-"
+"title;. Chúng tôi xem là nó đủ hữu hiệu để được phát hành. Tuy nhiên, vì nó "
+"chưa được thử ra bởi cùng một số người dùng với các kiến trúc khác, bạn có "
+"thể gặp vài lỗi. Xin hãy sử dụng <ulink url=\"&url-bts;\">Hệ thống theo dõi "
+"lỗi</ulink> của &debian; để thông báo lỗi nào; kiểm tra lại bạn nói rằng lỗi "
+"đó xảy ra trên nền tảng &arch-title; dùng hạt nhân <emphasis>&arch-kernel;</"
+"emphasis>. Cũng đề nghị bạn thảo luận vấn đề đó trong hộp thư chung <ulink "
+"url=\"&url-list-subscribe;\">debian-&arch-listname;</ulink>."
 
-#: hardware.xml:239
-#: hardware.xml:275
-#: hardware.xml:381
-#: hardware.xml:400
-#: hardware.xml:483
-#: hardware.xml:541
-#: hardware.xml:594
-#, no-c-format
 #. Tag: title
+#: hardware.xml:239 hardware.xml:275 hardware.xml:381 hardware.xml:400
+#: hardware.xml:483 hardware.xml:541 hardware.xml:594
+#, no-c-format
 msgid "CPU, Main Boards, and Video Support"
 msgstr ""
 "Đơn vị xử lý trung tâm (CPU), bo mạch chính và khả năng hỗ trợ ảnh động"
 
-#: hardware.xml:240
-#: hardware.xml:401
-#, no-c-format
 #. Tag: para
+#: hardware.xml:240 hardware.xml:401
+#, no-c-format
 msgid ""
 "Complete information concerning supported peripherals can be found at <ulink "
 "url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>. "
@@ -568,73 +542,61 @@ msgstr ""
 "\">Linux Hardware Compatibility HOWTO</ulink>. Tiết đoạn này đơn giản tóm "
 "tắt các điểm cơ bản."
 
-#: hardware.xml:248
-#: hardware.xml:409
-#: hardware.xml:518
-#, no-c-format
 #. Tag: title
+#: hardware.xml:248 hardware.xml:409 hardware.xml:518
+#, no-c-format
 msgid "<title>CPU</title>"
 msgstr "<title>CPU</title>"
 
+#. Tag: para
 #: hardware.xml:249
 #, no-c-format
-#. Tag: para
 msgid "Both AMD64 and Intel EM64T processors are supported."
 msgstr "Hỗ trợ bộ xử lý kiểu cả hai AMD64 và EM64T."
 
+#. Tag: para
 #: hardware.xml:277
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Each distinct ARM architecture requires its own kernel. Because of this "
-#| "the standard Debian distribution only supports installation on a number "
-#| "of the most common platforms. The Debian userland however may be used by "
-#| "<emphasis>any</emphasis> ARM CPU."
 msgid ""
 "Each distinct ARM architecture requires its own kernel. Because of this the "
 "standard &debian; distribution only supports installation on a number of the "
 "most common platforms. The &debian; userland however may be used by "
 "<emphasis>any</emphasis> ARM CPU."
 msgstr ""
-"Mỗi kiến trúc ARM riêng thì yêu cầu hạt nhân tương ứng. Do đó bản phát hành &debian; tiêu chuẩn chỉ hỗ trợ cài đặt vào một số nền tảng thường dùng nhất. Tuy nhiên, các phần mềm &debian; bên ngoài hạt nhân (« miền người dùng &debian; ») cũng chạy được trên <emphasis>bất cứ</emphasis> bộ xử lý trung tâm nào có kiểu ARM."
+"Mỗi kiến trúc ARM riêng thì yêu cầu hạt nhân tương ứng. Do đó bản phát hành "
+"&debian; tiêu chuẩn chỉ hỗ trợ cài đặt vào một số nền tảng thường dùng nhất. "
+"Tuy nhiên, các phần mềm &debian; bên ngoài hạt nhân (« miền người dùng "
+"&debian; ») cũng chạy được trên <emphasis>bất cứ</emphasis> bộ xử lý trung "
+"tâm nào có kiểu ARM."
 
+#. Tag: para
 #: hardware.xml:286
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Most ARM CPUs may be run in either endian mode (big or little). However, "
-#| "the majority of current system implementation uses little-endian mode. "
-#| "Debian currently only supports little-endian ARM systems."
 msgid ""
 "Most ARM CPUs may be run in either endian mode (big or little). However, the "
 "majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
-"Phần lớn các bộ xử lý trung tâm kiểu ARM chạy được trong chế độ về cuối (endian) hoặc lớn hoặc nhỏ. Tuy nhiên, phần lớn các bản thực hiện hệ thống hiện thời sử dụng chế độ về cuối nhỏ. &debian; hỗ trợ hiện thời chỉ hệ thống ARM về cuối nhỏ."
+"Phần lớn các bộ xử lý trung tâm kiểu ARM chạy được trong chế độ về cuối "
+"(endian) hoặc lớn hoặc nhỏ. Tuy nhiên, phần lớn các bản thực hiện hệ thống "
+"hiện thời sử dụng chế độ về cuối nhỏ. &debian; hỗ trợ hiện thời chỉ hệ thống "
+"ARM về cuối nhỏ."
 
+#. Tag: para
 #: hardware.xml:294
 #, no-c-format
-#. Tag: para
 msgid "The supported platforms are:"
 msgstr "Những nền tảng đã hỗ trợ :"
 
+#. Tag: term
 #: hardware.xml:301
 #, no-c-format
-#. Tag: term
 msgid "IOP32x"
 msgstr "IOP32x"
 
+#. Tag: para
 #: hardware.xml:302
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing. Debian currently supports the IOP32x "
-#| "platform, featuring the IOP 80219 and 32x chips commonly found in Network "
-#| "Attached Storage (NAS) devices. Debian explicitly supports two such "
-#| "devices: the <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> "
-#| "from IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</"
-#| "ulink>."
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing. &debian; currently supports the IOP32x "
@@ -643,18 +605,22 @@ msgid ""
 "devices: the <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> from "
 "IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
 msgstr ""
-"Mẫu Bộ Xử Lý V/R (IOP) của công ty Intel nằm trong một số sản phẩm liên quan đến chức năng cất giữ dữ liệu và xử lý dữ liệu. &debian; hiện thời hỗ trợ nền tảng IOP32x (chứa những phiến tinh thể IOP 80219 và 32x thường gặp trong thiết bị Sức Chứa Gắn với Mạng (NAS)). &debian; hỗ trợ dứt khoát hai thiết bị như vậy: <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> của IO-Data "
-"và <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
+"Mẫu Bộ Xử Lý V/R (IOP) của công ty Intel nằm trong một số sản phẩm liên quan "
+"đến chức năng cất giữ dữ liệu và xử lý dữ liệu. &debian; hiện thời hỗ trợ "
+"nền tảng IOP32x (chứa những phiến tinh thể IOP 80219 và 32x thường gặp trong "
+"thiết bị Sức Chứa Gắn với Mạng (NAS)). &debian; hỗ trợ dứt khoát hai thiết "
+"bị như vậy: <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> của "
+"IO-Data và <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
 
+#. Tag: term
 #: hardware.xml:315
 #, no-c-format
-#. Tag: term
 msgid "IXP4xx"
 msgstr "IXP4xx"
 
+#. Tag: para
 #: hardware.xml:316
 #, no-c-format
-#. Tag: para
 msgid ""
 "The IXP4xx platform is based on Intel's XScale ARM core. Currently, only one "
 "IXP4xx based system is supported, the Linksys NSLU2. The Linksys NSLU2 "
@@ -672,15 +638,15 @@ msgstr ""
 "cyrius-nslu2;\">những hướng dẫn cài đặt</ulink> ở một nơi Mạng bên ngoài."
 
 # Tên
+#. Tag: term
 #: hardware.xml:330
 #, no-c-format
-#. Tag: term
 msgid "Kirkwood"
 msgstr "Kirkwood"
 
+#. Tag: para
 #: hardware.xml:331
 #, no-c-format
-#. Tag: para
 msgid ""
 "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
 "CPU, Ethernet, SATA, USB, and other functionality in one chip. We currently "
@@ -698,15 +664,15 @@ msgstr ""
 "kirkwood;\">QNAP Turbo Station</ulink> (TS-110, TS-119, TS-210, TS-219, "
 "TS-219P; chưa hỗ trợ TS-410 và TS-419P)."
 
+#. Tag: term
 #: hardware.xml:346
 #, no-c-format
-#. Tag: term
 msgid "Orion5x"
 msgstr "Orion5x"
 
+#. Tag: para
 #: hardware.xml:347
 #, no-c-format
-#. Tag: para
 msgid ""
 "Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
 "Ethernet, SATA, USB, and other functionality in one chip. There are many "
@@ -725,18 +691,15 @@ msgstr ""
 "<ulink url=\"&url-arm-cyrius-qnap;\">QNAP Turbo Station</ulink> (TS-109, "
 "TS-209 và TS-409)."
 
+#. Tag: term
 #: hardware.xml:362
 #, no-c-format
-#. Tag: term
 msgid "<term>Versatile</term>"
 msgstr "<term>Versatile</term>"
 
+#. Tag: para
 #: hardware.xml:363
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The Versatile platform is emulated by QEMU and is therefore a nice way to "
-#| "test and run Debian on ARM if you don't have the hardware."
 msgid ""
 "The Versatile platform is emulated by QEMU and is therefore a nice way to "
 "test and run &debian; on ARM if you don't have the hardware."
@@ -744,9 +707,9 @@ msgstr ""
 "Nền tảng Versatile được QEMU mô phỏng thì giúp thử và chạy &debian; trên ARM "
 "nếu không có phần cứng riêng."
 
+#. Tag: para
 #: hardware.xml:382
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
 "RISC 1.1 and PA-RISC 2.0. The PA-RISC 1.1 architecture is targeted at 32-bit "
@@ -762,9 +725,9 @@ msgstr ""
 "phần mềm bên ngoài hạt nhân) là 32-bit. Trong tương lai, có lẽ miền người "
 "dùng là 64-bit."
 
+#. Tag: para
 #: hardware.xml:410
 #, no-c-format
-#. Tag: para
 msgid ""
 "Nearly all x86-based (IA-32) processors still in use in personal computers "
 "are supported, including all varieties of Intel's \"Pentium\" series. This "
@@ -776,27 +739,9 @@ msgstr ""
 "Cũng gồm các bộ xử lý 32-bit kiểu AMD và VIA (tên trước là Cyrix), và các bộ "
 "xử lý như Athlon XP và Intel P4 Xeon."
 
+#. Tag: para
 #: hardware.xml:417
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run "
-#| "on 386 or earlier processors. Despite the architecture name \"i386\", "
-#| "support for actual 80386 processors (and their clones) was dropped with "
-#| "the Sarge (r3.1) release of Debian<footnote> <para> We have long tried to "
-#| "avoid this, but in the end it was necessary due a unfortunate series of "
-#| "issues with the compiler and the kernel, starting with an bug in the C++ "
-#| "ABI provided by GCC. You should still be able to run Debian GNU/Linux on "
-#| "actual 80386 processors if you compile your own kernel and compile all "
-#| "packages from source, but that is beyond the scope of this manual. </"
-#| "para> </footnote>. (No version of Linux has ever supported the 286 or "
-#| "earlier chips in the series.) All i486 and later processors are still "
-#| "supported<footnote> <para> Many Debian packages will actually run "
-#| "slightly faster on modern computers as a positive side effect of dropping "
-#| "support for these old chips. The i486, introduced in 1989, has three "
-#| "opcodes (bswap, cmpxchg, and xadd) which the i386, introduced in 1986, "
-#| "did not have. Previously, these could not be easily used by most Debian "
-#| "packages; now they can. </para> </footnote>."
 msgid ""
 "However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
 "on 386 or earlier processors. Despite the architecture name \"i386\", "
@@ -817,13 +762,27 @@ msgid ""
 "footnote>."
 msgstr ""
 "Tuy nhiên, &debian; GNU/Linux &releasename; <emphasis>không phải</emphasis> "
-"chạy được trên bộ xử lý kiểu 386 hay cũ hơn. Bất chấp tên kiến trúc \"i386\", chức năng hỗ trợ bộ xử lý 80386 thật (và các bộ nhái) <emphasis>bị bỏ</emphasis> trong bản phát hành Sarge (r3.1) của &debian;<footnote> <para>Chúng tôi đã từ lâu cố gắng tránh trường hợp này, nhưng mà cuối cùng "
-"cần phải bỏ hỗ trợ do một dãy rủi ro các vấn đề với bộ biên dịch và hạt nhân, đầu tiên là một lỗi trong ABI C++ được GCC cung cấp. Bạn vẫn còn nên có khả năng chạy &debian; GNU/Linux trên bộ xử lý kiểu 80386 thật, nếu bạn tự biên dịch một hạt nhân riêng và biên dịch mọi gói từ mã nguồn (hai tiến trình "
-"đó nằm ở ngoại phạm vị của sổ tay này).</para> </footnote>. (Chưa bao giờ có phiên bản Linux nào hỗ trợ phiến tinh thể 286 hay trước.) Mọi bộ xử lý kiểu i486 và sau đều vẫn còn được hỗ trợ.<footnote> <para> Nhiều gói &debian; thực sự chạy hơi nhanh hơn trên máy tính hiện đại : một hiệu ứng khác tốt khi bỏ chức năng hỗ trợ những phiến tinh thể cũ này. Chíp i486, được giới thiệu trong năm 1989, có ba mã thao tác (bswap, cmpxchg, xadd) mà chíp i386, được giới thiệu trong năm 1986, không có. Về trước, ba mã thao tác này không thể được sử dụng dễ dàng bởi phần lớn các gói &debian;; bây giờ có thể. </para> </footnote>."
+"chạy được trên bộ xử lý kiểu 386 hay cũ hơn. Bất chấp tên kiến trúc "
+"\"i386\", chức năng hỗ trợ bộ xử lý 80386 thật (và các bộ nhái) <emphasis>bị "
+"bỏ</emphasis> trong bản phát hành Sarge (r3.1) của &debian;<footnote> "
+"<para>Chúng tôi đã từ lâu cố gắng tránh trường hợp này, nhưng mà cuối cùng "
+"cần phải bỏ hỗ trợ do một dãy rủi ro các vấn đề với bộ biên dịch và hạt "
+"nhân, đầu tiên là một lỗi trong ABI C++ được GCC cung cấp. Bạn vẫn còn nên "
+"có khả năng chạy &debian; GNU/Linux trên bộ xử lý kiểu 80386 thật, nếu bạn "
+"tự biên dịch một hạt nhân riêng và biên dịch mọi gói từ mã nguồn (hai tiến "
+"trình đó nằm ở ngoại phạm vị của sổ tay này).</para> </footnote>. (Chưa bao "
+"giờ có phiên bản Linux nào hỗ trợ phiến tinh thể 286 hay trước.) Mọi bộ xử "
+"lý kiểu i486 và sau đều vẫn còn được hỗ trợ.<footnote> <para> Nhiều gói "
+"&debian; thực sự chạy hơi nhanh hơn trên máy tính hiện đại : một hiệu ứng "
+"khác tốt khi bỏ chức năng hỗ trợ những phiến tinh thể cũ này. Chíp i486, "
+"được giới thiệu trong năm 1989, có ba mã thao tác (bswap, cmpxchg, xadd) mà "
+"chíp i386, được giới thiệu trong năm 1986, không có. Về trước, ba mã thao "
+"tác này không thể được sử dụng dễ dàng bởi phần lớn các gói &debian;; bây "
+"giờ có thể. </para> </footnote>."
 
+#. Tag: para
 #: hardware.xml:450
 #, no-c-format
-#. Tag: para
 msgid ""
 "If your system has a 64-bit processor from the AMD64 or Intel EM64T "
 "families, you will probably want to use the installer for the amd64 "
@@ -833,46 +792,31 @@ msgstr ""
 "dụng bộ cài đặt cho kiến trúc amd64 thay cho bộ cài đặt cho kiến trúc i386 "
 "(32-bit)."
 
+#. Tag: title
 #: hardware.xml:459
 #, no-c-format
-#. Tag: title
 msgid "I/O Bus"
 msgstr "Mạch nối V/R"
 
+#. Tag: para
 #: hardware.xml:460
 #, no-c-format
-#. Tag: para
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "Mạch nối hệ thống (system bus) là phần của bo mạch chủ mà cho phép bộ xử lý "
 "trung tâm (CPU) liên lạc với ngoại vi như thiết bị lưu trữ. Máy tính của bạn "
-"phải sử dụng mạch nối kiểu  ISA, EISA, PCI, PCIe, PCI-X, hoặc VESA Local Bus (VLB, "
-"đôi khi được gọi là VL bus). Thật là tất cả các máy tính cá nhân được bán "
-"trong những năm gần đây có phải sử dụng một của mạch nối hệ thống này."
+"phải sử dụng mạch nối kiểu  ISA, EISA, PCI, PCIe, PCI-X, hoặc VESA Local Bus "
+"(VLB, đôi khi được gọi là VL bus). Thật là tất cả các máy tính cá nhân được "
+"bán trong những năm gần đây có phải sử dụng một của mạch nối hệ thống này."
 
+#. Tag: para
 #: hardware.xml:484
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
-#| "Indigo 2 and Challenge S. Since these machines are very similar, whenever "
-#| "this document refers to the SGI Indy, the Indigo 2 and Challenge S are "
-#| "meant as well. </para></listitem> <listitem><para> SGI IP32: this "
-#| "platform is generally known as SGI O2. </para></listitem> "
-#| "<listitem><para> MIPS Malta: this platform is emulated by QEMU and is "
-#| "therefore a nice way to test and run Debian on MIPS if you don't have the "
-#| "hardware. </para></listitem> </itemizedlist> Complete information "
-#| "regarding supported mips/mipsel machines can be found at the <ulink url="
-#| "\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. In the following, only "
-#| "the systems supported by the Debian installer will be covered. If you are "
-#| "looking for support for other subarchitectures, please contact the <ulink "
-#| "url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
@@ -890,29 +834,36 @@ msgid ""
 "debian-&arch-listname; mailing list</ulink>."
 msgstr ""
 "&debian; chạy trên kiến trúc &arch-title; thì hỗ trợ những nền tảng này: "
-"<itemizedlist> <listitem><para> SGI IP22: nền tảng này bao gồm những máy SGI tên Indy, Indigo 2 và Challenge S. Vì các máy này rất tương tự với nhau, khi nào tài liệu này nói đến « SGI Indy », cũng nói đến Indigo 2 và Challenge S. </para></listitem>"
-"<listitem><para> SGI IP32: nền tảng này thường được gọi như là « SGI O2 ».</para></listitem> <listitem><para> MIPS Malta: nền tảng này được QEMU mô phỏng thì giúp thử và chạy &debian; trên MIPS nếu không có phần cứng riêng.</para></listitem></itemizedlist> "
-"Thông tin hoàn toàn về các máy kiểu mips/mipsel được hỗ trợ cũng được hiển thị trên <ulink url=\"&url-linux-mips;\">trang chủ Linux-MIPS</ulink>. Thông tin theo đây diễn tả chỉ những hệ thống được hỗ trợ bởi Trình cài đặt &debian;. Nếu bạn tìm hỗ trợ cho kiến trúc phụ khác nào, xin hãy liên lạc với hộp thư chung <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname;</ulink>."
+"<itemizedlist> <listitem><para> SGI IP22: nền tảng này bao gồm những máy SGI "
+"tên Indy, Indigo 2 và Challenge S. Vì các máy này rất tương tự với nhau, khi "
+"nào tài liệu này nói đến « SGI Indy », cũng nói đến Indigo 2 và Challenge S. "
+"</para></listitem><listitem><para> SGI IP32: nền tảng này thường được gọi "
+"như là « SGI O2 ».</para></listitem> <listitem><para> MIPS Malta: nền tảng "
+"này được QEMU mô phỏng thì giúp thử và chạy &debian; trên MIPS nếu không có "
+"phần cứng riêng.</para></listitem></itemizedlist> Thông tin hoàn toàn về các "
+"máy kiểu mips/mipsel được hỗ trợ cũng được hiển thị trên <ulink url=\"&url-"
+"linux-mips;\">trang chủ Linux-MIPS</ulink>. Thông tin theo đây diễn tả chỉ "
+"những hệ thống được hỗ trợ bởi Trình cài đặt &debian;. Nếu bạn tìm hỗ trợ "
+"cho kiến trúc phụ khác nào, xin hãy liên lạc với hộp thư chung <ulink url="
+"\"&url-list-subscribe;\"> debian-&arch-listname;</ulink>."
 
+#. Tag: para
 #: hardware.xml:519
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 "
-#| "and R5000 processors are supported by the Debian installation system on "
-#| "big endian MIPS. On SGI IP32, currently only systems based on the R5000 "
-#| "are supported."
 msgid ""
 "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
 "R5000 processors are supported by the &debian; installation system on big "
 "endian MIPS. On SGI IP32, currently only systems based on the R5000 are "
 "supported."
 msgstr ""
-"Trên SGI IP22, các máy SGI tên Indy, Indigo 2 và Challenge S chứa bộ xử lý R4000, R4400, R4600 và R5000 đều được hỗ trợ bởi hệ thống cài đặt &debian; trên MIPS về cuối lớn. Còn trên SGI IP32, hiện thời chỉ hỗ trợ những hệ thống dựa vào bộ xử lý R5000."
+"Trên SGI IP22, các máy SGI tên Indy, Indigo 2 và Challenge S chứa bộ xử lý "
+"R4000, R4400, R4600 và R5000 đều được hỗ trợ bởi hệ thống cài đặt &debian; "
+"trên MIPS về cuối lớn. Còn trên SGI IP32, hiện thời chỉ hỗ trợ những hệ "
+"thống dựa vào bộ xử lý R5000."
 
+#. Tag: para
 #: hardware.xml:525
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some MIPS machines can be operated in both big and little endian mode. For "
 "little endian MIPS, please read the documentation for the mipsel "
@@ -922,22 +873,9 @@ msgstr ""
 "nhỏ. Đối với MIPS về cuối nhỏ, xem tài liệu hướng dẫn về kiến trúc "
 "<emphasis>mipsel</emphasis>."
 
+#. Tag: para
 #: hardware.xml:542
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-#| "covered here. This includes the Cobalt RaQ, Qube2 and RaQ2, and the "
-#| "Gateway Microserver. </para></listitem> <listitem><para> MIPS Malta: this "
-#| "platform is emulated by QEMU and is therefore a nice way to test and run "
-#| "Debian on MIPS if you don't have the hardware. </para></listitem> </"
-#| "itemizedlist> Complete information regarding supported mips/mipsel "
-#| "machines can be found at the <ulink url=\"&url-linux-mips;\">Linux-MIPS "
-#| "homepage</ulink>. In the following, only the systems supported by the "
-#| "Debian installer will be covered. If you are looking for support for "
-#| "other subarchitectures, please contact the <ulink url=\"&url-list-"
-#| "subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -952,44 +890,48 @@ msgid ""
 "contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; "
 "mailing list</ulink>."
 msgstr ""
-"&debian; trên &arch-title; thì hỗ trợ những nền tảng theo đây: <itemizedlist> "
-"<listitem><para> Cobalt Microserver: chỉ những máy Cobalt dựa vào MIPS được bao "
-"quát ở đây. Gồm có Cobalt RaQ, Qube2 và RaQ2, và Gateway Microserver. </"
-"para></listitem>"
-"<listitem><para> MIPS Malta: nền tảng này được QEMU mô phỏng thì giúp thử và chạy &debian; trên MIPS nếu không có phần cứng riêng. </para></listitem></itemizedlist> "
-"Thông tin hoàn toàn về những máy mips/mipsel được hỗ trợ cũng được hiển thị trên <ulink url=\"&url-linux-mips;\">trang chủ Linux-MIPS</ulink>. Thông tin theo đây chỉ bao quát những hệ thống được hỗ "
-"trợ bởi trình cài đặt &debian;. Nếu bạn tìm hỗ trợ cho kiến trúc phụ khác nào, xin hãy liên lạc với <ulink url=\"&url-list-subscribe;\">hộp thư chung debian-&arch-listname;</ulink>."
+"&debian; trên &arch-title; thì hỗ trợ những nền tảng theo đây: "
+"<itemizedlist> <listitem><para> Cobalt Microserver: chỉ những máy Cobalt dựa "
+"vào MIPS được bao quát ở đây. Gồm có Cobalt RaQ, Qube2 và RaQ2, và Gateway "
+"Microserver. </para></listitem><listitem><para> MIPS Malta: nền tảng này "
+"được QEMU mô phỏng thì giúp thử và chạy &debian; trên MIPS nếu không có phần "
+"cứng riêng. </para></listitem></itemizedlist> Thông tin hoàn toàn về những "
+"máy mips/mipsel được hỗ trợ cũng được hiển thị trên <ulink url=\"&url-linux-"
+"mips;\">trang chủ Linux-MIPS</ulink>. Thông tin theo đây chỉ bao quát những "
+"hệ thống được hỗ trợ bởi trình cài đặt &debian;. Nếu bạn tìm hỗ trợ cho kiến "
+"trúc phụ khác nào, xin hãy liên lạc với <ulink url=\"&url-list-subscribe;"
+"\">hộp thư chung debian-&arch-listname;</ulink>."
 
+#. Tag: title
 #: hardware.xml:570
 #, no-c-format
-#. Tag: title
 msgid "CPU/Machine types"
 msgstr "Kiểu máy/bộ xử lý trung tâm"
 
+#. Tag: para
 #: hardware.xml:572
 #, no-c-format
-#. Tag: para
 msgid ""
 "All MIPS based Cobalt machines are supported with the exception of the Qube "
 "2700 (Qube 1)."
 msgstr ""
 "Tất cả các máy Cobalt dựa vào MIPS thì được hỗ trợ, trừ Qube 2700 (Qube 1)."
 
+#. Tag: title
 #: hardware.xml:580
 #, no-c-format
-#. Tag: title
 msgid "Supported console options"
 msgstr "Tùy chọn bàn giao tiếp được hỗ trợ"
 
+#. Tag: para
 #: hardware.xml:581
 #, no-c-format
-#. Tag: para
 msgid "Cobalt machines use 115200 bps."
 msgstr "Máy Cobalt dùng 115200 bps."
 
+#. Tag: para
 #: hardware.xml:595
 #, no-c-format
-#. Tag: para
 msgid ""
 "For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
 "PreP subarchitectures are supported."
@@ -997,34 +939,31 @@ msgstr ""
 "Trong &debian-gnu; &release;, chỉ hỗ trợ hai kiến trúc con PMac (Power-"
 "Macintosh hay PowerMac) và PreP."
 
+#. Tag: title
 #: hardware.xml:616
 #, no-c-format
-#. Tag: title
 msgid "Kernel Flavours"
 msgstr "Mùi vị hạt nhân"
 
+#. Tag: para
 #: hardware.xml:618
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "There are two flavours of the powerpc kernel in Debian, based on the CPU "
-#| "type:"
 msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
-"Trong &debian; có hai mùi vị của hạt nhân powerpc, dựa vào kiểu bộ xử lý trung "
-"tâm (CPU):"
+"Trong &debian; có hai mùi vị của hạt nhân powerpc, dựa vào kiểu bộ xử lý "
+"trung tâm (CPU):"
 
+#. Tag: term
 #: hardware.xml:625
 #, no-c-format
-#. Tag: term
 msgid "<term>powerpc</term>"
 msgstr "<term>powerpc</term>"
 
+#. Tag: para
 #: hardware.xml:626
 #, no-c-format
-#. Tag: para
 msgid ""
 "Most systems use this kernel flavour, which supports the PowerPC 601, 603, "
 "604, 740, 750, and 7400 processors. All Apple PowerMac machines up to and "
@@ -1034,21 +973,21 @@ msgstr ""
 "601, 603, 604, 740, 750, và 7400. Mọi máy PowerMac của Apple đến G4 sử dụng "
 "một của những bộ xử lý này."
 
+#. Tag: term
 #: hardware.xml:636
 #, no-c-format
-#. Tag: term
 msgid "power64"
 msgstr "power64"
 
+#. Tag: para
 #: hardware.xml:637
 #, no-c-format
-#. Tag: para
 msgid "The power64 kernel flavour supports the following CPUs:"
 msgstr "Mùi vị hạt nhân kiểu power64 hỗ trợ những bộ xử lý trung tâm này:"
 
+#. Tag: para
 #: hardware.xml:641
 #, no-c-format
-#. Tag: para
 msgid ""
 "The POWER3 processor is used in older IBM 64-bit server systems: known "
 "models include the IntelliStation POWER Model 265, the pSeries 610 and 640, "
@@ -1058,9 +997,9 @@ msgstr ""
 "được biết gồm IntelliStation POWER Model 265, pSeries 610 và 640, và RS/6000 "
 "7044-170, 7043-260, 7044-270."
 
+#. Tag: para
 #: hardware.xml:647
 #, no-c-format
-#. Tag: para
 msgid ""
 "The POWER4 processor is used in more recent IBM 64-bit server systems: known "
 "models include the pSeries 615, 630, 650, 655, 670, and 690."
@@ -1068,9 +1007,9 @@ msgstr ""
 "Bộ xử lý POWER4 được dùng trong máy phục vụ 64-bit IBM mới hơn: những mô "
 "hình được biết gồm pSeries 615, 630, 650, 655, 670, 690."
 
+#. Tag: para
 #: hardware.xml:652
 #, no-c-format
-#. Tag: para
 msgid ""
 "Systems using the Apple G5 (PPC970FX processor) are also based on the POWER4 "
 "architecture, and use this kernel flavour."
@@ -1078,31 +1017,29 @@ msgstr ""
 "Hệ thống dùng Apple G5 (bộ xử lý PPC970FX) cũng dựa vào kiến trúc POWER4 thì "
 "dùng mùi vị hạt nhân này."
 
+#. Tag: title
 #: hardware.xml:686
 #, no-c-format
-#. Tag: title
 msgid "Power Macintosh (pmac) subarchitecture"
 msgstr "Kiến trúc phụ Power Macintosh (pmac)"
 
+#. Tag: para
 #: hardware.xml:688
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
-#| "example) made a series of Macintosh computers based on the PowerPC "
-#| "processor. For purposes of architecture support, they are categorized as "
-#| "NuBus (not supported by Debian), OldWorld, and NewWorld."
 msgid ""
 "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
 "example) made a series of Macintosh computers based on the PowerPC "
 "processor. For purposes of architecture support, they are categorized as "
 "NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
-"Công ty Apple (và ngắn gọn một số hãng chế tạo khác như Power Computing) đã xây dựng một nhóm máy tính Macintosh dựa vào bộ xử lý PowerPC. Nhằm mục đích hỗ trợ kiến trúc, những máy này phân loại ra NuBus (không phải được hỗ trợ bởi &debian;), OldWorld (kiểu cũ), và NewWorld (kiểu mới)."
+"Công ty Apple (và ngắn gọn một số hãng chế tạo khác như Power Computing) đã "
+"xây dựng một nhóm máy tính Macintosh dựa vào bộ xử lý PowerPC. Nhằm mục đích "
+"hỗ trợ kiến trúc, những máy này phân loại ra NuBus (không phải được hỗ trợ "
+"bởi &debian;), OldWorld (kiểu cũ), và NewWorld (kiểu mới)."
 
+#. Tag: para
 #: hardware.xml:695
 #, no-c-format
-#. Tag: para
 msgid ""
 "OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
 "bus. Most 603, 603e, 604, and 604e based Power Macintoshes are OldWorld "
@@ -1114,9 +1051,9 @@ msgstr ""
 "kiểu cũ. Những mô hình PowerPC trước iMac của Apple có tên chứa bốn chữ số, "
 "trừ những hệ thống G3 màu be mà cũng là kiểu cũ."
 
+#. Tag: para
 #: hardware.xml:703
 #, no-c-format
-#. Tag: para
 msgid ""
 "The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
 "plastic cases and later models. That includes all iMacs, iBooks, G4 systems, "
@@ -1131,9 +1068,9 @@ msgstr ""
 "phân loại vì dùng hệ thống <quote>ROM trong RAM</quote> trong hệ điều hành "
 "Mac OS. Chúng được chế tạo kể từ tháng 6/7 năm 1998."
 
+#. Tag: para
 #: hardware.xml:711
 #, no-c-format
-#. Tag: para
 msgid ""
 "Specifications for Apple hardware are available at <ulink url=\"http://www."
 "info.apple.com/support/applespec.html\">AppleSpec</ulink>, and, for older "
@@ -1145,422 +1082,382 @@ msgstr ""
 "hơn tại <ulink url=\"http://www.info.apple.com/support/applespec.legacy/"
 "index.html\">AppleSpec Legacy</ulink>."
 
-#: hardware.xml:727
-#: hardware.xml:862
-#: hardware.xml:906
-#: hardware.xml:935
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:727 hardware.xml:862 hardware.xml:906 hardware.xml:935
+#, no-c-format
 msgid "Model Name/Number"
 msgstr "Tên/số mô hình"
 
+#. Tag: entry
 #: hardware.xml:728
 #, no-c-format
-#. Tag: entry
 msgid "Generation"
 msgstr "Thế hệ"
 
+#. Tag: entry
 #: hardware.xml:734
 #, no-c-format
-#. Tag: entry
 msgid "Apple"
 msgstr "Apple"
 
+#. Tag: entry
 #: hardware.xml:735
 #, no-c-format
-#. Tag: entry
 msgid "iMac Bondi Blue, 5 Flavors, Slot Loading"
 msgstr "iMac Bondi Blue, 5 mùi vị, tải đĩa qua khe"
 
-#: hardware.xml:736
-#: hardware.xml:739
-#: hardware.xml:742
-#: hardware.xml:745
-#: hardware.xml:748
-#: hardware.xml:751
-#: hardware.xml:754
-#: hardware.xml:757
-#: hardware.xml:760
-#: hardware.xml:763
-#: hardware.xml:766
-#: hardware.xml:769
-#: hardware.xml:772
-#: hardware.xml:775
-#: hardware.xml:778
-#: hardware.xml:781
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:736 hardware.xml:739 hardware.xml:742 hardware.xml:745
+#: hardware.xml:748 hardware.xml:751 hardware.xml:754 hardware.xml:757
+#: hardware.xml:760 hardware.xml:763 hardware.xml:766 hardware.xml:769
+#: hardware.xml:772 hardware.xml:775 hardware.xml:778 hardware.xml:781
+#, no-c-format
 msgid "NewWorld"
 msgstr "Kiểu mới"
 
+#. Tag: entry
 #: hardware.xml:738
 #, no-c-format
-#. Tag: entry
 msgid "iMac Summer 2000, Early 2001"
 msgstr "iMac tháng 6/7 năm 2000, năm 2001 sớm"
 
+#. Tag: entry
 #: hardware.xml:741
 #, no-c-format
-#. Tag: entry
 msgid "iMac G5"
 msgstr "iMac G5"
 
+#. Tag: entry
 #: hardware.xml:744
 #, no-c-format
-#. Tag: entry
 msgid "iBook, iBook SE, iBook Dual USB"
 msgstr "iBook, iBook SE, iBook Dual USB"
 
+#. Tag: entry
 #: hardware.xml:747
 #, no-c-format
-#. Tag: entry
 msgid "iBook2"
 msgstr "iBook2"
 
+#. Tag: entry
 #: hardware.xml:750
 #, no-c-format
-#. Tag: entry
 msgid "iBook G4"
 msgstr "iBook G4"
 
+#. Tag: entry
 #: hardware.xml:753
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh Blue and White (B&amp;W) G3"
 msgstr "Power Macintosh màu xanh dương và trắng (B&amp;W) G3"
 
+#. Tag: entry
 #: hardware.xml:756
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh G4 PCI, AGP, Cube"
 msgstr "Power Macintosh G4 PCI, AGP, Cube"
 
+#. Tag: entry
 #: hardware.xml:759
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh G4 Gigabit Ethernet"
 msgstr "Power Macintosh G4 Gigabit Ethernet"
 
+#. Tag: entry
 #: hardware.xml:762
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh G4 Digital Audio, Quicksilver"
 msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
 
+#. Tag: entry
 #: hardware.xml:765
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh G5"
 msgstr "Power Macintosh G5"
 
+#. Tag: entry
 #: hardware.xml:768
 #, no-c-format
-#. Tag: entry
 msgid "PowerBook G3 FireWire Pismo (2000)"
 msgstr "PowerBook G3 FireWire Pismo (2000)"
 
+#. Tag: entry
 #: hardware.xml:771
 #, no-c-format
-#. Tag: entry
 msgid "PowerBook G3 Lombard (1999)"
 msgstr "PowerBook G3 Lombard (1999)"
 
+#. Tag: entry
 #: hardware.xml:774
 #, no-c-format
-#. Tag: entry
 msgid "PowerBook G4 Titanium"
 msgstr "PowerBook G4 Titanium"
 
+#. Tag: entry
 #: hardware.xml:777
 #, no-c-format
-#. Tag: entry
 msgid "PowerBook G4 Aluminum"
 msgstr "PowerBook G4 Aluminum"
 
+#. Tag: entry
 #: hardware.xml:780
 #, no-c-format
-#. Tag: entry
 msgid "Xserve G5"
 msgstr "Xserve G5"
 
+#. Tag: entry
 #: hardware.xml:783
 #, no-c-format
-#. Tag: entry
 msgid "Performa 4400, 54xx, 5500"
 msgstr "Performa 4400, 54xx, 5500"
 
-#: hardware.xml:784
-#: hardware.xml:787
-#: hardware.xml:790
-#: hardware.xml:793
-#: hardware.xml:796
-#: hardware.xml:799
-#: hardware.xml:802
-#: hardware.xml:805
-#: hardware.xml:808
-#: hardware.xml:811
-#: hardware.xml:814
-#: hardware.xml:817
-#: hardware.xml:823
-#: hardware.xml:826
-#: hardware.xml:832
-#: hardware.xml:838
+#. Tag: entry
+#: hardware.xml:784 hardware.xml:787 hardware.xml:790 hardware.xml:793
+#: hardware.xml:796 hardware.xml:799 hardware.xml:802 hardware.xml:805
+#: hardware.xml:808 hardware.xml:811 hardware.xml:814 hardware.xml:817
+#: hardware.xml:823 hardware.xml:826 hardware.xml:832 hardware.xml:838
 #: hardware.xml:844
 #, no-c-format
-#. Tag: entry
 msgid "OldWorld"
 msgstr "Kiểu cũ"
 
+#. Tag: entry
 #: hardware.xml:786
 #, no-c-format
-#. Tag: entry
 msgid "Performa 6360, 6400, 6500"
 msgstr "Performa 6360, 6400, 6500"
 
+#. Tag: entry
 #: hardware.xml:789
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh 4400, 5400"
 msgstr "Power Macintosh 4400, 5400"
 
+#. Tag: entry
 #: hardware.xml:792
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh 7200, 7300, 7500, 7600"
 msgstr "Power Macintosh 7200, 7300, 7500, 7600"
 
+#. Tag: entry
 #: hardware.xml:795
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh 8200, 8500, 8600"
 msgstr "Power Macintosh 8200, 8500, 8600"
 
+#. Tag: entry
 #: hardware.xml:798
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh 9500, 9600"
 msgstr "Power Macintosh 9500, 9600"
 
+#. Tag: entry
 #: hardware.xml:801
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh (Beige) G3 Minitower"
 msgstr "Power Macintosh (Beige) G3 Minitower"
 
+#. Tag: entry
 #: hardware.xml:804
 #, no-c-format
-#. Tag: entry
 msgid "Power Macintosh (Beige) Desktop, All-in-One"
 msgstr "Power Macintosh (màu be) Desktop, cùng một phần"
 
+#. Tag: entry
 #: hardware.xml:807
 #, no-c-format
-#. Tag: entry
 msgid "PowerBook 2400, 3400, 3500"
 msgstr "PowerBook 2400, 3400, 3500"
 
+#. Tag: entry
 #: hardware.xml:810
 #, no-c-format
-#. Tag: entry
 msgid "PowerBook G3 Wallstreet (1998)"
 msgstr "PowerBook G3 Wallstreet (1998)"
 
+#. Tag: entry
 #: hardware.xml:813
 #, no-c-format
-#. Tag: entry
 msgid "Twentieth Anniversary Macintosh"
 msgstr "Twentieth Anniversary Macintosh"
 
+#. Tag: entry
 #: hardware.xml:816
 #, no-c-format
-#. Tag: entry
 msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
 msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
 
+#. Tag: entry
 #: hardware.xml:821
 #, no-c-format
-#. Tag: entry
 msgid "Power Computing"
 msgstr "Power Computing"
 
+#. Tag: entry
 #: hardware.xml:822
 #, no-c-format
-#. Tag: entry
 msgid "PowerBase, PowerTower / Pro, PowerWave"
 msgstr "PowerBase, PowerTower / Pro, PowerWave"
 
+#. Tag: entry
 #: hardware.xml:825
 #, no-c-format
-#. Tag: entry
 msgid "PowerCenter / Pro, PowerCurve"
 msgstr "PowerCenter / Pro, PowerCurve"
 
+#. Tag: entry
 #: hardware.xml:830
 #, no-c-format
-#. Tag: entry
 msgid "UMAX"
 msgstr "UMAX"
 
+#. Tag: entry
 #: hardware.xml:831
 #, no-c-format
-#. Tag: entry
 msgid "C500, C600, J700, S900"
 msgstr "C500, C600, J700, S900"
 
+#. Tag: entry
 #: hardware.xml:836
 #, no-c-format
-#. Tag: entry
 msgid "<entry>APS</entry>"
 msgstr "<entry>APS</entry>"
 
+#. Tag: entry
 #: hardware.xml:837
 #, no-c-format
-#. Tag: entry
 msgid "APS Tech M*Power 604e/2000"
 msgstr "APS Tech M*Power 604e/2000"
 
-#: hardware.xml:842
-#: hardware.xml:868
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:842 hardware.xml:868
+#, no-c-format
 msgid "Motorola"
 msgstr "Motorola"
 
+#. Tag: entry
 #: hardware.xml:843
 #, no-c-format
-#. Tag: entry
 msgid "Starmax 3000, 4000, 5000, 5500"
 msgstr "Starmax 3000, 4000, 5000, 5500"
 
+#. Tag: title
 #: hardware.xml:852
 #, no-c-format
-#. Tag: title
 msgid "PReP subarchitecture"
 msgstr "Kiến trúc phụ PReP"
 
+#. Tag: entry
 #: hardware.xml:869
 #, no-c-format
-#. Tag: entry
 msgid "Firepower, PowerStack Series E, PowerStack II"
 msgstr "Firepower, PowerStack Series E, PowerStack II"
 
+#. Tag: entry
 #: hardware.xml:871
 #, no-c-format
-#. Tag: entry
 msgid "MPC 7xx, 8xx"
 msgstr "MPC 7xx, 8xx"
 
+#. Tag: entry
 #: hardware.xml:873
 #, no-c-format
-#. Tag: entry
 msgid "MTX, MTX+"
 msgstr "MTX, MTX+"
 
+#. Tag: entry
 #: hardware.xml:875
 #, no-c-format
-#. Tag: entry
 msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
 msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
 
+#. Tag: entry
 #: hardware.xml:877
 #, no-c-format
-#. Tag: entry
 msgid "MCP(N)750"
 msgstr "MCP(N)750"
 
-#: hardware.xml:881
-#: hardware.xml:912
-#, no-c-format
 #. Tag: entry
+#: hardware.xml:881 hardware.xml:912
+#, no-c-format
 msgid "IBM RS/6000"
 msgstr "IBM RS/6000"
 
+#. Tag: entry
 #: hardware.xml:882
 #, no-c-format
-#. Tag: entry
 msgid "40P, 43P"
 msgstr "40P, 43P"
 
+#. Tag: entry
 #: hardware.xml:884
 #, no-c-format
-#. Tag: entry
 msgid "Power 830/850/860 (6070, 6050)"
 msgstr "Power 830/850/860 (6070, 6050)"
 
+#. Tag: entry
 #: hardware.xml:886
 #, no-c-format
-#. Tag: entry
 msgid "6030, 7025, 7043"
 msgstr "6030, 7025, 7043"
 
+#. Tag: entry
 #: hardware.xml:888
 #, no-c-format
-#. Tag: entry
 msgid "p640"
 msgstr "p640"
 
+#. Tag: title
 #: hardware.xml:896
 #, no-c-format
-#. Tag: title
 msgid "CHRP subarchitecture (unsupported)"
 msgstr "Kiến trúc con CHRP (không được hỗ trợ)"
 
+#. Tag: entry
 #: hardware.xml:913
 #, no-c-format
-#. Tag: entry
 msgid "B50, 43P-150, 44P"
 msgstr "B50, 43P-150, 44P"
 
+#. Tag: entry
 #: hardware.xml:916
 #, no-c-format
-#. Tag: entry
 msgid "Genesi"
 msgstr "Genesi"
 
+#. Tag: entry
 #: hardware.xml:917
 #, no-c-format
-#. Tag: entry
 msgid "Pegasos I, Pegasos II"
 msgstr "Pegasos I, Pegasos II"
 
+#. Tag: title
 #: hardware.xml:925
 #, no-c-format
-#. Tag: title
 msgid "APUS subarchitecture (unsupported)"
 msgstr "Kiến trúc con APUS (không được hỗ trợ)"
 
+#. Tag: entry
 #: hardware.xml:941
 #, no-c-format
-#. Tag: entry
 msgid "Amiga Power-UP Systems (APUS)"
 msgstr "Amiga Power-UP Systems (APUS)"
 
+#. Tag: entry
 #: hardware.xml:942
 #, no-c-format
-#. Tag: entry
 msgid "A1200, A3000, A4000"
 msgstr "A1200, A3000, A4000"
 
+#. Tag: title
 #: hardware.xml:950
 #, no-c-format
-#. Tag: title
 msgid "Nubus PowerMac subarchitecture (unsupported)"
 msgstr "Kiến trúc PowerMac Nubus (không được hỗ trợ)"
 
+#. Tag: para
 #: hardware.xml:952
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "NuBus systems are not currently supported by Debian/powerpc. The "
-#| "monolithic Linux/PPC kernel architecture does not have support for these "
-#| "machines; instead, one must use the MkLinux Mach microkernel, which "
-#| "Debian does not yet support. These include the following: <itemizedlist> "
-#| "<listitem><para> Power Macintosh 6100, 7100, 8100 </para></listitem> "
-#| "<listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-#| "<listitem><para> Powerbook 1400, 2300, and 5300 </para></listitem> "
-#| "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
-#| "itemizedlist> A linux kernel for these machines and limited support is "
-#| "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgid ""
 "NuBus systems are not currently supported by &debian;/powerpc. The "
 "monolithic Linux/PPC kernel architecture does not have support for these "
@@ -1573,21 +1470,26 @@ msgid ""
 "itemizedlist> A linux kernel for these machines and limited support is "
 "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgstr ""
-"Hệ thống NuBus hiện thời không được &debian;/powerpc hỗ trợ. Kiến trúc hạt nhân Linux/PPC chắc như đá nguyên khối không hỗ trợ những máy này; để thay thế thì người dùng cần phải sử dụng hạt nhân vi Mach của MkLinux (chưa được &debian; hỗ trợ). Nhóm máy này bao gồm : <itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></listitem> "
-"<listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-"<listitem><para> Powerbook 1400, 2300, and 5300 </para></listitem> "
-"<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </itemizedlist> "
-"Một hạt nhân Linux dành cho những máy này, và sự hỗ trợ người dùng bị hạn chế, sẵn sàng tại <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
+"Hệ thống NuBus hiện thời không được &debian;/powerpc hỗ trợ. Kiến trúc hạt "
+"nhân Linux/PPC chắc như đá nguyên khối không hỗ trợ những máy này; để thay "
+"thế thì người dùng cần phải sử dụng hạt nhân vi Mach của MkLinux (chưa được "
+"&debian; hỗ trợ). Nhóm máy này bao gồm : <itemizedlist> <listitem><para> "
+"Power Macintosh 6100, 7100, 8100 </para></listitem> <listitem><para> "
+"Performa 5200, 6200, 6300 </para></listitem> <listitem><para> Powerbook "
+"1400, 2300, and 5300 </para></listitem> <listitem><para> Workgroup Server "
+"6150, 8150, 9150 </para></listitem> </itemizedlist> Một hạt nhân Linux dành "
+"cho những máy này, và sự hỗ trợ người dùng bị hạn chế, sẵn sàng tại <ulink "
+"url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 
+#. Tag: title
 #: hardware.xml:989
 #, no-c-format
-#. Tag: title
 msgid "Non-PowerPC Macs"
 msgstr "Mac khác PowerPC"
 
+#. Tag: para
 #: hardware.xml:991
 #, no-c-format
-#. Tag: para
 msgid ""
 "Macintosh computers using the 680x0 series of processors are <emphasis>not</"
 "emphasis> in the PowerPC family but are instead m68k machines. Those models "
@@ -1604,9 +1506,9 @@ msgstr ""
 "chứa chữ số La-tinh hay số mô hình ba chữ số, v.d. Mac IIcx, LCIII, Quadra "
 "950."
 
+#. Tag: para
 #: hardware.xml:1000
 #, no-c-format
-#. Tag: para
 msgid ""
 "This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
 "IIvi, IIvx, IIfx), then the LC (LC, LCII, III, III+, 475, 520, 550, 575, "
@@ -1619,9 +1521,9 @@ msgstr ""
 "475, 520, 550, 575, 580, 630); Mac TV; Centris (610, 650, 660AV); Quadra "
 "(605, 610, 630, 650, 660AV, 700, 800, 840AV, 900, 950); Performa 200-640CD."
 
+#. Tag: para
 #: hardware.xml:1008
 #, no-c-format
-#. Tag: para
 msgid ""
 "In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
 "and the PowerBook Duo 210-550c (excluding PowerBook 500 which is Nubus, "
@@ -1631,44 +1533,36 @@ msgstr ""
 "Portable; Powerbook 100-190cs; PowerBook Duo 210-550c (trừ PowerBook 500 mà "
 "là Nubus, xem phần bên trên)."
 
+#. Tag: title
 #: hardware.xml:1024
 #, no-c-format
-#. Tag: title
 msgid "S/390 and zSeries machine types"
 msgstr "Kiểu máy S/390 và zSeries"
 
+#. Tag: para
 #: hardware.xml:1025
 #, no-c-format
-#. Tag: para
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
 msgstr ""
-"Thông tin hoàn toàn về các máy kiểu S/390 và zSeries được hỗ trợ có nằm "
-"trong Sổ Đỏ của IBM <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> trong chương 2.1, hoặc trên <ulink url=\"http://"
-"www-128.ibm.com/developerworks/linux/linux390/index.html\">trang zSeries ở "
-"developerWorks</ulink>. Tức là các máy kiểu G5, Multiprise 3000, G6 và mọi "
-"máy kiểu zSeries được hỗ trợ đầy đủ; các máy kiểu Multiprise 2000, G3 và G4 "
-"được hỗ trợ chỉ với khả năng mô phỏng điểm phù động IEEE thì có hiệu suất bị "
-"giảm."
 
-#: hardware.xml:1047
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1048
+#, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "Hỗ trợ CPU và bo mạch chính"
 
-#: hardware.xml:1048
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1049
+#, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
 "identified by one of the following names: sun4, sun4c, sun4d, sun4m, sun4u "
@@ -1680,15 +1574,15 @@ msgstr ""
 "sách sau diễn tả mỗi máy tính được gồm và lớp hỗ trợ tồn tại cho nó."
 
 # Name: don't translate/Tên: đừng dịch
-#: hardware.xml:1059
-#, no-c-format
 #. Tag: term
+#: hardware.xml:1060
+#, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
-#: hardware.xml:1061
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1062
+#, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
 "complete list of machines belonging to these subarchitectures, please "
@@ -1700,29 +1594,27 @@ msgstr ""
 "\"http://en.wikipedia.org/wiki/SPARCstation\">trang SPARCstation ở "
 "Wikipedia</ulink>."
 
-#: hardware.xml:1068
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "The last Debian release to support sparc32 was Etch, but even then only "
-#| "for sun4m systems. Support for the other 32-bits subarchitectures had "
-#| "already been discontinued after earlier releases."
+#: hardware.xml:1069
+#, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
 "already been discontinued after earlier releases."
 msgstr ""
-"Bản phát hành &debian; cuối cùng đã hỗ trợ sparc32 là Etch, mà chỉ hỗ trợ hệ thống sun4m. Hỗ trợ cho các kiến trúc phụ 32-bit khác đã bị bỏ trong bản phát hành trước."
+"Bản phát hành &debian; cuối cùng đã hỗ trợ sparc32 là Etch, mà chỉ hỗ trợ hệ "
+"thống sun4m. Hỗ trợ cho các kiến trúc phụ 32-bit khác đã bị bỏ trong bản "
+"phát hành trước."
 
-#: hardware.xml:1078
-#, no-c-format
 #. Tag: term
+#: hardware.xml:1079
+#, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
-#: hardware.xml:1080
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1081
+#, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
 "UltraSparc processor and its clones. Most of the machines are well "
@@ -1738,15 +1630,15 @@ msgstr ""
 "dùng hạt nhân sparc64 hay sparc64-smp trong cấu hình kiểu UP và SMP riêng "
 "từng máy."
 
-#: hardware.xml:1093
-#, no-c-format
 #. Tag: term
+#: hardware.xml:1094
+#, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
-#: hardware.xml:1095
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1096
+#, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
 "based on the Niagara multi-core CPUs. At the moment such CPUs are only "
@@ -1758,9 +1650,9 @@ msgstr ""
 "Sun kiểu T1000 và T2000; hai cấu hình này được hỗ trợ khá. Hãy dùng hạt nhân "
 "sparc64-smp."
 
-#: hardware.xml:1106
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1107
+#, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
 "not supported due to lack of support in the Linux kernel."
@@ -1768,15 +1660,15 @@ msgstr ""
 "Ghi chú rằng các bộ xử lý SPARC64 của Fujitsu được dùng trong nhóm máy phục "
 "vụ PRIMEPOWER không được hỗ trợ do hạt nhân Linux không hỗ trợ."
 
-#: hardware.xml:1115
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1116
+#, no-c-format
 msgid "Laptops"
 msgstr "Máy tính xách tay"
 
-#: hardware.xml:1116
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1117
+#, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
 "case a laptop contains specialized or proprietary hardware, some specific "
@@ -1790,25 +1682,15 @@ msgstr ""
 "Để tìm biết những loại máy tính xách tay chạy được với GNU/Linux, xem (ví "
 "dụ) <ulink url=\"&url-x86-laptop;\">các trang Linux Laptop</ulink>."
 
-#: hardware.xml:1128
-#: hardware.xml:1151
-#: hardware.xml:1171
-#: hardware.xml:1194
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
+#, no-c-format
 msgid "Multiple Processors"
 msgstr "Đa bộ xử lý"
 
-#: hardware.xml:1129
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image has been "
-#| "compiled with SMP support. The standard kernel is also usable on non-SMP "
-#| "systems, but has a slight overhead which will cause a small reduction in "
-#| "performance. For normal system use this will hardly be noticable."
+#: hardware.xml:1130
+#, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1817,18 +1699,16 @@ msgid ""
 "which will cause a small reduction in performance. For normal system use "
 "this will hardly be noticable."
 msgstr ""
-"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> hay SMP) sẵn sàng cho kiến trúc này. Ảnh hạt nhân &debian; &release; tiêu chuẩn đã được biên dịch để hỗ trợ SMP. Hạt nhân tiêu chuẩn cũng sử dụng được trên hệ thống khác SMP, nhưng cũng yêu cầu thêm tài nguyên mà gây ra hiệu suất hơi bị giảm. Khi sử dụng hệ thống một cách thông thường, người dùng không nên thấy gì khác."
+"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> "
+"hay SMP) sẵn sàng cho kiến trúc này. Ảnh hạt nhân &debian; &release; tiêu "
+"chuẩn đã được biên dịch để hỗ trợ SMP. Hạt nhân tiêu chuẩn cũng sử dụng được "
+"trên hệ thống khác SMP, nhưng cũng yêu cầu thêm tài nguyên mà gây ra hiệu "
+"suất hơi bị giảm. Khi sử dụng hệ thống một cách thông thường, người dùng "
+"không nên thấy gì khác."
 
-#: hardware.xml:1138
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "In order to optimize the kernel for single CPU systems, you'll have to "
-#| "replace the standard Debian kernel. <phrase arch=\"linux-any\">You can "
-#| "find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. "
-#| "At this time (kernel version &kernelversion;) the way you disable SMP is "
-#| "to deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
+#: hardware.xml:1139
+#, no-c-format
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
 "replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can "
@@ -1837,19 +1717,16 @@ msgid ""
 "deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
 "section;</quote> section of the kernel config.</phrase>"
 msgstr ""
-"Để tối ưu hoá hạt nhân cho hệ thống bộ xử lý trung tâm đơn, bạn cần phải thay thế hạt nhân &debian; tiêu chuẩn. <phrase arch=\"linux-any\">Có một cuộc thảo luận về thủ tục này nằm trong <xref linkend=\"kernel-baking\"/>. Vào lúc này (hạt nhân phiên bản &kernelversion;) cách tắt SMP là bỏ chọn "
-"<quote>&smp-config-option;</quote> trong phần <quote>&smp-config-section;</quote> của cấu hình hạt nhân.</phrase>"
+"Để tối ưu hoá hạt nhân cho hệ thống bộ xử lý trung tâm đơn, bạn cần phải "
+"thay thế hạt nhân &debian; tiêu chuẩn. <phrase arch=\"linux-any\">Có một "
+"cuộc thảo luận về thủ tục này nằm trong <xref linkend=\"kernel-baking\"/>. "
+"Vào lúc này (hạt nhân phiên bản &kernelversion;) cách tắt SMP là bỏ chọn "
+"<quote>&smp-config-option;</quote> trong phần <quote>&smp-config-section;</"
+"quote> của cấu hình hạt nhân.</phrase>"
 
-#: hardware.xml:1153
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image has been "
-#| "compiled with <firstterm>SMP-alternatives</firstterm> support. This means "
-#| "that the kernel will detect the number of processors (or processor cores) "
-#| "and will automatically deactivate SMP on uniprocessor systems."
+#: hardware.xml:1154
+#, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1858,30 +1735,25 @@ msgid ""
 "number of processors (or processor cores) and will automatically deactivate "
 "SMP on uniprocessor systems."
 msgstr ""
-"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> hay SMP) sẵn sàng cho kiến trúc này. Ảnh hạt nhân &debian; &release; tiêu chuẩn đã được biên dịch để hỗ trợ <firstterm>SMP-alternatives</firstterm> (các xen kẽ SMP). Có nghĩa là hạt nhân sẽ phát hiện số các bộ xử lý (hoặc số các lõi bộ xử lý), và tự động tắt SMP trên hệ thống bộ xử lý đơn."
+"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> "
+"hay SMP) sẵn sàng cho kiến trúc này. Ảnh hạt nhân &debian; &release; tiêu "
+"chuẩn đã được biên dịch để hỗ trợ <firstterm>SMP-alternatives</firstterm> "
+"(các xen kẽ SMP). Có nghĩa là hạt nhân sẽ phát hiện số các bộ xử lý (hoặc số "
+"các lõi bộ xử lý), và tự động tắt SMP trên hệ thống bộ xử lý đơn."
 
-#: hardware.xml:1162
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "The 486 flavour of the Debian kernel image packages for &arch-title; is "
-#| "not compiled with SMP support."
+#: hardware.xml:1163
+#, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr ""
-"Mùi vị 486 của những gói ảnh hạt nhân &debian; cho &arch-title; không phải được biên dịch để hỗ trợ SMP."
+"Mùi vị 486 của những gói ảnh hạt nhân &debian; cho &arch-title; không phải "
+"được biên dịch để hỗ trợ SMP."
 
-#: hardware.xml:1172
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. However, the standard Debian &release; kernel image does "
-#| "not support SMP. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
+#: hardware.xml:1173
+#, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. However, the "
@@ -1889,18 +1761,15 @@ msgid ""
 "not prevent installation, since the standard, non-SMP kernel should boot on "
 "SMP systems; the kernel will simply use the first CPU."
 msgstr ""
-"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> hay SMP) sẵn sàng cho kiến trúc này. Tuy nhiên, ảnh hạt nhân &debian; &release; tiêu chuẩn không hỗ trợ SMP. Trường hợp này không nên ngăn cản sự cài đặt, vì hạt nhân tiêu chuẩn khác SMP nên khởi động được trên hệ thống SMP: hạt nhân sẽ đơn giản dùng bộ xử lý trung tâm thứ nhất."
+"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> "
+"hay SMP) sẵn sàng cho kiến trúc này. Tuy nhiên, ảnh hạt nhân &debian; "
+"&release; tiêu chuẩn không hỗ trợ SMP. Trường hợp này không nên ngăn cản sự "
+"cài đặt, vì hạt nhân tiêu chuẩn khác SMP nên khởi động được trên hệ thống "
+"SMP: hạt nhân sẽ đơn giản dùng bộ xử lý trung tâm thứ nhất."
 
-#: hardware.xml:1181
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "In order to take advantage of multiple processors, you'll have to replace "
-#| "the standard Debian kernel. <phrase arch=\"linux-any\">You can find a "
-#| "discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At "
-#| "this time (kernel version &kernelversion;) the way you enable SMP is to "
-#| "select <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
+#: hardware.xml:1182
+#, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
 "the standard &debian; kernel.<phrase arch=\"linux-any\"> You can find a "
@@ -1909,20 +1778,16 @@ msgid ""
 "<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</"
 "quote> section of the kernel config.</phrase>"
 msgstr ""
-"Để tận dụng bộ đa xử lý, bạn cần phải thay thế hạt nhân &debian; tiêu chuẩn. <phrase arch=\"linux-any\">Có một cuộc thảo luận về thủ tục này nằm trong <xref linkend=\"kernel-baking\"/>. Vào lúc này (hạt nhân phiên bản &kernelversion;) cách tắt SMP là bỏ chọn <quote>&smp-config-option;</"
-"quote> trong phần <quote>&smp-config-section;</quote> của cấu hình hạt nhân.</phrase>"
+"Để tận dụng bộ đa xử lý, bạn cần phải thay thế hạt nhân &debian; tiêu chuẩn. "
+"<phrase arch=\"linux-any\">Có một cuộc thảo luận về thủ tục này nằm trong "
+"<xref linkend=\"kernel-baking\"/>. Vào lúc này (hạt nhân phiên bản "
+"&kernelversion;) cách tắt SMP là bỏ chọn <quote>&smp-config-option;</quote> "
+"trong phần <quote>&smp-config-section;</quote> của cấu hình hạt nhân.</"
+"phrase>"
 
-#: hardware.xml:1195
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture, and is supported by a precompiled Debian kernel image. "
-#| "Depending on your install media, this SMP-capable kernel may or may not "
-#| "be installed by default. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
+#: hardware.xml:1196
+#, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture, and is supported "
@@ -1931,11 +1796,17 @@ msgid ""
 "not prevent installation, since the standard, non-SMP kernel should boot on "
 "SMP systems; the kernel will simply use the first CPU."
 msgstr ""
-"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> hay SMP) sẵn sàng cho kiến trúc này, và được hỗ trợ bởi một ảnh hạt nhân &debian; biên dịch sẵn. Phụ thuộc vào vật chứa phần mềm cài đặt, hạt nhân có khả năng SMP này có thể được cài đặt theo mặc định hay không. Trường hợp này không nên ngăn cản sự cài đặt, vì hạt nhân tiêu chuẩn khác SMP nên khởi động được trên hệ thống SMP: hạt nhân sẽ đơn giản sử dụng bộ xử lý trung tâm thứ nhất."
+"Sự hỗ trợ đa xử lý (cũng được biết như là <quote>đa xử lý đối xứng</quote> "
+"hay SMP) sẵn sàng cho kiến trúc này, và được hỗ trợ bởi một ảnh hạt nhân "
+"&debian; biên dịch sẵn. Phụ thuộc vào vật chứa phần mềm cài đặt, hạt nhân có "
+"khả năng SMP này có thể được cài đặt theo mặc định hay không. Trường hợp này "
+"không nên ngăn cản sự cài đặt, vì hạt nhân tiêu chuẩn khác SMP nên khởi động "
+"được trên hệ thống SMP: hạt nhân sẽ đơn giản sử dụng bộ xử lý trung tâm thứ "
+"nhất."
 
-#: hardware.xml:1205
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1206
+#, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
 "if a kernel package that supports SMP is installed, and if not, choose an "
@@ -1944,16 +1815,9 @@ msgstr ""
 "Để nhớ dịp khả năng đa xử lý, bạn nên kiểm tra xem nếu gói hạt nhân hỗ trợ "
 "SMP đã được cài đặt chưa. Không thì chọn một gói hạt nhân thích hợp."
 
-#: hardware.xml:1211
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "You can also build your own customized kernel to support SMP. <phrase "
-#| "arch=\"linux-any\">You can find a discussion of how to do this in <xref "
-#| "linkend=\"kernel-baking\"/>. At this time (kernel version "
-#| "&kernelversion;) the way you enable SMP is to select <quote>&smp-config-"
-#| "option;</quote> in the <quote>&smp-config-section;</quote> section of the "
-#| "kernel config.</phrase>"
+#: hardware.xml:1212
+#, no-c-format
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
 "\"linux-any\"> You can find a discussion of how to do this in <xref linkend="
@@ -1961,24 +1825,34 @@ msgid ""
 "you enable SMP is to select <quote>&smp-config-option;</quote> in the "
 "<quote>&smp-config-section;</quote> section of the kernel config.</phrase>"
 msgstr ""
-"Bạn cũng có thể xây dựng một hạt nhân tùy chỉnh riêng để hỗ trợ SMP. <phrase arch=\"linux-any\">Có thông tin về cách làm như thế trong <xref linkend=\"kernel-baking\"/>. Vào lúc này (phiên bản hạt nhân &kernelversion;) cách bật SMP là chọn <quote>&smp-config-option;</quote> trong phần "
-"<quote>&smp-config-section;</quote> của cấu hình hạt nhân.</phrase>"
+"Bạn cũng có thể xây dựng một hạt nhân tùy chỉnh riêng để hỗ trợ SMP. <phrase "
+"arch=\"linux-any\">Có thông tin về cách làm như thế trong <xref linkend="
+"\"kernel-baking\"/>. Vào lúc này (phiên bản hạt nhân &kernelversion;) cách "
+"bật SMP là chọn <quote>&smp-config-option;</quote> trong phần <quote>&smp-"
+"config-section;</quote> của cấu hình hạt nhân.</phrase>"
 
-#: hardware.xml:1222
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1223
+#, no-c-format
 msgid "Graphics Card Support"
 msgstr "Hỗ trợ thẻ đồ họa"
 
-#: hardware.xml:1223
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "Bạn nên sử dụng một giao diện trình bày tương thích với VGA cho thiết bị "
 "cuối bàn giao tiếp. Gần mọi thẻ trình bày hơi hiện thời tương thích với VGA. "
@@ -1986,34 +1860,32 @@ msgstr ""
 "thiết khả năng hỗ trợ hệ thống cửa sổ X11. Ghi chú rằng X11 không được dùng "
 "trong tiến trình cài đặt được diễn tả trong tài liệu này."
 
-#: hardware.xml:1231
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Debian's support for graphical interfaces is determined by the underlying "
-#| "support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards "
-#| "work under X.Org. Details on supported graphics buses, cards, monitors, "
-#| "and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-#| "Debian &release; ships with X.Org version &x11ver;."
+#: hardware.xml:1233
+#, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
-"Hỗ trợ giao diện đồ họa của &debian; thì nhờ hỗ trợ cơ bản của hệ thống X11 của X.Org. Phần lớn các thẻ ảnh động kiểu AGP, PCI, PCIe và PCI-X đều hoạt động được dưới X.Org. Chi tiết về những mạch nối, thẻ, bộ trình bày và thiết bị con trỏ có khả năng đồ họa được hỗ trợ cũng nằm tại <ulink url=\"&url-xorg;\"></"
-"ulink>. Bản phát hành &debian; &release; có sẵn X.Org phiên bản &x11ver;."
+"Hỗ trợ giao diện đồ họa của &debian; thì nhờ hỗ trợ cơ bản của hệ thống X11 "
+"của X.Org. Phần lớn các thẻ ảnh động kiểu AGP, PCI, PCIe và PCI-X đều hoạt "
+"động được dưới X.Org. Chi tiết về những mạch nối, thẻ, bộ trình bày và thiết "
+"bị con trỏ có khả năng đồ họa được hỗ trợ cũng nằm tại <ulink url=\"&url-"
+"xorg;\"></ulink>. Bản phát hành &debian; &release; có sẵn X.Org phiên bản "
+"&x11ver;."
 
-#: hardware.xml:1240
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1242
+#, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "Hệ thống Cửa sổ X tên X.Org chỉ được hỗ trợ trong SGI Indy và O2 thôi."
 
-#: hardware.xml:1245
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1247
+#, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
 "X.org graphics drivers are available for sunbw2, suncg14, suncg3, suncg6, "
@@ -2032,9 +1904,9 @@ msgstr ""
 "đặt gói <classname>afbinit</classname>, và đọc tài liệu có sẵn về cách kích "
 "hoạt thẻ đó."
 
-#: hardware.xml:1255
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1257
+#, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
 "default configuration. In such a case there is a possibility that the Linux "
@@ -2060,15 +1932,15 @@ msgstr ""
 "động sử dụng bàn giao tiếp nối tiếp bằng cách ngắt kết nối bàn phím trước "
 "khi khởi động hệ thống."
 
-#: hardware.xml:1277
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1279
+#, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "Phần cứng khả năng kết nối mạng"
 
-#: hardware.xml:1278
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1280
+#, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
 "kernel should also be supported by the installation system; modular drivers "
@@ -2082,9 +1954,9 @@ msgstr ""
 "lớn thẻ kiểu PCI và PCMCIA.</phrase> <phrase arch=\"i386\">Nhiều thẻ kiểu "
 "ISA cũ hơn cũng được hỗ trợ.</phrase>"
 
-#: hardware.xml:1287
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1289
+#, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
 "following NICs from Sun:"
@@ -2092,63 +1964,63 @@ msgstr ""
 "Cũng gồm rất nhiều thẻ kiểu PCI giống loài (cho hệ thống có PCI) và những "
 "NCI sau của Sun:"
 
-#: hardware.xml:1293
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1295
+#, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
-#: hardware.xml:1298
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1300
+#, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
-#: hardware.xml:1303
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1305
+#, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
-#: hardware.xml:1308
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1310
+#, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
-#: hardware.xml:1313
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1315
+#, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
-#: hardware.xml:1320
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1322
+#, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "Danh sách các thiết bị mạng đã hỗ trợ :"
 
-#: hardware.xml:1325
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1327
+#, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Sự kết nối kênh đến kênh (CTC) và ESCON (thật hay đã mô phỏng)"
 
-#: hardware.xml:1330
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1332
+#, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet và OSA-Express Fast Ethernet (không-QDIO)"
 
-#: hardware.xml:1335
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1337
+#, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "OSA-Express trong chế độ QDIO, HiperSockets và Guest-LAN"
 
-#: hardware.xml:1344
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1346
+#, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
 "for additional PCI and USB devices are provided. The major exception is the "
@@ -2165,21 +2037,21 @@ msgstr ""
 "mã vi sở hữu này, nằm ở nơi Mạng <ulink url=\"&url-slug-firmware;\">Slug-"
 "Firmware</ulink>."
 
-#: hardware.xml:1354
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1356
+#, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN được hỗ trợ, nhưng không phải trong khi cài đặt."
 
-#: hardware.xml:1361
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1363
+#, no-c-format
 msgid "Wireless Network Cards"
 msgstr "Bo mạch mạng không dây"
 
-#: hardware.xml:1362
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1364
+#, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
 "wireless adapters are supported by the official &arch-kernel; kernel, "
@@ -2195,9 +2067,9 @@ msgstr ""
 "firmware\"/> để tìm thông tin chi tiết về phương pháp nạp phần vững trong "
 "khi cài đặt."
 
-#: hardware.xml:1370
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1372
+#, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
 "can generally be made to work under &debian-gnu;, but are not supported "
@@ -2207,9 +2079,9 @@ msgstr ""
 "thức vẫn còn có thể được làm cho hoạt động dưới &debian-gnu;, nhưng không "
 "phải được hỗ trợ trong khi cài đặt."
 
-#: hardware.xml:1375
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1377
+#, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
 "WEP. If your access point uses stronger encryption, it cannot be used during "
@@ -2219,9 +2091,9 @@ msgstr ""
 "thiết bị điểm truy cập vô tuyến của bạn sử dụng giao thức mật mã mạnh hơn "
 "thì không thể dùng nó trong khi cài đặt."
 
-#: hardware.xml:1381
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1383
+#, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
 "during the installation, it is still possible to install &debian-gnu; using "
@@ -2237,16 +2109,9 @@ msgstr ""
 "thể cài đặt trình điều khiển và phần vững yêu cầu sau khi cài đặt xong (sau "
 "khi khởi động lại) và tự cấu hình mạng."
 
-#: hardware.xml:1391
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "In some cases the driver you need may not be available as a Debian "
-#| "package. You will then have to look if there is source code available in "
-#| "the internet and compile the driver yourself. How to do this is outside "
-#| "the scope of this manual. <phrase arch=\"x86\">If no Linux driver is "
-#| "available, your last resort is to use the <classname>ndiswrapper</"
-#| "classname> package, which allows you to use a Windows driver.</phrase>"
+#: hardware.xml:1393
+#, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
 "package. You will then have to look if there is source code available in the "
@@ -2255,31 +2120,36 @@ msgid ""
 "your last resort is to use the <classname>ndiswrapper</classname> package, "
 "which allows you to use a Windows driver.</phrase>"
 msgstr ""
-"Trong một số trường hợp nào đó, trình điều khiển yêu cầu không sẵn sàng dưới dạng một gói &debian;. Vì thế bạn cần phải tìm mã nguồn trên Internet, và biên dịch bằng tay trình điều khiển. (Hướng dẫn về tiến trình này nằm ở ngoại phạm vị của sổ tay này.) <phrase arch=\"x86\">Nếu không có sẵn trình điều khiển Linux nào, sự chọn cuối cùng là dùng gói <classname>ndiswrapper</classname> mà cho phép bạn sử dụng một trình điều khiển Windows.</phrase>"
+"Trong một số trường hợp nào đó, trình điều khiển yêu cầu không sẵn sàng dưới "
+"dạng một gói &debian;. Vì thế bạn cần phải tìm mã nguồn trên Internet, và "
+"biên dịch bằng tay trình điều khiển. (Hướng dẫn về tiến trình này nằm ở "
+"ngoại phạm vị của sổ tay này.) <phrase arch=\"x86\">Nếu không có sẵn trình "
+"điều khiển Linux nào, sự chọn cuối cùng là dùng gói <classname>ndiswrapper</"
+"classname> mà cho phép bạn sử dụng một trình điều khiển Windows.</phrase>"
 
-#: hardware.xml:1405
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1407
+#, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "Vấn đề đã biết cho &arch-title;"
 
-#: hardware.xml:1406
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1408
+#, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
 "mentioning here."
 msgstr "Có vài vấn đề với thẻ mạng riêng."
 
-#: hardware.xml:1413
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1415
+#, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "Xung đột giữa trình điều khiển tulip và dfme"
 
-#: hardware.xml:1415
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1417
+#, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
 "but are supported by related, but different drivers. Some cards work with "
@@ -2296,9 +2166,9 @@ msgstr ""
 "biết trình điều khiển nào nên được nạp. Chọn điều không đúng thì NIC không "
 "hoạt động được, hoặc chạy sai."
 
-#: hardware.xml:1425
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1427
+#, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
 "compatible) NIC. In that case the <literal>tulip</literal> driver is "
@@ -2311,9 +2181,9 @@ msgstr ""
 "lọc ra mô-đun trình điều khiển sai như được diễn tả trong phần <xref linkend="
 "\"module-blacklist\"/>."
 
-#: hardware.xml:1433
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1435
+#, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
 "unload the wrong driver module using <userinput>modprobe -r "
@@ -2328,15 +2198,15 @@ msgstr ""
 "bạn có thể nạp mô-đun đúng dùng <userinput>modprobe <replaceable>mô-đun</"
 "replaceable></userinput>."
 
-#: hardware.xml:1446
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1448
+#, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
-#: hardware.xml:1448
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1450
+#, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
 "blade systems."
@@ -2344,15 +2214,15 @@ msgstr ""
 "Trình điều khiển mạng <literal>cassini</literal> không hoạt động được với hệ "
 "thống kiểu Sun B100 blade."
 
-#: hardware.xml:1463
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1465
+#, no-c-format
 msgid "Braille Displays"
 msgstr "Thiết bị hiển thị chữ nổi"
 
-#: hardware.xml:1464
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1466
+#, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
 "in <classname>brltty</classname>. Most displays work under "
@@ -2369,15 +2239,15 @@ msgstr ""
 "\"><classname>brltty</classname></ulink>. &debian-gnu; &release; có sẵn "
 "<classname>brltty</classname> phiên bản &brlttyver;."
 
-#: hardware.xml:1478
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1480
+#, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "Phần cứng tổng hợp giọng nối"
 
-#: hardware.xml:1479
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1481
+#, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
 "underlying support found in <classname>speakup</classname>. "
@@ -2397,15 +2267,15 @@ msgstr ""
 "\"><classname>speakup</classname></ulink>. &debian-gnu; &release; có sẵn "
 "<classname>speakup</classname> phiên bản &speakupver;."
 
-#: hardware.xml:1499
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1501
+#, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "Ngoại vi và phần cứng khác"
 
-#: hardware.xml:1500
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1502
+#, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
 "printers, scanners, PCMCIA and USB devices. However, most of these devices "
@@ -2415,9 +2285,9 @@ msgstr ""
 "máy in, máy quét, thiết bị PCMCIA và USB. Tuy nhiên, phần lớn thiết bị này "
 "không cần thiết khi cài đặt hệ thống."
 
-#: hardware.xml:1506
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1508
+#, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
 "additional configuration (see <xref linkend=\"hardware-issues\"/>)."
@@ -2425,9 +2295,9 @@ msgstr ""
 "Phần cứng USB thường hoạt động được; chỉ một số bàn phím USB riêng có thể "
 "cần thiết cấu hình thêm (xem <xref linkend=\"hardware-issues\"/>)."
 
-#: hardware.xml:1512
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1514
+#, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
 "Compatibility HOWTO</ulink> to determine whether your specific hardware is "
@@ -2437,9 +2307,9 @@ msgstr ""
 "\"&url-hardware-howto;\">Linux Hardware Compatibility</ulink> để tìm biết "
 "nếu phần cứng riêng của bạn có được hỗ trợ bởi Linux hay không."
 
-#: hardware.xml:1518
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1520
+#, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
 "All packages that you want to install need to be available on a DASD or over "
@@ -2449,23 +2319,23 @@ msgstr ""
 "muốn cài đặt cần phải sẵn sàng trên một DASD hay qua mạng bằng NFS, HTTP hay "
 "FTP."
 
-#: hardware.xml:1524
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1526
+#, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
 "PCI slot."
 msgstr "RaQ Cobalt không hỗ trợ thêm thiết bị, còn Qube có một khe PCI."
 
-#: hardware.xml:1536
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1538
+#, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "Thiết bị cần thiết phần vững"
 
-#: hardware.xml:1537
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1539
+#, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
 "called <firstterm>firmware</firstterm> or <firstterm>microcode</firstterm> "
@@ -2482,9 +2352,9 @@ msgstr ""
 "thiết bị USB và ngay cả một số thiết bị điều khiển phần cứng) cũng cần thiết "
 "phần vững."
 
-#: hardware.xml:1545
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1547
+#, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
 "&debian-gnu; project and thus cannot be included in the main distribution or "
@@ -2500,9 +2370,9 @@ msgstr ""
 "phát hành phần vững đó, nó thường sẵn sàng dưới dạng một gói riêng từ phần "
 "khác tự do (non-free) của kho gói."
 
-#: hardware.xml:1554
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1556
+#, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
 "installation. Starting with &debian-gnu; 5.0, &d-i; supports loading "
@@ -2517,21 +2387,15 @@ msgstr ""
 "USB. Xem <xref linkend=\"loading-firmware\"/> để tìm thông tin chi tiết về "
 "phương pháp nạp tập tin hay gói kiểu phần vững trong khi cài đặt."
 
-#: hardware.xml:1570
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1572
+#, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "Mua phần cứng đặc biệt cho GNU/&arch-kernel;"
 
-#: hardware.xml:1572
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "There are several vendors, who ship systems with Debian or other "
-#| "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-"
-#| "installed</ulink>. You might pay more for the privilege, but it does buy "
-#| "a level of peace of mind, since you can be sure that the hardware is well-"
-#| "supported by GNU/Linux."
+#: hardware.xml:1574
+#, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
 "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-installed</"
@@ -2539,11 +2403,14 @@ msgid ""
 "peace of mind, since you can be sure that the hardware is well-supported by "
 "GNU/Linux."
 msgstr ""
-"Có vài nhà bán máy tính <ulink url=\"&url-pre-installed;\">cài đặt sẵn</ulink> hệ thống &debian; hoặc một bản phát hành GNU/LInux khác. Có thể là bạn trả thêm tiền mà mua sự yên tĩnh trong tâm hồn, vì bạn chắc chắn biết rằng phần cứng đó được GNU/LInux hỗ trợ đầy đủ."
+"Có vài nhà bán máy tính <ulink url=\"&url-pre-installed;\">cài đặt sẵn</"
+"ulink> hệ thống &debian; hoặc một bản phát hành GNU/LInux khác. Có thể là "
+"bạn trả thêm tiền mà mua sự yên tĩnh trong tâm hồn, vì bạn chắc chắn biết "
+"rằng phần cứng đó được GNU/LInux hỗ trợ đầy đủ."
 
-#: hardware.xml:1580
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1582
+#, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
 "software license that comes with Windows; you may be able to reject the "
@@ -2557,9 +2424,9 @@ msgstr ""
 "kiếm chuỗi <quote>windows refund</quote> trên Mạng nên tìm thông tin có ích "
 "về trường hợp này."
 
-#: hardware.xml:1588
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1590
+#, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
 "even a used system, it is still important to check that your hardware is "
@@ -2574,15 +2441,15 @@ msgstr ""
 "chiếu nói trên. Báo người bán hàng biết bạn muốn mua một hệ thống LInux. Bạn "
 "hỗ trợ nhà bán thân thiện với &arch-kernel; nhé."
 
-#: hardware.xml:1599
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1601
+#, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "Tránh phần mềm sở hữu hay bị đóng"
 
-#: hardware.xml:1600
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1602
+#, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
 "their hardware. Others won't allow us access to the documentation without a "
@@ -2594,9 +2461,9 @@ msgstr ""
 "chúng tôi truy cập tài liệu hướng dẫn nếu chúng tôi không thỏa thuận điều "
 "kiện ngăn cản chúng tôi phát hành mã nguồn &arch-kernel;."
 
-#: hardware.xml:1607
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1609
+#, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
 "they simply won't work under &arch-kernel;. You can help by asking the "
@@ -2610,15 +2477,15 @@ msgstr ""
 "cứng như vậy phát hành tài liệu kỹ thuật này. Nếu đủ người xin họ, họ sẽ "
 "thấy biết cộng đồng phần mềm tự do là thị trường quan trọng."
 
-#: hardware.xml:1619
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1621
+#, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Phần cứng đặc trưng cho Windows"
 
-#: hardware.xml:1620
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1622
+#, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
 "printers. In some cases these are specially designed to be operated by the "
@@ -2643,9 +2510,9 @@ msgstr ""
 "hơn này: phần cứng này ngay cả có thể là đắt hơn thiết bị tương tự mà giữ "
 "lại sự thông minh nhúng."
 
-#: hardware.xml:1633
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1635
+#, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
 "that the manufacturers do not generally make the resources available to "
@@ -2682,15 +2549,9 @@ msgstr ""
 "suất khi hãng chế tạo thiết bị ngoại vi tính toán từng Hz năng lượng xử lý "
 "nhúng trong phần cứng."
 
-#: hardware.xml:1654
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "You can help improve this situation by encouraging these manufacturers to "
-#| "release the documentation and other resources necessary for us to program "
-#| "their hardware, but the best strategy is simply to avoid this sort of "
-#| "hardware until it is listed as working in the <ulink url=\"&url-hardware-"
-#| "howto;\">Linux Hardware Compatibility HOWTO</ulink>."
+#: hardware.xml:1656
+#, no-c-format
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
 "release the documentation and other resources necessary for us to program "
@@ -2699,24 +2560,23 @@ msgid ""
 "<ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
 "ulink></phrase>."
 msgstr ""
-"Bạn có thể giúp đỡ cải tiến trường hợp này bằng cách khuyên hãng chế tạo như vậy phát hành tài liệu kỹ thuật và các tài nguyên khác yêu cầu để cho cộng đồng phần mềm tự do hỗ trợ phần cứng của họ, nhưng chiến lược tốt nhất là đơn giản tránh kiểu phần cứng này<phrase arch=\"linux-any\"> cho đến khi nó được liệt kê như là hoạt động được trong tài liệu tính tương thích của phần cứng Linux Thế Nào <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>."
+"Bạn có thể giúp đỡ cải tiến trường hợp này bằng cách khuyên hãng chế tạo như "
+"vậy phát hành tài liệu kỹ thuật và các tài nguyên khác yêu cầu để cho cộng "
+"đồng phần mềm tự do hỗ trợ phần cứng của họ, nhưng chiến lược tốt nhất là "
+"đơn giản tránh kiểu phần cứng này<phrase arch=\"linux-any\"> cho đến khi nó "
+"được liệt kê như là hoạt động được trong tài liệu tính tương thích của phần "
+"cứng Linux Thế Nào <ulink url=\"&url-hardware-howto;\">Linux Hardware "
+"Compatibility HOWTO</ulink>."
 
-#: hardware.xml:1672
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1674
+#, no-c-format
 msgid "Installation Media"
 msgstr "Vật chứa trình cài đặt"
 
-#: hardware.xml:1674
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "This section will help you determine which different media types you can "
-#| "use to install Debian. For example, if you have a floppy disk drive on "
-#| "your machine, it can be used to install Debian. There is a whole chapter "
-#| "devoted to media, <xref linkend=\"install-methods\"/>, which lists the "
-#| "advantages and disadvantages of each media type. You may want to refer "
-#| "back to this page once you reach that section."
+#: hardware.xml:1676
+#, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
 "to install &debian;. For example, if you have a floppy disk drive on your "
@@ -2725,17 +2585,22 @@ msgid ""
 "advantages and disadvantages of each media type. You may want to refer back "
 "to this page once you reach that section."
 msgstr ""
-"Tiết đoạn này sẽ giúp đỡ bạn quyết định những kiểu vật chứa nào bạn có thể sử dụng để cài đặt hệ thống &debian;. Chẳng hạn, máy tính có một ổ đĩa mềm thì có thể sử dụng ổ đó để cài đặt &debian;. Có một chương hoàn toàn đặc trưng cho vật chứa, <xref linkend=\"install-methods\"/>, mà liệt kê những lợi ích và sự bất lợi của mỗi kiểu vật chứa. Một khi tới tiết đoạn đó, có thể là bạn cũng muốn tham chiếu về trang này."
+"Tiết đoạn này sẽ giúp đỡ bạn quyết định những kiểu vật chứa nào bạn có thể "
+"sử dụng để cài đặt hệ thống &debian;. Chẳng hạn, máy tính có một ổ đĩa mềm "
+"thì có thể sử dụng ổ đó để cài đặt &debian;. Có một chương hoàn toàn đặc "
+"trưng cho vật chứa, <xref linkend=\"install-methods\"/>, mà liệt kê những "
+"lợi ích và sự bất lợi của mỗi kiểu vật chứa. Một khi tới tiết đoạn đó, có "
+"thể là bạn cũng muốn tham chiếu về trang này."
 
-#: hardware.xml:1685
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1687
+#, no-c-format
 msgid "Floppies"
 msgstr "Đĩa mềm"
 
-#: hardware.xml:1686
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1688
+#, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
 "Generally, all you will need is a high-density (1440 kilobytes) 3.5 inch "
@@ -2744,21 +2609,21 @@ msgstr ""
 "Trong một số trường hợp riêng, bạn cần phải khởi động lần đầu tiên từ đĩa "
 "mềm. Thường chỉ cần có một ổ đĩa mềm 3.5\" mật độ cao (1440 kb)."
 
-#: hardware.xml:1692
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1694
+#, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "Đối với CHRP, khả năng hỗ trợ đĩa mềm hiện thời bị hỏng."
 
-#: hardware.xml:1699
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1701
+#, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "Đĩa CD-ROM/DVD-ROM"
 
-#: hardware.xml:1701
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1703
+#, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
 "ROMs and DVD-ROMs, because both technologies are really the same from the "
@@ -2770,9 +2635,9 @@ msgstr ""
 "với hệ điều hành (trừ một số ổ đĩa CD-ROM khác chuẩn rất cũ mà không phải là "
 "SCSI, cũng không phải là IDE/ATAPI)."
 
-#: hardware.xml:1708
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1710
+#, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
 "which support bootable CD-ROMs, you should be able to do a completely "
@@ -2790,9 +2655,9 @@ msgstr ""
 "với những phương pháp kỹ thuật khác để cài đặt hệ thống Debian, một khi bạn "
 "đã khởi động bằng cách khác: xem <xref linkend=\"boot-installer\"/>."
 
-#: hardware.xml:1720
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1722
+#, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
 "howto;\">Linux CD-ROM HOWTO</ulink> contains in-depth information on using "
@@ -2802,9 +2667,9 @@ msgstr ""
 "howto;\">Tài liệu Linux CD-ROM Dùng HOWTO</ulink> chứa thông tin chi tiết về "
 "sử dụng đĩa CD-ROM với Linux."
 
-#: hardware.xml:1726
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1728
+#, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
 "supported by the ohci1394 and sbp2 drivers."
@@ -2812,15 +2677,15 @@ msgstr ""
 "Ổ đĩa CD-ROM kiểu USB cũng được hỗ trợ, cũng như thiết bị FireWire mà được "
 "hỗ trợ bởi những trình điều khiển ohci1394 và sbp2."
 
-#: hardware.xml:1731
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1733
+#, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "Đĩa CD-ROM IDE/ATAPI được hỗ trợ trên mọi máy ARM."
 
-#: hardware.xml:1735
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1737
+#, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
 "working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM "
@@ -2839,15 +2704,15 @@ msgstr ""
 "chọn mục <quote>Cài đặt hệ thống</quote> (System installation) trong phần "
 "vững."
 
-#: hardware.xml:1749
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1751
+#, no-c-format
 msgid "Hard Disk"
 msgstr "Đĩa cứng"
 
-#: hardware.xml:1751
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1753
+#, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
 "for many architectures. This will require some other operating system to "
@@ -2857,9 +2722,9 @@ msgstr ""
 "tùy chọn thêm cho nhiều kiến trúc. Làm như thế cần thiết hệ điều hành khác "
 "tải trình cài đặt vào đĩa cứng."
 
-#: hardware.xml:1757
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1759
+#, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
 "can install from a SunOS partition (UFS slices)."
@@ -2867,22 +2732,15 @@ msgstr ""
 "Mặc dù kiến trúc &arch-title; không cho phép khởi động từ hệ điều hành SunOS "
 "(Solaris), bạn vẫn còn có khả năng cài đặt từ một phân vùng SunOS (lát UFS)."
 
-#: hardware.xml:1765
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1767
+#, no-c-format
 msgid "USB Memory Stick"
 msgstr "Thanh bộ nhớ USB"
 
-#: hardware.xml:1767
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Many Debian boxes need their floppy and/or CD-ROM drives only for setting "
-#| "up the system and for rescue purposes. If you operate some servers, you "
-#| "will probably already have thought about omitting those drives and using "
-#| "an USB memory stick for installing and (when necessary) for recovering "
-#| "the system. This is also useful for small systems which have no room for "
-#| "unnecessary drives."
+#: hardware.xml:1769
+#, no-c-format
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
 "up the system and for rescue purposes. If you operate some servers, you will "
@@ -2891,17 +2749,21 @@ msgid ""
 "This is also useful for small systems which have no room for unnecessary "
 "drives."
 msgstr ""
-"Nhiều máy chạy &debian; chỉ yêu cầu ổ đĩa mềm và/hay CD-ROM để thiết lập hệ thống và nhằm mục đích cứu. Nếu bạn chạy máy phục vụ, có thể là bạn đã suy nghĩ về cách bỏ sót các ổ đĩa đó, để thay thế thì sử dụng một thanh bộ nhớ USB để cài đặt hệ thống, và khi nào cần phục hồi hệ thống. Cũng có ích đối với hệ thống nhỏ không có đủ sức chứa cho ổ đĩa không cần thiết."
+"Nhiều máy chạy &debian; chỉ yêu cầu ổ đĩa mềm và/hay CD-ROM để thiết lập hệ "
+"thống và nhằm mục đích cứu. Nếu bạn chạy máy phục vụ, có thể là bạn đã suy "
+"nghĩ về cách bỏ sót các ổ đĩa đó, để thay thế thì sử dụng một thanh bộ nhớ "
+"USB để cài đặt hệ thống, và khi nào cần phục hồi hệ thống. Cũng có ích đối "
+"với hệ thống nhỏ không có đủ sức chứa cho ổ đĩa không cần thiết."
 
-#: hardware.xml:1779
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1781
+#, no-c-format
 msgid "Network"
 msgstr "Mạng"
 
-#: hardware.xml:1781
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1783
+#, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
 "the installation. Whether the network is used or not depends on the "
@@ -2918,9 +2780,9 @@ msgstr ""
 "hay PPP), thông qua hoặc HTTP hoặc FTP. Sau khi cài đặt xong, bạn cũng có "
 "khả năng cấu hình hệ thống để sử dụng IDSN và PPP."
 
-#: hardware.xml:1791
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1793
+#, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
 "network. <phrase arch=\"mips;mipsel\">This is the preferred installation "
@@ -2930,9 +2792,9 @@ msgstr ""
 "mạng. <phrase arch=\"mips;mipsel\">Đây là phương pháp cài đặt ưa thích đối "
 "với &arch-title;.</phrase>"
 
-#: hardware.xml:1797
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1799
+#, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
 "NFS-mounting of all local filesystems, is another option."
@@ -2941,15 +2803,15 @@ msgstr ""
 "động qua mạng từ mạng cục bộ và khả năng gắn kết bằng NFS các hệ thống tập "
 "tin cục bộ."
 
-#: hardware.xml:1805
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1807
+#, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Hệ thống Un*x hay GNU"
 
-#: hardware.xml:1807
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1809
+#, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
 "&debian-gnu; without using the &d-i; described in the rest of this manual. "
@@ -2963,23 +2825,15 @@ msgstr ""
 "cứng không được hỗ trợ bằng cách khác, hoặc trên máy phải cứ chạy. Nếu bạn "
 "quan tâm đến kỹ thuật này, hãy nhảy tới <xref linkend=\"linux-upgrade\"/>."
 
-#: hardware.xml:1819
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1821
+#, no-c-format
 msgid "Supported Storage Systems"
 msgstr "Hệ thống cất giữ được hỗ trợ"
 
-#: hardware.xml:1821
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "The Debian boot disks contain a kernel which is built to maximize the "
-#| "number of systems it runs on. Unfortunately, this makes for a larger "
-#| "kernel, which includes many drivers that won't be used for your "
-#| "machine<phrase arch=\"linux-any\"> (see <xref linkend=\"kernel-baking\"/> "
-#| "to learn how to build your own kernel)</phrase>. Support for the widest "
-#| "possible range of devices is desirable in general, to ensure that Debian "
-#| "can be installed on the widest array of hardware."
+#: hardware.xml:1823
+#, no-c-format
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
 "number of systems it runs on. Unfortunately, this makes for a larger kernel, "
@@ -2989,28 +2843,31 @@ msgid ""
 "is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
-"Những đĩa khởi động &debian; chứa một hạt nhân được xây dựng để chạy được trên số tối đa các hệ thống. Tiếc là khả năng này yêu cầu một hạt nhân lớn hơn, gồm có nhiều trình điều khiển không thể được dùng trên máy riêng của bạn<phrase arch=\"linux-any\"> (xem <xref linkend=\"kernel-baking\"/> để học biết xây dựng một hạt nhân riêng như thế nào)</phrase>. Dự án &debian; muốn hỗ trợ phạm vị thiết bị rộng nhất, để đảm bảo rằng hệ thống &debian; cài đặt được vào tổ hợp phần cứng kiểu "
-"nhiều nhất có thể."
+"Những đĩa khởi động &debian; chứa một hạt nhân được xây dựng để chạy được "
+"trên số tối đa các hệ thống. Tiếc là khả năng này yêu cầu một hạt nhân lớn "
+"hơn, gồm có nhiều trình điều khiển không thể được dùng trên máy riêng của "
+"bạn<phrase arch=\"linux-any\"> (xem <xref linkend=\"kernel-baking\"/> để học "
+"biết xây dựng một hạt nhân riêng như thế nào)</phrase>. Dự án &debian; muốn "
+"hỗ trợ phạm vị thiết bị rộng nhất, để đảm bảo rằng hệ thống &debian; cài đặt "
+"được vào tổ hợp phần cứng kiểu nhiều nhất có thể."
 
-#: hardware.xml:1831
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Generally, the Debian installation system includes support for floppies, "
-#| "IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, "
-#| "SATA and SCSI controllers and drives, USB, and FireWire. The supported "
-#| "file systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
+#: hardware.xml:1833
+#, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
 "IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, "
 "SATA and SCSI controllers and drives, USB, and FireWire. The supported file "
 "systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
 msgstr ""
-"Nói chung, hệ thống cài đặt &debian; hỗ trợ đĩa mềm, ổ đĩa IDE (cũng được biết là PATA), đĩa mềm IDE, thiết bị IDE cổng song song, bộ điều khiển và ổ đĩa SATA và SCSI, USB và FireWire. Những hệ thống tập tin được hỗ trợ thì bao gồm FAT, phần mở rộng Win-32 FAT (VFAT) và NTFS."
+"Nói chung, hệ thống cài đặt &debian; hỗ trợ đĩa mềm, ổ đĩa IDE (cũng được "
+"biết là PATA), đĩa mềm IDE, thiết bị IDE cổng song song, bộ điều khiển và ổ "
+"đĩa SATA và SCSI, USB và FireWire. Những hệ thống tập tin được hỗ trợ thì "
+"bao gồm FAT, phần mở rộng Win-32 FAT (VFAT) và NTFS."
 
-#: hardware.xml:1838
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1840
+#, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
 "&mdash; often called MFM, RLL, IDE, or PATA &mdash; are supported. SATA and "
@@ -3024,9 +2881,9 @@ msgstr ""
 "\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink> để tìm "
 "chi tiết."
 
-#: hardware.xml:1846
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1848
+#, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
 "boot system. The following SCSI drivers are supported in the default kernel: "
@@ -3048,9 +2905,9 @@ msgstr ""
 "Processors FAQ</ulink> để tìm thông tin thêm về phần cứng SPARC được hỗ trợ "
 "bởi hạt nhân Linux."
 
-#: hardware.xml:1879
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1881
+#, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
 "boot system. Note that the current Linux kernel does not support floppies on "
@@ -3061,9 +2918,9 @@ msgstr ""
 "không hỗ trợ khả năng sử dụng đĩa mềm bằng cách nào cả trên hệ thống kiểu "
 "CHRP."
 
-#: hardware.xml:1885
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1887
+#, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
 "boot system. Note that the current Linux kernel does not support the floppy "
@@ -3073,9 +2930,9 @@ msgstr ""
 "bởi hệ thống khởi động của Debian. Ghi chú rằng hạt nhân Linux hiện thời "
 "không hỗ trợ khả năng sử dụng ổ đĩa mềm."
 
-#: hardware.xml:1891
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1893
+#, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
 "boot system."
@@ -3083,9 +2940,9 @@ msgstr ""
 "Bất kỳ hệ thống cất giữ nào được hỗ trợ bởi hạt nhân Linux cũng được hỗ trợ "
 "bởi hệ thống khởi động của Debian."
 
-#: hardware.xml:1896
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1898
+#, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
 "boot system. This means that FBA and ECKD DASDs are supported with the old "
@@ -3095,15 +2952,15 @@ msgstr ""
 "bởi hệ thống khởi động của Debian. Có nghĩa là DASD kiểu FBA và ECKD được hỗ "
 "trợ bằng bố trí đĩa Linux cũ (idl) và bằng bố trí đĩa S/390 chung mới (cdl)."
 
-#: hardware.xml:1913
-#, no-c-format
 #. Tag: title
+#: hardware.xml:1915
+#, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "Bộ nhớ và sức chứa trên đĩa cần thiết"
 
-#: hardware.xml:1915
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1917
+#, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
 "hard disk space to perform a normal installation. Note that these are fairly "
@@ -3115,9 +2972,9 @@ msgstr ""
 "hai số này hơi tối thiểu. Để xem số lượng hiện thức hơn, xem <xref linkend="
 "\"minimum-hardware-reqts\"/>."
 
-#: hardware.xml:1922
-#, no-c-format
 #. Tag: para
+#: hardware.xml:1924
+#, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
 "Installation images that support the graphical installer require more memory "
@@ -3134,3 +2991,24 @@ msgstr ""
 "trình cài đặt hoặc đồ họa hoặc văn bản, có nên chọn trình trước.</para> </"
 "footnote> hoặc sức chứa còn rảnh trên đĩa vẫn còn có thể làm, nhưng chỉ đề "
 "nghị cho người dùng có kinh nghiệm."
+
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "Thông tin hoàn toàn về các máy kiểu S/390 và zSeries được hỗ trợ có nằm "
+#~ "trong Sổ Đỏ của IBM <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
+#~ "redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> trong chương 2.1, hoặc trên <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">trang zSeries "
+#~ "ở developerWorks</ulink>. Tức là các máy kiểu G5, Multiprise 3000, G6 và "
+#~ "mọi máy kiểu zSeries được hỗ trợ đầy đủ; các máy kiểu Multiprise 2000, G3 "
+#~ "và G4 được hỗ trợ chỉ với khả năng mô phỏng điểm phù động IEEE thì có "
+#~ "hiệu suất bị giảm."
diff --git a/po/vi/install-methods.po b/po/vi/install-methods.po
index 3de60564d..c50054fa8 100644
--- a/po/vi/install-methods.po
+++ b/po/vi/install-methods.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-23 23:56+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,35 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: install-methods.xml:5
 #, no-c-format
-#. Tag: title
 msgid "Obtaining System Installation Media"
 msgstr "Lấy vật chứa cài đặt hệ thống"
 
+#. Tag: title
 #: install-methods.xml:12
 #, no-c-format
-#. Tag: title
 msgid "Official &debian-gnu; CD-ROM Sets"
 msgstr "Bộ đĩa CD &debian-gnu; chính thức"
 
+#. Tag: para
 #: install-methods.xml:13
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official Debian "
-#| "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-#| "debian-cd-vendors;\">CD vendors page</ulink>). You may also download the "
-#| "CD-ROM images from a Debian mirror and make your own set, if you have a "
-#| "fast network connection and a CD burner (see the <ulink url=\"&url-debian-"
-#| "cd;\">Debian CD page</ulink> for detailed instructions). If you have a "
-#| "Debian CD set and CDs are bootable on your machine, you can skip right to "
-#| "<xref linkend=\"boot-installer\"/>; much effort has been expended to "
-#| "ensure the files most people need are there on the CD. Although a full "
-#| "set of binary packages requires several CDs, it is unlikely you will need "
-#| "packages on the third CD and above. You may also consider using the DVD "
-#| "version, which saves a lot of space on your shelf and you avoid the CD "
-#| "shuffling marathon."
 msgid ""
 "By far the easiest way to install &debian-gnu; is from an Official &debian; "
 "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
@@ -60,24 +46,23 @@ msgid ""
 "third CD and above. You may also consider using the DVD version, which saves "
 "a lot of space on your shelf and you avoid the CD shuffling marathon."
 msgstr ""
-"Phương pháp dễ nhất cài đặt &debian-gnu; là sử dụng một bộ đĩa CD-ROM &debian; chính thức. Bạn có thể mua bộ đĩa như thế từ một nhà bán (xem <ulink url=\"&url-debian-cd-vendors;\">trang nhà bán đĩa CD</ulink>). Cũng có khả năng tải các ảnh đĩa CD-ROM xuống một máy nhân bản &debian;, và tạo bộ đĩa CD cài đặt của mình, nếu bạn có kết nối mạng nhanh và máy chép ra CD (xem <ulink url="
-"\"&url-debian-cd;\">trang đĩa CD Debian</ulink> để tìm hướng dẫn chi tiết). Có một bộ đĩa CD &debian; và khả năng khởi động máy tính từ đĩa CD thì bạn có dịp nhảy trực tiếp tới <xref linkend=\"boot-installer\"/>; rất nhiều sự cố gắng đã được đóng góp để đảm bảo đĩa CD đó chứa những tập tin yêu cầu bởi hậu hết người dùng. Mặc dù bộ gói nhị phân đầy đủ chiếm vài đĩa CD, rất có thể là bạn không yêu cầu gói nào nằm trên đĩa CD thứ ba và sau. Nếu có thể thì sử dụng đĩa DVD &debian; ngay cả dễ nhất (không cần trao đổi các đĩa CD, không chiếm nhiều sức chứa trên giá sách)."
+"Phương pháp dễ nhất cài đặt &debian-gnu; là sử dụng một bộ đĩa CD-ROM "
+"&debian; chính thức. Bạn có thể mua bộ đĩa như thế từ một nhà bán (xem "
+"<ulink url=\"&url-debian-cd-vendors;\">trang nhà bán đĩa CD</ulink>). Cũng "
+"có khả năng tải các ảnh đĩa CD-ROM xuống một máy nhân bản &debian;, và tạo "
+"bộ đĩa CD cài đặt của mình, nếu bạn có kết nối mạng nhanh và máy chép ra CD "
+"(xem <ulink url=\"&url-debian-cd;\">trang đĩa CD Debian</ulink> để tìm hướng "
+"dẫn chi tiết). Có một bộ đĩa CD &debian; và khả năng khởi động máy tính từ "
+"đĩa CD thì bạn có dịp nhảy trực tiếp tới <xref linkend=\"boot-installer\"/>; "
+"rất nhiều sự cố gắng đã được đóng góp để đảm bảo đĩa CD đó chứa những tập "
+"tin yêu cầu bởi hậu hết người dùng. Mặc dù bộ gói nhị phân đầy đủ chiếm vài "
+"đĩa CD, rất có thể là bạn không yêu cầu gói nào nằm trên đĩa CD thứ ba và "
+"sau. Nếu có thể thì sử dụng đĩa DVD &debian; ngay cả dễ nhất (không cần trao "
+"đổi các đĩa CD, không chiếm nhiều sức chứa trên giá sách)."
 
+#. Tag: para
 #: install-methods.xml:30
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If your machine doesn't support CD booting, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the Debian network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
 msgid ""
 "If your machine doesn't support CD booting, but you do have a CD set, you "
 "can use an alternative strategy such as <phrase condition=\"supports-floppy-"
@@ -91,12 +76,21 @@ msgid ""
 "particular files you need for booting, look for those files in the same "
 "directories and subdirectories on your CD."
 msgstr ""
-"Máy tính không hỗ trợ chức năng khởi động từ đĩa CD, mà bạn có một bộ đĩa CD &debian;, thì cũng có thể sử dụng một chiến lược xen kẽ như <phrase condition=\"supports-floppy-boot\">đĩa mềm,</phrase> <phrase arch=\"s390\">băng, băng mô phỏng,</phrase> <phrase condition=\"bootable-disk\">đĩa cứng,</phrase> <phrase condition=\"bootable-usb\">thanh USB</phrase> <phrase condition=\"supports-"
-"tftp\">khởi động từ mạng,</phrase> hoặc nạp bằng tay hạt nhân từ đĩa CD để khởi động đầu tiên trình cài đặt hệ thống. Các tập tin yêu cầu để khởi động bằng một phương pháp khác cũng nằm trên đĩa CD; kho lưu mạng &debian; và đĩa CD có cùng một phân cấp thư mục. Vì thế, khi đường dẫn kho lưu đưa ra bên dưới đến tập tin yêu cầu để khởi động, tìm tập tin đó trong cùng một thư mục trên đĩa CD."
+"Máy tính không hỗ trợ chức năng khởi động từ đĩa CD, mà bạn có một bộ đĩa CD "
+"&debian;, thì cũng có thể sử dụng một chiến lược xen kẽ như <phrase "
+"condition=\"supports-floppy-boot\">đĩa mềm,</phrase> <phrase arch="
+"\"s390\">băng, băng mô phỏng,</phrase> <phrase condition=\"bootable-disk"
+"\">đĩa cứng,</phrase> <phrase condition=\"bootable-usb\">thanh USB</phrase> "
+"<phrase condition=\"supports-tftp\">khởi động từ mạng,</phrase> hoặc nạp "
+"bằng tay hạt nhân từ đĩa CD để khởi động đầu tiên trình cài đặt hệ thống. "
+"Các tập tin yêu cầu để khởi động bằng một phương pháp khác cũng nằm trên đĩa "
+"CD; kho lưu mạng &debian; và đĩa CD có cùng một phân cấp thư mục. Vì thế, "
+"khi đường dẫn kho lưu đưa ra bên dưới đến tập tin yêu cầu để khởi động, tìm "
+"tập tin đó trong cùng một thư mục trên đĩa CD."
 
+#. Tag: para
 #: install-methods.xml:52
 #, no-c-format
-#. Tag: para
 msgid ""
 "Once the installer is booted, it will be able to obtain all the other files "
 "it needs from the CD."
@@ -104,9 +98,9 @@ msgstr ""
 "Một khi trình cài đặt đã được khởi động, nó sẽ có khả năng lấy từ đĩa CD các "
 "tập tin khác cần thiết."
 
+#. Tag: para
 #: install-methods.xml:57
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you don't have a CD set, then you will need to download the installer "
 "system files and place them on the <phrase arch=\"s390\">installation tape</"
@@ -123,53 +117,42 @@ msgstr ""
 "condition=\"supports-tftp\">máy tính khác được kết nối</phrase> để sử dụng "
 "nó để khởi động trình cài đặt."
 
+#. Tag: title
 #: install-methods.xml:83
 #, no-c-format
-#. Tag: title
-#| msgid "Downloading Files from Debian Mirrors"
 msgid "Downloading Files from &debian; Mirrors"
 msgstr "Tải tập tin xuống máy nhân bản &debian;"
 
+#. Tag: para
 #: install-methods.xml:85
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "To find the nearest (and thus probably the fastest) mirror, see the "
-#| "<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</ulink>."
 msgid ""
 "To find the nearest (and thus probably the fastest) mirror, see the <ulink "
 "url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
-"Để tìm máy nhân bản gần nhất (cũng nên là nhanh nhất), xem <ulink url=\"&url-debian-mirrors;\">danh sách máy nhân bản &debian;</ulink>."
+"Để tìm máy nhân bản gần nhất (cũng nên là nhanh nhất), xem <ulink url=\"&url-"
+"debian-mirrors;\">danh sách máy nhân bản &debian;</ulink>."
 
+#. Tag: para
 #: install-methods.xml:90
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "When downloading files from a Debian mirror using FTP, be sure to "
-#| "download the files in <emphasis>binary</emphasis> mode, not text or "
-#| "automatic mode."
 msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
 msgstr ""
-"Khi tải tập tin xuống một máy nhân bản &debian; qua FTP, kiểm tra lại bạn tải về trong chế độ <emphasis>nhị phân</emphasis> (binary), không phải chế độ văn bản (text) hay tự động (automatic)."
+"Khi tải tập tin xuống một máy nhân bản &debian; qua FTP, kiểm tra lại bạn "
+"tải về trong chế độ <emphasis>nhị phân</emphasis> (binary), không phải chế "
+"độ văn bản (text) hay tự động (automatic)."
 
+#. Tag: title
 #: install-methods.xml:98
 #, no-c-format
-#. Tag: title
 msgid "Where to Find Installation Images"
 msgstr "Tìm ảnh cài đặt ở đâu"
 
+#. Tag: para
 #: install-methods.xml:100
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The installation images are located on each Debian mirror in the "
-#| "directory <ulink url=\"&url-debian-installer;images\">debian/dists/"
-#| "&releasename;/main/installer-&architecture;/current/images/</ulink> "
-#| "&mdash; the <ulink url=\"&url-debian-installer;images/MANIFEST"
-#| "\">MANIFEST</ulink> lists each image and its purpose."
 msgid ""
 "The installation images are located on each &debian; mirror in the directory "
 "<ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/"
@@ -177,19 +160,21 @@ msgid ""
 "\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> lists each image "
 "and its purpose."
 msgstr ""
-"Các ảnh cài đặt nằm trên mỗi máy nhân bản &debian;, trong thư mục <ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/"
-"installer-&architecture;/current/images/</ulink> &mdash; <ulink url="
-"\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> (bản kê khai) liệt kê mọi ảnh và mục đích tương ứng."
+"Các ảnh cài đặt nằm trên mỗi máy nhân bản &debian;, trong thư mục <ulink url="
+"\"&url-debian-installer;images\">debian/dists/&releasename;/main/installer-"
+"&architecture;/current/images/</ulink> &mdash; <ulink url=\"&url-debian-"
+"installer;images/MANIFEST\">MANIFEST</ulink> (bản kê khai) liệt kê mọi ảnh "
+"và mục đích tương ứng."
 
+#. Tag: title
 #: install-methods.xml:113
 #, no-c-format
-#. Tag: title
 msgid "NSLU2 Installation Files"
 msgstr "Tập tin cài đặt NSLU2"
 
+#. Tag: para
 #: install-methods.xml:114
 #, no-c-format
-#. Tag: para
 msgid ""
 "A firmware image is provided for the Linksys NSLU2 which will automatically "
 "boot <classname>debian-installer</classname>. This image can be uploaded via "
@@ -200,15 +185,15 @@ msgstr ""
 "i;. Ảnh này có thể được tải lên thông qua giao diện Web Linksys hoặc dùng "
 "upslug2. Ảnh phần vững này có thể được lấy từ &nslu2-firmware-img;."
 
+#. Tag: title
 #: install-methods.xml:126
 #, no-c-format
-#. Tag: title
 msgid "Thecus N2100 Installation Files"
 msgstr "Tập tin cài đặt N2100 Thecus"
 
+#. Tag: para
 #: install-methods.xml:127
 #, no-c-format
-#. Tag: para
 msgid ""
 "A firmware image is provided for the Thecus N2100 which will automatically "
 "boot <classname>debian-installer</classname>. This image can be installed "
@@ -220,55 +205,51 @@ msgstr ""
 "quá trình nâng cấp phần vững Thecus. Ảnh phần vững này có thể được lấy từ "
 "ảnh &nslu2-firmware-img;."
 
+#. Tag: title
 #: install-methods.xml:138
 #, no-c-format
-#. Tag: title
 msgid "GLAN Tank Installation Files"
 msgstr "Tập tin cài đặt GLAN Tank"
 
+#. Tag: para
 #: install-methods.xml:139
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &glantank-firmware-img;."
 msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
 "on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
-"GLAN Tank yêu cầu một hạt nhân và đĩa RAM trên một phân vùng ext2 trên đĩa vào đó bạn định cài đặt &debian;. Các ảnh này có thể được lấy từ &glantank-firmware-img;."
+"GLAN Tank yêu cầu một hạt nhân và đĩa RAM trên một phân vùng ext2 trên đĩa "
+"vào đó bạn định cài đặt &debian;. Các ảnh này có thể được lấy từ &glantank-"
+"firmware-img;."
 
+#. Tag: title
 #: install-methods.xml:149
 #, no-c-format
-#. Tag: title
 msgid "Kurobox Pro Installation Files"
 msgstr "Tập tin cài đặt Kurobox Pro"
 
+#. Tag: para
 #: install-methods.xml:150
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &kuroboxpro-firmware-img;."
 msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
 "disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
-"Kurobox Pro yêu cầu một hạt nhân và đĩa RAM trên một phân vùng ext2 trên đĩa vào đó bạn định cài đặt &debian;. Các ảnh này có thể được lấy từ &kuroboxpro-firmware-img;."
+"Kurobox Pro yêu cầu một hạt nhân và đĩa RAM trên một phân vùng ext2 trên đĩa "
+"vào đó bạn định cài đặt &debian;. Các ảnh này có thể được lấy từ &kuroboxpro-"
+"firmware-img;."
 
+#. Tag: title
 #: install-methods.xml:160
 #, no-c-format
-#. Tag: title
 msgid "HP mv2120 Installation Files"
 msgstr "Tập tin cài đặt HP mv2120"
 
+#. Tag: para
 #: install-methods.xml:161
 #, no-c-format
-#. Tag: para
 msgid ""
 "A firmware image is provided for the HP mv2120 which will automatically boot "
 "<classname>debian-installer</classname>. This image can be installed with "
@@ -282,15 +263,15 @@ msgstr ""
 "Firmware Recovery Utility trên Windows. Ảnh phần vững có thể được lấy từ "
 "&mv2120-firmware-img;."
 
+#. Tag: title
 #: install-methods.xml:173
 #, no-c-format
-#. Tag: title
 msgid "QNAP Turbo Station Installation Files"
 msgstr "Tập tin cài đặt QNAP Turbo Station"
 
+#. Tag: para
 #: install-methods.xml:174
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installation files for the QNAP Turbo Station consist of a kernel and "
 "ramdisk as well as a script to write these images to flash. You can obtain "
@@ -304,15 +285,15 @@ msgstr ""
 "TS-209 từ &qnap-orion-firmware-img;, kiểu QNAP TS-110, TS-119, TS-210, "
 "TS-219, TS-219P từ &qnap-kirkwood-firmware-img;."
 
+#. Tag: title
 #: install-methods.xml:186
 #, no-c-format
-#. Tag: title
 msgid "SheevaPlug and OpenRD Installation Files"
 msgstr "Tập tin Cài đặt SheevaPlug và OpenRD"
 
+#. Tag: para
 #: install-methods.xml:187
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installation files for the Marvell SheevaPlug and OpenRD devices consist "
 "of a kernel and initrd for U-Boot. You can obtain these files from &kirkwood-"
@@ -322,15 +303,15 @@ msgstr ""
 "hạt nhân và initrd cho U-Boot. Bạn có thể lấy các tập tin này từ &kirkwood-"
 "marvell-firmware-img;."
 
+#. Tag: title
 #: install-methods.xml:237
 #, no-c-format
-#. Tag: title
 msgid "Creating an IPL tape"
 msgstr "Tạo băng IPL"
 
+#. Tag: para
 #: install-methods.xml:239
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
 "create an IPL tape first. This is described in section 3.4.3 in the <ulink "
@@ -351,15 +332,15 @@ msgstr ""
 "Những tập tin này có thể được tải xuống thư mục con <filename>tape</"
 "filename>: xem <xref linkend=\"where-files\"/>."
 
+#. Tag: title
 #: install-methods.xml:263
 #, no-c-format
-#. Tag: title
 msgid "Creating Floppies from Disk Images"
 msgstr "Tạo đĩa mềm từ ảnh đĩa"
 
+#. Tag: para
 #: install-methods.xml:264
 #, no-c-format
-#. Tag: para
 msgid ""
 "Bootable floppy disks are generally used as a last resort to boot the "
 "installer on hardware that cannot boot from CD or by other means."
@@ -368,9 +349,9 @@ msgstr ""
 "để khởi động trình cài đặt trên phần cứng không có khả năng khởi động từ đĩa "
 "CD hoặc bằng cách nào khác."
 
+#. Tag: para
 #: install-methods.xml:269
 #, no-c-format
-#. Tag: para
 msgid ""
 "Booting the installer from floppy disk reportedly fails on Mac USB floppy "
 "drives."
@@ -378,9 +359,9 @@ msgstr ""
 "Người dùng đã thông báo trường hợp không thể khởi động trình cài đặt Debian "
 "từ đĩa mềm nằm trong ổ đĩa mềm USB của máy tính Apple Mac."
 
+#. Tag: para
 #: install-methods.xml:274
 #, no-c-format
-#. Tag: para
 msgid ""
 "Disk images are files containing the complete contents of a floppy disk in "
 "<emphasis>raw</emphasis> form. Disk images, such as <filename>boot.img</"
@@ -398,9 +379,9 @@ msgstr ""
 "diện thô của đĩa đó : cần phải làm việc <emphasis>sao chép rãnh ghi</"
 "emphasis> các dữ liệu từ tập tin vào đĩa mềm."
 
+#. Tag: para
 #: install-methods.xml:285
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are different techniques for creating floppies from disk images. This "
 "section describes how to create floppies from disk images on different "
@@ -409,15 +390,9 @@ msgstr ""
 "Có một số phương pháp khác nhau tạo đĩa mềm từ ảnh đĩa. Tiết đoạn này diễn "
 "tả phương pháp tạo đĩa mềm từ ảnh đĩa trên nền tảng khác nhau."
 
+#. Tag: para
 #: install-methods.xml:291
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Before you can create the floppies, you will first need to download them "
-#| "from one of the Debian mirrors, as explained in <xref linkend="
-#| "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
-#| "installation CD-ROM or DVD, the floppy images may also be included on the "
-#| "CD/DVD.</phrase>"
 msgid ""
 "Before you can create the floppies, you will first need to download them "
 "from one of the &debian; mirrors, as explained in <xref linkend="
@@ -425,11 +400,14 @@ msgid ""
 "installation CD-ROM or DVD, the floppy images may also be included on the CD/"
 "DVD.</phrase>"
 msgstr ""
-"Trước khi tạo đĩa mềm, bạn cần phải tải tập tin tương ứng xuống một của những máy nhân bản &debian;, như được diễn tả trong <xref linkend=\"downloading-files\"/>. <phrase arch=\"i386\">Nếu bạn đã có một đĩa CD/DVD cài đặt, những ảnh đĩa mềm có thể nằm trên đĩa đó.</phrase>"
+"Trước khi tạo đĩa mềm, bạn cần phải tải tập tin tương ứng xuống một của "
+"những máy nhân bản &debian;, như được diễn tả trong <xref linkend="
+"\"downloading-files\"/>. <phrase arch=\"i386\">Nếu bạn đã có một đĩa CD/DVD "
+"cài đặt, những ảnh đĩa mềm có thể nằm trên đĩa đó.</phrase>"
 
+#. Tag: para
 #: install-methods.xml:299
 #, no-c-format
-#. Tag: para
 msgid ""
 "No matter which method you use to create your floppies, you should remember "
 "to flip the write-protect tab on the floppies once you have written them, to "
@@ -439,15 +417,15 @@ msgstr ""
 "chống lại ghi trên đĩa mềm đó, một khi ghi nó, để đảm bảo dữ liệu được ghi "
 "sẽ không bị hại tình cờ."
 
+#. Tag: title
 #: install-methods.xml:307
 #, no-c-format
-#. Tag: title
 msgid "Writing Disk Images From a Linux or Unix System"
 msgstr "Ghi ảnh đĩa từ hệ thống Linux/UNIX"
 
+#. Tag: para
 #: install-methods.xml:308
 #, no-c-format
-#. Tag: para
 msgid ""
 "To write the floppy disk image files to the floppy disks, you will probably "
 "need root access to the system. Place a good, blank floppy in the floppy "
@@ -481,9 +459,9 @@ msgstr ""
 "\">(trên Solaris, dùng lệnh <command>eject</command>, xem trang hướng dẫn để "
 "tìm chi tiết)</phrase>."
 
+#. Tag: para
 #: install-methods.xml:329
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some systems attempt to automatically mount a floppy disk when you place it "
 "in the drive. You might have to disable this feature before the workstation "
@@ -514,9 +492,9 @@ msgstr ""
 "được định dạng (đĩa mềm vô danh có tên mặc định là <filename>unnamed_floppy</"
 "filename>). Trên hệ thống khác, hãy hỏi quản trị hệ thống. </phrase>"
 
+#. Tag: para
 #: install-methods.xml:350
 #, no-c-format
-#. Tag: para
 msgid ""
 "If writing a floppy on powerpc Linux, you will need to eject it. The "
 "<command>eject</command> program handles this nicely; you might need to "
@@ -526,15 +504,15 @@ msgstr ""
 "Khuyên bạn dùng chương trình <command>eject</command>; có lẽ bạn cần phải "
 "cài đặt nó trước tiên."
 
+#. Tag: title
 #: install-methods.xml:368
 #, no-c-format
-#. Tag: title
 msgid "Writing Disk Images From DOS, Windows, or OS/2"
 msgstr "Ghi ảnh đĩa từ DOS, Windows, hay OS/2"
 
+#. Tag: para
 #: install-methods.xml:370
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have access to an i386 or amd64 machine, you can use one of the "
 "following programs to copy images to floppies."
@@ -542,9 +520,9 @@ msgstr ""
 "Nếu bạn có khả năng truy cập một máy kiểu i386 hoặc amd64, bạn có thể dùng "
 "một của những chương trình sau đây để sao chép ảnh vào đĩa mềm."
 
+#. Tag: para
 #: install-methods.xml:375
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <command>rawrite1</command> and <command>rawrite2</command> programs can "
 "be used under MS-DOS. To use these programs, first make sure that you are "
@@ -559,9 +537,9 @@ msgstr ""
 "trong Windows Explorer rất có thể sẽ <emphasis>không phải</emphasis> hoạt "
 "động được."
 
+#. Tag: para
 #: install-methods.xml:383
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
 "ME, XP and probably later versions. To use it you will need to unpack diskio."
@@ -571,12 +549,9 @@ msgstr ""
 "NT, 98, 2000, ME, XP và rất có thể dưới các phiên bản sau. Để sử dụng nó, "
 "bạn sẽ cần phải giải nén tập tin « diskio.dll » trong cùng thư mục."
 
+#. Tag: para
 #: install-methods.xml:389
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "These tools can be found on the Official Debian CD-ROMs under the "
-#| "<filename>/tools</filename> directory."
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
 "<filename>/tools</filename> directory."
@@ -584,24 +559,15 @@ msgstr ""
 "Có thể tìm thấy những công cụ này trên đĩa CD-ROM &debian; chính thức, dưới "
 "thư mục <filename>/tools</filename> (công cụ)."
 
+#. Tag: title
 #: install-methods.xml:402
 #, no-c-format
-#. Tag: title
 msgid "Writing Disk Images From MacOS"
 msgstr "Ghi ảnh đĩa từ MacOS"
 
+#. Tag: para
 #: install-methods.xml:403
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "An AppleScript, <application>Make Debian Floppy</application>, is "
-#| "available for burning floppies from the provided disk image files. It can "
-#| "be downloaded from <ulink url=\"ftp://ftp2.sourceforge.net/pub/"
-#| "sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink>. To use it, "
-#| "just unstuff it on your desktop, and then drag any floppy image file to "
-#| "it. You must have Applescript installed and enabled in your extensions "
-#| "manager. Disk Copy will ask you to confirm that you wish to erase the "
-#| "floppy and proceed to write the file image to it."
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
 "available for burning floppies from the provided disk image files. It can be "
@@ -612,13 +578,19 @@ msgid ""
 "ask you to confirm that you wish to erase the floppy and proceed to write "
 "the file image to it."
 msgstr ""
-"Có một văn lệnh AppleScript tên <application>Make &debian; Floppy</application> (tạo đĩa mềm &debian;) sẵn sàng để chép ra đĩa mềm từ các tập tin ảnh đĩa được cung cấp. Bạn có thể tải nó xuống <ulink url=\"ftp://ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></"
-"ulink>. Để sử dụng nó, chỉ giải nén nó vào Desktop (nền màn hình), sau đó kéo vào nó tập tin ảnh đĩa "
-"mềm nào. Tiến trình này yêu cầu AppleScript được cài đặt, và được hiệu lực trong Extensions Manager (bộ quản lý các phần mở rộng). Chương trình Disk Copy (sao chép đĩa) sẽ nhắc bạn xác nhận muốn xoá bỏ hẳn đĩa mềm đó, sau đó nó sẽ ghi vào đó ảnh tập tin."
+"Có một văn lệnh AppleScript tên <application>Make &debian; Floppy</"
+"application> (tạo đĩa mềm &debian;) sẵn sàng để chép ra đĩa mềm từ các tập "
+"tin ảnh đĩa được cung cấp. Bạn có thể tải nó xuống <ulink url=\"ftp://ftp2."
+"sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></"
+"ulink>. Để sử dụng nó, chỉ giải nén nó vào Desktop (nền màn hình), sau đó "
+"kéo vào nó tập tin ảnh đĩa mềm nào. Tiến trình này yêu cầu AppleScript được "
+"cài đặt, và được hiệu lực trong Extensions Manager (bộ quản lý các phần mở "
+"rộng). Chương trình Disk Copy (sao chép đĩa) sẽ nhắc bạn xác nhận muốn xoá "
+"bỏ hẳn đĩa mềm đó, sau đó nó sẽ ghi vào đó ảnh tập tin."
 
+#. Tag: para
 #: install-methods.xml:414
 #, no-c-format
-#. Tag: para
 msgid ""
 "You can also use the MacOS utility <command>Disk Copy</command> directly, or "
 "the freeware utility <command>suntar</command>. The <filename>root.bin</"
@@ -631,31 +603,30 @@ msgstr ""
 "Hãy dùng một của những phương pháp sau đây để tạo một đĩa mềm từ ảnh đĩa mềm "
 "bằng những tiện ích này."
 
+#. Tag: title
 #: install-methods.xml:425
 #, no-c-format
-#. Tag: title
 msgid "Writing Disk Images with <command>Disk Copy</command>"
 msgstr "Ghi ảnh đĩa bằng <command>Disk Copy</command>"
 
+#. Tag: para
 #: install-methods.xml:426
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you are creating the floppy image from files which were originally on "
-#| "the official &debian-gnu; CD, then the Type and Creator are already set "
-#| "correctly. The following <command>Creator-Changer</command> steps are "
-#| "only necessary if you downloaded the image files from a Debian mirror."
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
 "official &debian-gnu; CD, then the Type and Creator are already set "
 "correctly. The following <command>Creator-Changer</command> steps are only "
 "necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
-"Nếu bạn đang tạo ảnh đĩa mềm từ một số tập tin đã có trên đĩa CD &debian-gnu; chính thức, thì cả hai thuộc tính Type (loại) và Creator (bộ tạo) đã được lập cho đúng. Chỉ cần phải theo những bước <command>Creator-Changer</command> (thay đổi bộ tạo) theo đây nếu bạn đã tải các tập tin ảnh xuống một máy nhân bản &debian;."
+"Nếu bạn đang tạo ảnh đĩa mềm từ một số tập tin đã có trên đĩa CD &debian-"
+"gnu; chính thức, thì cả hai thuộc tính Type (loại) và Creator (bộ tạo) đã "
+"được lập cho đúng. Chỉ cần phải theo những bước <command>Creator-Changer</"
+"command> (thay đổi bộ tạo) theo đây nếu bạn đã tải các tập tin ảnh xuống một "
+"máy nhân bản &debian;."
 
+#. Tag: para
 #: install-methods.xml:435
 #, no-c-format
-#. Tag: para
 msgid ""
 "Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
 "and use it to open the <filename>root.bin</filename> file."
@@ -663,9 +634,9 @@ msgstr ""
 "Lấy tiện ích <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</"
 "ulink> và dùng nó để mở tập tin <filename>root.bin</filename>."
 
+#. Tag: para
 #: install-methods.xml:442
 #, no-c-format
-#. Tag: para
 msgid ""
 "Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
 "to <userinput>DDim</userinput> (binary floppy image). The case is sensitive "
@@ -675,9 +646,9 @@ msgstr ""
 "thay đổi Type thành <userinput>DDim</userinput> (ảnh đĩa mềm nhị phân). Hai "
 "trường này phân biệt chữ hoa/thường."
 
+#. Tag: para
 #: install-methods.xml:449
 #, no-c-format
-#. Tag: para
 msgid ""
 "<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
 "userinput> to display the Finder information about the floppy image, and "
@@ -691,9 +662,9 @@ msgstr ""
 "<userinput>File Locked</userinput> (tập tin bị khoá) để ngăn cản hệ điều "
 "hành MacOS gỡ bỏ các khối tin khởi động nếu ảnh này được gắn kết tình cờ."
 
+#. Tag: para
 #: install-methods.xml:458
 #, no-c-format
-#. Tag: para
 msgid ""
 "Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
 "will very likely be there already, otherwise try <ulink url=\"&url-powerpc-"
@@ -703,9 +674,9 @@ msgstr ""
 "đĩa CD cài đặt nó, rất có thể là tiện ích này đã có ; nếu không, xem <ulink "
 "url=\"&url-powerpc-diskcopy;\"></ulink>."
 
+#. Tag: para
 #: install-methods.xml:465
 #, no-c-format
-#. Tag: para
 msgid ""
 "Run <command>Disk Copy</command>, and select <menuchoice> "
 "<guimenu>Utilities</guimenu> <guimenuitem>Make a Floppy</guimenuitem> </"
@@ -720,15 +691,15 @@ msgstr ""
 "mềm, rồi hỏi nếu bạn thật sự muốn xoá nó hoàn toàn: xoá đi. Khi làm xong, "
 "chương trình nên đẩy ra đĩa."
 
+#. Tag: title
 #: install-methods.xml:480
 #, no-c-format
-#. Tag: title
 msgid "Writing Disk Images with <command>suntar</command>"
 msgstr "Ghi ảnh đĩa bằng <command>suntar</command>"
 
+#. Tag: para
 #: install-methods.xml:484
 #, no-c-format
-#. Tag: para
 msgid ""
 "Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
 "ulink>. Start the <command>suntar</command> program and select "
@@ -740,24 +711,24 @@ msgstr ""
 "<quote>Overwrite Sectors...</quote> (ghi đè lên các rãnh ghi) trong trình "
 "đơn <userinput>Special</userinput> (đặc biệt)."
 
+#. Tag: para
 #: install-methods.xml:492
 #, no-c-format
-#. Tag: para
 msgid ""
 "Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
 msgstr ""
 "Khi được nhắc, nạp đĩa mềm, rồi bấm phím &enterkey; (bất đầu ở rãnh ghi 0)."
 
+#. Tag: para
 #: install-methods.xml:498
 #, no-c-format
-#. Tag: para
 msgid ""
 "Select the <filename>root.bin</filename> file in the file-opening dialog."
 msgstr "Chọn tập tin <filename>root.bin</filename> trong hộp thoại mở tập tin."
 
+#. Tag: para
 #: install-methods.xml:503
 #, no-c-format
-#. Tag: para
 msgid ""
 "After the floppy has been created successfully, select <menuchoice> "
 "<guimenu>File</guimenu> <guimenuitem>Eject</guimenuitem> </menuchoice>. If "
@@ -768,9 +739,9 @@ msgstr ""
 "guimenu> <guimenuitem>Eject</guimenuitem> </menuchoice> (tập tin/đẩy ra). "
 "Nếu gặp lỗi nào trong khi tạo đĩa mềm, đơn giản hãy bỏ đĩa và thử đĩa mới."
 
+#. Tag: para
 #: install-methods.xml:511
 #, no-c-format
-#. Tag: para
 msgid ""
 "Before using the floppy you created, <emphasis>set the write protect tab</"
 "emphasis>! Otherwise if you accidentally mount it in MacOS, MacOS will "
@@ -780,21 +751,15 @@ msgstr ""
 "emphasis>! Nếu không, hệ điều hành MacOS sẽ hủy đĩa này nếu nó được gắn kết "
 "tình cờ."
 
+#. Tag: title
 #: install-methods.xml:530
 #, no-c-format
-#. Tag: title
 msgid "Preparing Files for USB Memory Stick Booting"
 msgstr "Chuẩn bị tập tin để khởi động thanh bộ nhớ USB"
 
+#. Tag: para
 #: install-methods.xml:532
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "There are two installation methods possible when booting from USB stick. "
-#| "The first is to install completely from the network. The second is to "
-#| "also copy a CD image onto the USB stick and use that as a source for "
-#| "packages, possibly in combination with a mirror. This second method is "
-#| "the more common."
 msgid ""
 "There are two installation methods possible when booting from USB stick. The "
 "first is to only use the USB stick to boot the installer, and then install "
@@ -802,11 +767,15 @@ msgid ""
 "USB stick and use that as a source for packages, possibly in combination "
 "with a mirror."
 msgstr ""
-"Có hai phương pháp cài đặt có thể làm được khi khởi động từ một thanh USB. Phương pháp trước là chỉ sử dụng thanh USB để khởi động trình cài đặt, sau đó cài đặt hoàn toàn từ mạng. Phương pháp sau là cũng sao chép vào thanh USB một ảnh đĩa CD, và sử dụng nó làm một nguồn cho gói, có thể là cùng với một máy nhân bản &debian;."
+"Có hai phương pháp cài đặt có thể làm được khi khởi động từ một thanh USB. "
+"Phương pháp trước là chỉ sử dụng thanh USB để khởi động trình cài đặt, sau "
+"đó cài đặt hoàn toàn từ mạng. Phương pháp sau là cũng sao chép vào thanh USB "
+"một ảnh đĩa CD, và sử dụng nó làm một nguồn cho gói, có thể là cùng với một "
+"máy nhân bản &debian;."
 
+#. Tag: para
 #: install-methods.xml:540
 #, no-c-format
-#. Tag: para
 msgid ""
 "To prepare the USB stick, you will need a system where GNU/Linux is already "
 "running and where USB is supported. With current GNU/Linux systems the USB "
@@ -827,9 +796,9 @@ msgstr ""
 "<command>dmesg</command> sau khi nạp vào. Để ghi vào thanh đó, có lẽ bạn cần "
 "phải tắt cái chuyển bảo vệ chống ghi của nó."
 
+#. Tag: para
 #: install-methods.xml:553
 #, no-c-format
-#. Tag: para
 msgid ""
 "The procedures described in this section will destroy anything already on "
 "the device! Make very sure that you use the correct device name for your USB "
@@ -841,14 +810,9 @@ msgstr ""
 "bị đúng cho thanh USB. Nếu bạn sử dụng thiết bị không đúng, kết quả có thể "
 "là tất cả các thông tin nằm trên (ví dụ) một đĩa cứng bị mất hoàn toàn."
 
+#. Tag: para
 #: install-methods.xml:560
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For the first installation method you'll need to download an installer "
-#| "image from the <filename>netboot</filename> directory (at the location "
-#| "mentioned in <xref linkend=\"where-files\"/>) and use the <quote>flexible "
-#| "way</quote> explained below to copy the files to the USB stick."
 msgid ""
 "To prepare a USB stick that only boots the installer, which then proceeds to "
 "install entirely from the network, you'll need to download the "
@@ -858,11 +822,16 @@ msgid ""
 "contents. This method will work with very small USB sticks, only a few "
 "megabytes in size."
 msgstr ""
-"Để chuẩn bị một thanh USB chỉ khởi động trình cài đặt, mà sau đó cài đặt hoàn toàn từ mạng, bạn cần phải tải tập tin <filename>mini.iso</filename> xuống thư mục <filename>netboot</filename> (ở vị trí lưu ý trong <xref linkend=\"where-files\"/>), và ghi tập tin này một cách trực tiếp vào thanh USB, cũng ghi đè lên nội dung đã có. Phương pháp này hoạt động được với thanh USB rất nhỏ, chỉ có kích cỡ vài MB."
+"Để chuẩn bị một thanh USB chỉ khởi động trình cài đặt, mà sau đó cài đặt "
+"hoàn toàn từ mạng, bạn cần phải tải tập tin <filename>mini.iso</filename> "
+"xuống thư mục <filename>netboot</filename> (ở vị trí lưu ý trong <xref "
+"linkend=\"where-files\"/>), và ghi tập tin này một cách trực tiếp vào thanh "
+"USB, cũng ghi đè lên nội dung đã có. Phương pháp này hoạt động được với "
+"thanh USB rất nhỏ, chỉ có kích cỡ vài MB."
 
+#. Tag: para
 #: install-methods.xml:570
 #, no-c-format
-#. Tag: para
 msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
@@ -874,43 +843,38 @@ msgid ""
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
 "two partitions should now be visible on it. You should mount the second of "
 "the two partitions, and unpack the firmware onto it."
-msgstr "Chẳng hạn, khi sử dụng một hệ thống GNU/Linux đã có, tập tin <filename>mini.iso</filename> có thể được ghi vào một thanh USB như theo đây: "
+msgstr ""
+"Chẳng hạn, khi sử dụng một hệ thống GNU/Linux đã có, tập tin <filename>mini."
+"iso</filename> có thể được ghi vào một thanh USB như theo đây: "
 "<informalexample><screen>\n"
 "# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
 "# sync\n"
-"</screen></informalexample> Để thêm phần vững vào một thanh USB được chuẩn bị bằng cách này, trước tiên lấy những tập tin phần vững cần thiết. Xem <xref linkend=\"loading-firmware\"/> để tìm thêm thông tin. Sau đó, tháo ra và chèn lại thanh USB: hai thành phần nên hiển thị trên nó. Bạn nên gắn kết thành phần thứ hai, và giải nén phần vững vào nó."
+"</screen></informalexample> Để thêm phần vững vào một thanh USB được chuẩn "
+"bị bằng cách này, trước tiên lấy những tập tin phần vững cần thiết. Xem "
+"<xref linkend=\"loading-firmware\"/> để tìm thêm thông tin. Sau đó, tháo ra "
+"và chèn lại thanh USB: hai thành phần nên hiển thị trên nó. Bạn nên gắn kết "
+"thành phần thứ hai, và giải nén phần vững vào nó."
 
 # Literal: don't translate; Nghĩa chữ : dừng dịch
+#. Tag: screen
 #: install-methods.xml:582
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
 "# cd /mnt\n"
 "# tar zxvf <replaceable>/path/to/</replaceable>firmware.tar.gz\n"
 "# cd /\n"
 "# umount"
-msgstr "# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
+msgstr ""
+"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
 "# cd /mnt\n"
 "# tar zxvf <replaceable>/đường/dẫn/đến/</replaceable>firmware.tar.gz\n"
 "# cd /\n"
 "# umount"
 
+#. Tag: para
 #: install-methods.xml:584
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Installation images for the second installation method can be found in "
-#| "the <filename>hd-media</filename> directory and either the <quote>easy "
-#| "way</quote> or the <quote>flexible way</quote> can be used to copy the "
-#| "image to the USB stick. For this installation method you will also need "
-#| "to download a CD image. The installation image and the CD image must be "
-#| "based on the same release of &d-i;. If they do not match you are likely "
-#| "to get errors<footnote> <para> The error message that is most likely to "
-#| "be displayed is that no kernel modules can be found. This means that the "
-#| "version of the kernel module udebs included on the CD image is different "
-#| "from the version of the running kernel. </para> </footnote> during the "
-#| "installation."
 msgid ""
 "To prepare a USB stick that installs packages from a CD image included on "
 "the stick, use the installer images found in the <filename>hd-media</"
@@ -924,11 +888,20 @@ msgid ""
 "included on the CD image is different from the version of the running "
 "kernel. </para> </footnote> during the installation."
 msgstr ""
-"Để chuẩn bị một thanh USB cài đặt gói từ một ảnh đĩa CD cũng nằm trên thanh đó, hãy sử dụng những ảnh cài đặt nằm trong thư mục <filename>hd-media</filename>. Hoặc <quote>phương pháp dễ dàng</quote> (the easy way) hoặc <quote>phương pháp dẻo</quote> (the flexible way) có thể được sử dụng để sao chép ảnh sang thanh USB. Để cài đặt bằng cách này, bạn cũng cần phải tải về một ảnh đĩa CD. Ảnh cài đặt và ảnh đĩa CD phải dựa vào cùng một bản phát hành &d-i;, không thì bạn rất có thể gặp lỗi<footnote> <para> Thông điệp lỗi thường gặp nhất là không tìm thấy mô-đun hạt nhân. Có nghĩa là ảnh đĩa CD chứa một phiên bản udeb mô-đun hạt nhân khác với phiên bản của hạt nhân đang chạy. </para> </footnote> trong khi cài đặt."
+"Để chuẩn bị một thanh USB cài đặt gói từ một ảnh đĩa CD cũng nằm trên thanh "
+"đó, hãy sử dụng những ảnh cài đặt nằm trong thư mục <filename>hd-media</"
+"filename>. Hoặc <quote>phương pháp dễ dàng</quote> (the easy way) hoặc "
+"<quote>phương pháp dẻo</quote> (the flexible way) có thể được sử dụng để sao "
+"chép ảnh sang thanh USB. Để cài đặt bằng cách này, bạn cũng cần phải tải về "
+"một ảnh đĩa CD. Ảnh cài đặt và ảnh đĩa CD phải dựa vào cùng một bản phát "
+"hành &d-i;, không thì bạn rất có thể gặp lỗi<footnote> <para> Thông điệp lỗi "
+"thường gặp nhất là không tìm thấy mô-đun hạt nhân. Có nghĩa là ảnh đĩa CD "
+"chứa một phiên bản udeb mô-đun hạt nhân khác với phiên bản của hạt nhân đang "
+"chạy. </para> </footnote> trong khi cài đặt."
 
+#. Tag: para
 #: install-methods.xml:604
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that the USB stick should be at least 256 MB in size (smaller setups "
 "are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
@@ -936,21 +909,15 @@ msgstr ""
 "Ghi chú rằng thanh USB nên có khả năng ít nhất 256 MB (còn có thể tạo thiết "
 "lập nhỏ hơn nếu bạn theo <xref linkend=\"usb-copy-flexible\"/>)."
 
+#. Tag: title
 #: install-methods.xml:612
 #, no-c-format
-#. Tag: title
 msgid "Copying the files &mdash; the easy way"
 msgstr "Sao chép tập tin một cách dễ dàng"
 
+#. Tag: para
 #: install-methods.xml:613
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
-#| "which contains all the installer files (including the kernel) <phrase "
-#| "arch=\"x86\">as well as <classname>syslinux</classname> and its "
-#| "configuration file.</phrase> <phrase arch=\"powerpc\">as well as "
-#| "<classname>yaboot</classname> and its configuration file.</phrase>"
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
 "contains all the installer files (including the kernel) <phrase arch="
@@ -958,12 +925,15 @@ msgid ""
 "file</phrase> <phrase arch=\"powerpc\">as well as <classname>yaboot</"
 "classname> and its configuration file</phrase>."
 msgstr ""
-"Có một tập tin toàn bộ <filename>hd-media/boot.img.gz</filename> chứa tất cả các tập tin cài đặt (gồm có hạt nhân) <phrase arch=\"x86\">cũng như <classname>syslinux</classname> và tập tin cấu hình của nó.</phrase> <phrase arch=\"powerpc\">cũng như <classname>yaboot</classname> và tập tin cấu hình "
+"Có một tập tin toàn bộ <filename>hd-media/boot.img.gz</filename> chứa tất cả "
+"các tập tin cài đặt (gồm có hạt nhân) <phrase arch=\"x86\">cũng như "
+"<classname>syslinux</classname> và tập tin cấu hình của nó.</phrase> <phrase "
+"arch=\"powerpc\">cũng như <classname>yaboot</classname> và tập tin cấu hình "
 "của nó.</phrase>"
 
+#. Tag: para
 #: install-methods.xml:622
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that, although convenient, this method does have one major "
 "disadvantage: the logical size of the device will be limited to 256 MB, even "
@@ -981,22 +951,22 @@ msgstr ""
 "một ảnh đĩa CD đầy đủ, chỉ ảnh CD nhỏ hơn kiểu danh thiếp (businesscard) hay "
 "cài đặt qua mạng (netinst)."
 
+#. Tag: para
 #: install-methods.xml:632
 #, no-c-format
-#. Tag: para
 msgid "To use this image simply extract it directly to your USB stick:"
 msgstr "Để sử dụng ảnh này, chỉ cần giải nén nó trực tiếp vào thanh USB:"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: install-methods.xml:636
 #, no-c-format
-#. Tag: screen
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 
+#. Tag: para
 #: install-methods.xml:638
 #, no-c-format
-#. Tag: para
 msgid ""
 "Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
 "<command>mac-fdisk</command>'s <userinput>C</userinput> command and extract "
@@ -1007,24 +977,15 @@ msgstr ""
 "một cách trực tiếp vào đó :"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: install-methods.xml:644
 #, no-c-format
-#. Tag: screen
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
+#. Tag: para
 #: install-methods.xml:646
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
-#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
-#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a Debian netinst "
-#| "or businesscard ISO image to it. Unmount the stick (<userinput>umount /"
-#| "mnt</userinput>) and you are done."
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -1044,15 +1005,15 @@ msgstr ""
 "đặt qua mạng (netinst). Tháo gắn kết thanh USB (<userinput>umount /mnt</"
 "userinput>) và bạn đã hoàn tất."
 
+#. Tag: title
 #: install-methods.xml:663
 #, no-c-format
-#. Tag: title
 msgid "Copying the files &mdash; the flexible way"
 msgstr "Sao chép tập tin một cách dẻo"
 
+#. Tag: para
 #: install-methods.xml:664
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you like more flexibility or just want to know what's going on, you "
 "should use the following method to put the files on your stick. One "
@@ -1065,16 +1026,15 @@ msgstr ""
 "về sử dụng phương pháp này là (nếu thanh USB có đủ khả năng) bạn có dịp sao "
 "chép vào nó một ảnh ISO đĩa CD đầy đủ."
 
-#: install-methods.xml:679
-#: install-methods.xml:791
-#, no-c-format
 #. Tag: title
+#: install-methods.xml:679 install-methods.xml:791
+#, no-c-format
 msgid "Partitioning the USB stick"
 msgstr "Phân vùng thanh USB"
 
+#. Tag: para
 #: install-methods.xml:680
 #, no-c-format
-#. Tag: para
 msgid ""
 "We will show how to set up the memory stick to use the first partition, "
 "instead of the entire device."
@@ -1082,21 +1042,9 @@ msgstr ""
 "Tiết đoạn này diễn tả phương pháp thiết lập thanh USB để dùng chỉ phân vùng "
 "thứ nhất, thay vì toàn bộ thiết bị."
 
+#. Tag: para
 #: install-methods.xml:685
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
-#| "you probably won't have to repartition or reformat the stick. If you have "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition<footnote> <para> Don't "
-#| "forget to set the <quote>bootable</quote> bootable flag. </para> </"
-#| "footnote>, and then create the filesystem using: "
-#| "<informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> Debian package."
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -1109,13 +1057,20 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> &debian; package."
 msgstr ""
-"Vì phần lớn các thanh USB được cấu hình sẵn với một phân vùng FAT16 riêng lẻ, rất có thể là bạn không cần phân vùng lại hay định dạng lại thanh đó. Nếu bạn vẫn cần làm như thế, hãy dùng <command>cfdisk</command> hay bất cứ công cụ phân vùng khác nào để tạo một phân vùng FAT16<footnote> <para> Đừng quên lập cờ có khả năng khởi động: <quote>bootable</quote>. </para> </footnote>, sau đó tạo hệ thống tập tin dùng: <informalexample><screen>\n"
+"Vì phần lớn các thanh USB được cấu hình sẵn với một phân vùng FAT16 riêng "
+"lẻ, rất có thể là bạn không cần phân vùng lại hay định dạng lại thanh đó. "
+"Nếu bạn vẫn cần làm như thế, hãy dùng <command>cfdisk</command> hay bất cứ "
+"công cụ phân vùng khác nào để tạo một phân vùng FAT16<footnote> <para> Đừng "
+"quên lập cờ có khả năng khởi động: <quote>bootable</quote>. </para> </"
+"footnote>, sau đó tạo hệ thống tập tin dùng: <informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> Kiểm tra lại bạn dùng tên thiết bị đúng cho thanh USB. Lệnh <command>mkdosfs</command> có sẵn trong gói &debian; <classname>dosfstools</classname>."
+"</screen></informalexample> Kiểm tra lại bạn dùng tên thiết bị đúng cho "
+"thanh USB. Lệnh <command>mkdosfs</command> có sẵn trong gói &debian; "
+"<classname>dosfstools</classname>."
 
+#. Tag: para
 #: install-methods.xml:704
 #, no-c-format
-#. Tag: para
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
 "boot loader on the stick. Although any boot loader (e.g. <classname>lilo</"
@@ -1132,9 +1087,9 @@ msgstr ""
 "điều hành nào hỗ trợ hệ thống tập tin FAT thì có thể được sử dụng để sửa đổi "
 "cấu hình của bộ nạp khởi động."
 
+#. Tag: para
 #: install-methods.xml:714
 #, no-c-format
-#. Tag: para
 msgid ""
 "To put <classname>syslinux</classname> on the FAT16 partition on your USB "
 "stick, install the <classname>syslinux</classname> and <classname>mtools</"
@@ -1156,16 +1111,15 @@ msgstr ""
 "nạp. Thủ tục này ghi vào phiên bản một rãnh ghi khởi động, và tạo tập tin "
 "<filename>ldlinux.sys</filename> mà chứa mã của bộ nạp khởi động."
 
-#: install-methods.xml:731
-#: install-methods.xml:838
-#, no-c-format
 #. Tag: title
+#: install-methods.xml:731 install-methods.xml:838
+#, no-c-format
 msgid "Adding the installer image"
 msgstr "Thêm ảnh cài đặt"
 
+#. Tag: para
 #: install-methods.xml:732
 #, no-c-format
-#. Tag: para
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
 "mnt</userinput>) and copy the following installer image files to the stick: "
@@ -1189,9 +1143,9 @@ msgstr ""
 "của tập tin, ghi chú rằng <classname>syslinux</classname> chỉ có khả năng xử "
 "lý tên tập tin kiểu DOS (8.3)."
 
+#. Tag: para
 #: install-methods.xml:756
 #, no-c-format
-#. Tag: para
 msgid ""
 "Next you should create a <filename>syslinux.cfg</filename> configuration "
 "file, which at a bare minimum should contain the following two lines (change "
@@ -1212,17 +1166,9 @@ msgstr ""
 "</screen></informalexample> Đối với trình cài đặt kiểu đồ họa, bạn nên thêm "
 "vào dòng thứ hai chuỗi <userinput>vga=788</userinput>."
 
+#. Tag: para
 #: install-methods.xml:768
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image<footnote> <para> You can use either a businesscard, a "
-#| "netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
-#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
-#| "iso</filename></quote> image is not usable for this purpose. </para> </"
-#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
-#| "(<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1232,24 +1178,18 @@ msgid ""
 "onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
 msgstr ""
-"Nếu bạn đã sử dụng một ảnh <filename>hd-media</filename>, bạn giờ nên sao chép vào thanh USB một ảnh ISO &debian;<footnote> <para>Bạn có thể sử dụng một ảnh ISO kiểu danh thiếp (businesscard), một ảnh ISO kiểu cài đặt qua mạng (netinst) hay một ảnh đĩa CD đầy đủ (xem <xref linkend=\"official-cdrom\"/>). Kiểm tra lại bạn chọn kiểu thích hợp. Ghi chú rằng ảnh kiểu <quote>netbookt <filename>mini.iso</filename></quote> không chạy được nhằm mục đích này.</para> </footnote>. Một khi hoàn tất thì tháo gắn kết thanh USB (<userinput>umount /mnt</userinput>)."
+"Nếu bạn đã sử dụng một ảnh <filename>hd-media</filename>, bạn giờ nên sao "
+"chép vào thanh USB một ảnh ISO &debian;<footnote> <para>Bạn có thể sử dụng "
+"một ảnh ISO kiểu danh thiếp (businesscard), một ảnh ISO kiểu cài đặt qua "
+"mạng (netinst) hay một ảnh đĩa CD đầy đủ (xem <xref linkend=\"official-cdrom"
+"\"/>). Kiểm tra lại bạn chọn kiểu thích hợp. Ghi chú rằng ảnh kiểu "
+"<quote>netbookt <filename>mini.iso</filename></quote> không chạy được nhằm "
+"mục đích này.</para> </footnote>. Một khi hoàn tất thì tháo gắn kết thanh "
+"USB (<userinput>umount /mnt</userinput>)."
 
+#. Tag: para
 #: install-methods.xml:792
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Most USB sticks do not come pre-configured in such a way that Open "
-#| "Firmware can boot from them, so you will need to repartition the stick. "
-#| "On Mac systems, run <userinput>mac-fdisk /dev/<replaceable>sdX</"
-#| "replaceable></userinput>, initialise a new partition map using the "
-#| "<userinput>i</userinput> command, and create a new partition of type "
-#| "Apple_Bootstrap using the <userinput>C</userinput> command. (Note that "
-#| "the first \"partition\" will always be the partition map itself.) Then "
-#| "type <informalexample><screen>\n"
-#| "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>hformat</command> command is "
-#| "contained in the <classname>hfsutils</classname> Debian package."
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
 "can boot from them, so you will need to repartition the stick. On Mac "
@@ -1264,18 +1204,21 @@ msgid ""
 "for your USB stick. The <command>hformat</command> command is contained in "
 "the <classname>hfsutils</classname> &debian; package."
 msgstr ""
-"Hậu hết các thanh USB không có cấu hình sẵn để Open Firmware khởi động được từ nó, do đó bạn cần phải phân vùng lại thanh USB. Trên hệ thống Mac, chạy câu lệnh"
-"<userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></userinput>,"
-"sơ khởi một sơ đồ phân vùng mới dùng lệnh <userinput>i</userinput>"
-"và tạo một phân vùng mới có kiểu <quote>Apple_Bootstrap</quote> dùng lệnh <userinput>C</userinput>. (Ghi chú rằng « phân vùng » thứ nhất lúc nào cũng là sơ đồ phân vùng chính nó.)"
-"Sau đó thì gõ câu lệnh "
-"<informalexample><screen>\n"
+"Hậu hết các thanh USB không có cấu hình sẵn để Open Firmware khởi động được "
+"từ nó, do đó bạn cần phải phân vùng lại thanh USB. Trên hệ thống Mac, chạy "
+"câu lệnh<userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></userinput>,"
+"sơ khởi một sơ đồ phân vùng mới dùng lệnh <userinput>i</userinput>và tạo một "
+"phân vùng mới có kiểu <quote>Apple_Bootstrap</quote> dùng lệnh <userinput>C</"
+"userinput>. (Ghi chú rằng « phân vùng » thứ nhất lúc nào cũng là sơ đồ phân "
+"vùng chính nó.)Sau đó thì gõ câu lệnh <informalexample><screen>\n"
 "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-"</screen></informalexample> Kiểm tra lại bạn sử dụng tên thiết bị đúng cho thanh USB. Lệnh <command>hformat</command> nằm trong gói &debian; <classname>hfsutils</classname>."
+"</screen></informalexample> Kiểm tra lại bạn sử dụng tên thiết bị đúng cho "
+"thanh USB. Lệnh <command>hformat</command> nằm trong gói &debian; "
+"<classname>hfsutils</classname>."
 
+#. Tag: para
 #: install-methods.xml:809
 #, no-c-format
-#. Tag: para
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
 "boot loader on the stick. The <command>yaboot</command> boot loader can be "
@@ -1290,9 +1233,9 @@ msgstr ""
 "hệ thống tập tin HFS có thể được dùng để thay đổi cấu hình của bộ tải khởi "
 "động."
 
+#. Tag: para
 #: install-methods.xml:818
 #, no-c-format
-#. Tag: para
 msgid ""
 "The normal <command>ybin</command> tool that comes with <command>yaboot</"
 "command> does not yet understand USB storage devices, so you will have to "
@@ -1326,9 +1269,9 @@ msgstr ""
 "khi làm thì phần còn lại của thanh USB có thể được chuẩn bị dùng các tiện "
 "ích UNIX thông thường."
 
+#. Tag: para
 #: install-methods.xml:839
 #, no-c-format
-#. Tag: para
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
 "mnt</userinput>) and copy the following installer image files to the stick:"
@@ -1337,33 +1280,33 @@ msgstr ""
 "mnt</userinput>) và sao chép vào thanh USB những tập tin theo đây từ kho "
 "Debian:"
 
+#. Tag: para
 #: install-methods.xml:846
 #, no-c-format
-#. Tag: para
 msgid "<filename>vmlinux</filename> (kernel binary)"
 msgstr "<filename>vmlinux</filename> (tập tin nhị phân của hạt nhân)"
 
+#. Tag: para
 #: install-methods.xml:851
 #, no-c-format
-#. Tag: para
 msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (ảnh đĩa RAM đầu tiên)"
 
+#. Tag: para
 #: install-methods.xml:856
 #, no-c-format
-#. Tag: para
 msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
 msgstr "<filename>yaboot.conf</filename> (tập tin cấu hình yaboot)"
 
+#. Tag: para
 #: install-methods.xml:861
 #, no-c-format
-#. Tag: para
 msgid "<filename>boot.msg</filename> (optional boot message)"
 msgstr "<filename>boot.msg</filename> (thông điệp khởi động tùy chọn)"
 
+#. Tag: para
 #: install-methods.xml:868
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <filename>yaboot.conf</filename> configuration file should contain the "
 "following lines: <informalexample><screen>\n"
@@ -1397,31 +1340,30 @@ msgstr ""
 "tham số <userinput>initrd-size</userinput>, phụ thuộc vào ảnh nào đang được "
 "khởi động."
 
+#. Tag: para
 #: install-methods.xml:878
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image (businesscard, netinst or full CD image; be sure to "
-#| "select one that fits) onto the stick. When you are done, unmount the USB "
-#| "memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
 "select one that fits) onto the stick. When you are done, unmount the USB "
 "memory stick (<userinput>umount /mnt</userinput>)."
 msgstr ""
-"Nếu bạn đã sử dụng một ảnh <filename>hd-media</filename>, bạn giờ nên sao chép vào thanh USB một ảnh ISO &debian; (kiểu danh thiếp [businesscard], cài đặt qua mạng [netinst] hay ảnh đĩa CD đầy đủ : kiểm tra lại bạn chọn một ảnh vừa được vào thanh USB). Một khi hoàn tất thì tháo gắn kết thanh USB (<userinput>umount /mnt</userinput>)."
+"Nếu bạn đã sử dụng một ảnh <filename>hd-media</filename>, bạn giờ nên sao "
+"chép vào thanh USB một ảnh ISO &debian; (kiểu danh thiếp [businesscard], cài "
+"đặt qua mạng [netinst] hay ảnh đĩa CD đầy đủ : kiểm tra lại bạn chọn một ảnh "
+"vừa được vào thanh USB). Một khi hoàn tất thì tháo gắn kết thanh USB "
+"(<userinput>umount /mnt</userinput>)."
 
+#. Tag: title
 #: install-methods.xml:893
 #, no-c-format
-#. Tag: title
 msgid "Booting the USB stick"
 msgstr "Khởi động thanh USB"
 
+#. Tag: para
 #: install-methods.xml:894
 #, no-c-format
-#. Tag: para
 msgid ""
 "If your system refuses to boot from the memory stick, the stick may contain "
 "an invalid master boot record (MBR). To fix this, use the <command>install-"
@@ -1433,21 +1375,21 @@ msgstr ""
 "classname>:"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: install-methods.xml:901
 #, no-c-format
-#. Tag: screen
 msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
 msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>"
 
+#. Tag: title
 #: install-methods.xml:912
 #, no-c-format
-#. Tag: title
 msgid "Preparing Files for Hard Disk Booting"
 msgstr "Chuẩn bị tập tin để khởi động đĩa cứng"
 
+#. Tag: para
 #: install-methods.xml:913
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installer may be booted using boot files placed on an existing hard "
 "drive partition, either launched from another operating system or by "
@@ -1457,9 +1399,9 @@ msgstr ""
 "đĩa cứng đã có, hoặc được khởi chạy từ hệ điều hành khác, hoặc bằng cách gọi "
 "một bộ nạp khởi động trực tiếp từ BIOS."
 
+#. Tag: para
 #: install-methods.xml:919
 #, no-c-format
-#. Tag: para
 msgid ""
 "A full, <quote>pure network</quote> installation can be achieved using this "
 "technique. This avoids all hassles of removable media, like finding and "
@@ -1471,9 +1413,9 @@ msgstr ""
 "chép ra ảnh đĩa CD, hoặc gặp khó khăn quản lý đĩa mềm quá nhiều hay không "
 "đáng tin."
 
+#. Tag: para
 #: install-methods.xml:926
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installer cannot boot from files on an HFS+ file system. MacOS System "
 "8.1 and above may use HFS+ file systems; NewWorld PowerMacs all use HFS+. To "
@@ -1495,9 +1437,9 @@ msgstr ""
 "một phân vùng kiểu HFS chuẩn (không phải HFS+) để trao đổi tập tin giữa hai "
 "hệ điều hành MacOS và Linux, đặc biệt các tập tin cài đặt bạn tải về."
 
+#. Tag: para
 #: install-methods.xml:937
 #, no-c-format
-#. Tag: para
 msgid ""
 "Different programs are used for hard disk installation system booting, "
 "depending on whether the system is a <quote>NewWorld</quote> or an "
@@ -1506,9 +1448,9 @@ msgstr ""
 "Máy tính <quote>kiểu mới</quote> và <quote>kiểu cũ</quote> sử dụng chương "
 "trình khác nhau để khởi động hệ thống cài đặt trên đĩa cứng."
 
+#. Tag: title
 #: install-methods.xml:946
 #, no-c-format
-#. Tag: title
 msgid ""
 "Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
 "command>"
@@ -1516,9 +1458,9 @@ msgstr ""
 "Khởi động trình cài đặt trên đĩa cứng bằng <command>LILO</command> hay "
 "<command>GRUB</command>"
 
+#. Tag: para
 #: install-methods.xml:948
 #, no-c-format
-#. Tag: para
 msgid ""
 "This section explains how to add to or even replace an existing linux "
 "installation using either <command>LILO</command> or <command>GRUB</command>."
@@ -1527,9 +1469,9 @@ msgstr ""
 "có, dùng bộ nạp khởi động hoặc <command>LILO</command> hoặc <command>GRUB</"
 "command>."
 
+#. Tag: para
 #: install-methods.xml:954
 #, no-c-format
-#. Tag: para
 msgid ""
 "At boot time, both bootloaders support loading in memory not only the "
 "kernel, but also a disk image. This RAM disk can be used as the root file-"
@@ -1539,35 +1481,32 @@ msgstr ""
 "không phải chỉ hạt nhân, cũng lại một ảnh đĩa. Hạt nhân có thể sử dụng đĩa "
 "RAM này như là hệ thống tập tin gốc."
 
+#. Tag: para
 #: install-methods.xml:960
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
-#| "filename>."
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
 "on your hard drive (note that LILO can not boot from files on an NTFS file "
 "system), for instance to <filename>/boot/newinstall/</filename>."
 msgstr ""
-"Sao chép những tập tin theo đây từ kho lưu &debian; vào một vị trí tiện lợi trên đĩa cứng, v.d. vào <filename>/boot/newinstall/</filename>."
+"Sao chép những tập tin theo đây từ kho lưu &debian; vào một vị trí tiện lợi "
+"trên đĩa cứng, v.d. vào <filename>/boot/newinstall/</filename>."
 
+#. Tag: para
 #: install-methods.xml:968
 #, no-c-format
-#. Tag: para
 msgid "<filename>vmlinuz</filename> (kernel binary)"
 msgstr "<filename>vmlinuz</filename> (tập tin nhị phân của hạt nhân)"
 
+#. Tag: para
 #: install-methods.xml:973
 #, no-c-format
-#. Tag: para
 msgid "<filename>initrd.gz</filename> (ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (ảnh đĩa RAM)"
 
+#. Tag: para
 #: install-methods.xml:980
 #, no-c-format
-#. Tag: para
 msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
 "\"/>."
@@ -1575,77 +1514,59 @@ msgstr ""
 "Cuối cùng, để cấu hình bộ nạp khởi động, hãy tiếp tục tới <xref linkend="
 "\"boot-initrd\"/>."
 
+#. Tag: title
 #: install-methods.xml:990
 #, no-c-format
-#. Tag: title
-#| msgid ""
-#| "Hard disk installer booting using <command>LILO</command> or "
-#| "<command>GRUB</command>"
 msgid "Hard disk installer booting using <command>loadlin</command>"
-msgstr ""
-"Khởi động trình cài đặt trên đĩa cứng bằng <command>loadlin</command"
+msgstr "Khởi động trình cài đặt trên đĩa cứng bằng <command>loadlin</command"
 
+#. Tag: para
 #: install-methods.xml:991
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This section explains how to add to or even replace an existing linux "
-#| "installation using either <command>LILO</command> or <command>GRUB</"
-#| "command>."
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
 "installer from DOS using <command>loadlin</command>."
 msgstr ""
-"Tiết đoạn này diễn tả cách chuẩn bị đĩa cứng để khởi động trình cài đặt từ DOS, dùng <command>loadlin</command>."
+"Tiết đoạn này diễn tả cách chuẩn bị đĩa cứng để khởi động trình cài đặt từ "
+"DOS, dùng <command>loadlin</command>."
 
-#: install-methods.xml:996
-#, no-c-format
 #. Tag: para
+#: install-methods.xml:996
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
+#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
-"Sao chép những tập tin theo đây từ một ảnh đĩa CD &debian; vào <filename>c:\\</"
-"filename>."
+"Sao chép những tập tin theo đây từ một ảnh đĩa CD &debian; vào <filename>c:"
+"\\</filename>."
 
+#. Tag: para
 #: install-methods.xml:1001
 #, no-c-format
-#. Tag: para
-#| msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
-msgstr "<filename>/&x86-install-dir;</filename> (bản nhị phân hạt nhân và ảnh đĩa RAM)"
+msgstr ""
+"<filename>/&x86-install-dir;</filename> (bản nhị phân hạt nhân và ảnh đĩa "
+"RAM)"
 
+#. Tag: para
 #: install-methods.xml:1006
 #, no-c-format
-#. Tag: para
-#| msgid "<filename>boot.msg</filename> (optional boot message)"
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (công cụ loadlin)"
 
+#. Tag: title
 #: install-methods.xml:1019
 #, no-c-format
-#. Tag: title
 msgid "Hard Disk Installer Booting for OldWorld Macs"
 msgstr "Khởi động trình cài đặt trên đĩa cứng của Mac kiểu cũ"
 
+#. Tag: para
 #: install-methods.xml:1020
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
-#| "application> to launch Linux installation, but <application>miBoot</"
-#| "application> cannot easily be used for hard disk booting. "
-#| "<application>BootX</application>, launched from MacOS, supports booting "
-#| "from files placed on the hard disk. <application>BootX</application> can "
-#| "also be used to dual-boot MacOS and Linux after your Debian installation "
-#| "is complete. For the Performa 6360, it appears that <command>quik</"
-#| "command> cannot make the hard disk bootable. So <application>BootX</"
-#| "application> is required on that model."
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
 "application> to launch Linux installation, but <application>miBoot</"
@@ -1657,24 +1578,20 @@ msgid ""
 "cannot make the hard disk bootable. So <application>BootX</application> is "
 "required on that model."
 msgstr ""
-"Đĩa mềm <filename>boot-floppy-hfs</filename> sử dụng ứng dụng <application>miBoot</application> để khởi chạy tiến trình cài đặt Linux, nhưng mà không thể dùng dễ dàng ứng dụng <application>miBoot</application> để khởi động đĩa cứng. Tuy nhiên, ứng dụng <application>BootX</application>, khi được khởi chạy từ hệ điều hành MacOS, có phải hỗ trợ chức năng khởi động "
-"từ tập tin nằm trên đĩa cứng. Cũng có thể dùng <application>BootX</application> để khởi động đôi MacOS và Linux một khi hoàn tất cài đặt &debian;. Trên máy Performa 6360, có vẻ là trình <command>quik</command> không thể làm cho đĩa cứng có khả năng khởi động. Vì vậy mô hình đó yêu cầu ứng dụng <application>BootX</application>."
+"Đĩa mềm <filename>boot-floppy-hfs</filename> sử dụng ứng dụng "
+"<application>miBoot</application> để khởi chạy tiến trình cài đặt Linux, "
+"nhưng mà không thể dùng dễ dàng ứng dụng <application>miBoot</application> "
+"để khởi động đĩa cứng. Tuy nhiên, ứng dụng <application>BootX</application>, "
+"khi được khởi chạy từ hệ điều hành MacOS, có phải hỗ trợ chức năng khởi động "
+"từ tập tin nằm trên đĩa cứng. Cũng có thể dùng <application>BootX</"
+"application> để khởi động đôi MacOS và Linux một khi hoàn tất cài đặt "
+"&debian;. Trên máy Performa 6360, có vẻ là trình <command>quik</command> "
+"không thể làm cho đĩa cứng có khả năng khởi động. Vì vậy mô hình đó yêu cầu "
+"ứng dụng <application>BootX</application>."
 
+#. Tag: para
 #: install-methods.xml:1033
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Download and unstuff the <application>BootX</application> distribution, "
-#| "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
-#| "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-#| "directory on Debian http/ftp mirrors and official Debian CDs. Use "
-#| "<application>Stuffit Expander</application> to extract it from its "
-#| "archive. Within the package, there is an empty folder called "
-#| "<filename>Linux Kernels</filename>. Download <filename>linux.bin</"
-#| "filename> and <filename>ramdisk.image.gz</filename> from the "
-#| "<filename>disks-powerpc/current/powermac</filename> folder, and place "
-#| "them in the <filename>Linux Kernels</filename> folder. Then place the "
-#| "<filename>Linux Kernels</filename> folder in the active System Folder."
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
 "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
@@ -1688,18 +1605,27 @@ msgid ""
 "folder. Then place the <filename>Linux Kernels</filename> folder in the "
 "active System Folder."
 msgstr ""
-"Tải về và giải nén bản phát hành <application>BootX</application> sẵn sàng tại <ulink url=\"&url-powerpc-bootx;\"></ulink>, hoặc nằm trong thư mục <filename>dists/woody/main/disks-powerpc/current/powermac</filename> trên máy nhân bản FTP/HTTP của &debian;, cũng trên đĩa CD &debian; chính thức. Dùng ứng dụng <application>Stuffit Expander</application> (miễn phí) để giải nén chương trình. Bên trong gói đó có một thư mục trống tên <filename>Linux Kernels</filename> (các hạt nhân Linux). Tải hai tập tin <filename>linux.bin</filename> và <filename>ramdisk.image.gz</filename> xuống thư mục "
-"<filename>disks-powerpc/current/powermac</filename>, sau đó để chúng vào thư mục <filename>Linux Kernels</filename>. Sau đó, để thư mục <filename>Linux Kernels</filename> vào System Folder (thư mục hệ thống) đang hoạt động."
+"Tải về và giải nén bản phát hành <application>BootX</application> sẵn sàng "
+"tại <ulink url=\"&url-powerpc-bootx;\"></ulink>, hoặc nằm trong thư mục "
+"<filename>dists/woody/main/disks-powerpc/current/powermac</filename> trên "
+"máy nhân bản FTP/HTTP của &debian;, cũng trên đĩa CD &debian; chính thức. "
+"Dùng ứng dụng <application>Stuffit Expander</application> (miễn phí) để giải "
+"nén chương trình. Bên trong gói đó có một thư mục trống tên <filename>Linux "
+"Kernels</filename> (các hạt nhân Linux). Tải hai tập tin <filename>linux."
+"bin</filename> và <filename>ramdisk.image.gz</filename> xuống thư mục "
+"<filename>disks-powerpc/current/powermac</filename>, sau đó để chúng vào thư "
+"mục <filename>Linux Kernels</filename>. Sau đó, để thư mục <filename>Linux "
+"Kernels</filename> vào System Folder (thư mục hệ thống) đang hoạt động."
 
+#. Tag: title
 #: install-methods.xml:1053
 #, no-c-format
-#. Tag: title
 msgid "Hard Disk Installer Booting for NewWorld Macs"
 msgstr "Khởi động trình cài đặt trên đĩa cứng của Mac kiểu mới"
 
+#. Tag: para
 #: install-methods.xml:1054
 #, no-c-format
-#. Tag: para
 msgid ""
 "NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
 "well as loading ELF binaries directly from the hard disk. These machines "
@@ -1718,57 +1644,51 @@ msgstr ""
 "máy mới hơn không có ổ đĩa mềm. Không hỗ trợ ứng dụng <command>BootX</"
 "command> nên không dùng nó trên máy PowerMac kiểu mới."
 
+#. Tag: para
 #: install-methods.xml:1065
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "<emphasis>Copy</emphasis> (not move) the following four files which you "
-#| "downloaded earlier from the Debian archives, onto the root level of your "
-#| "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
-#| "each file to the hard drive icon)."
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
 "downloaded earlier from the &debian; archives, onto the root level of your "
 "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
 "each file to the hard drive icon)."
 msgstr ""
-"<emphasis>Sao chép</emphasis> (không phải di chuyển) bốn tập tin theo đây mà bạn đã tải xuống kho &debian; về trước, vào lớp gốc của đĩa cứng. Có thể làm như thế bằng cách ấn giữ phím <keycap>option</keycap> trong khi kéo mỗi tập tin vào biểu tượng của đĩa cứng."
+"<emphasis>Sao chép</emphasis> (không phải di chuyển) bốn tập tin theo đây mà "
+"bạn đã tải xuống kho &debian; về trước, vào lớp gốc của đĩa cứng. Có thể làm "
+"như thế bằng cách ấn giữ phím <keycap>option</keycap> trong khi kéo mỗi tập "
+"tin vào biểu tượng của đĩa cứng."
 
 # Name: don't translate / Tên: đừng dịch
-#: install-methods.xml:1075
-#: install-methods.xml:1401
-#, no-c-format
 #. Tag: filename
+#: install-methods.xml:1075 install-methods.xml:1401
+#, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: install-methods.xml:1080
-#: install-methods.xml:1406
-#, no-c-format
 #. Tag: filename
+#: install-methods.xml:1080 install-methods.xml:1406
+#, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 # Name: don't translate / Tên: đừng dịch
-#: install-methods.xml:1085
-#: install-methods.xml:1411
-#, no-c-format
 #. Tag: filename
+#: install-methods.xml:1085 install-methods.xml:1411
+#, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: install-methods.xml:1090
-#: install-methods.xml:1416
-#, no-c-format
 #. Tag: filename
+#: install-methods.xml:1090 install-methods.xml:1416
+#, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
 
+#. Tag: para
 #: install-methods.xml:1095
 #, no-c-format
-#. Tag: para
 msgid ""
 "Make a note of the partition number of the MacOS partition where you place "
 "these files. If you have the MacOS <command>pdisk</command> program, you can "
@@ -1782,23 +1702,23 @@ msgstr ""
 "phân vùng này để gõ lệnh vào dấu nhắc OpenFirmware, khi bạn khởi động trình "
 "cài đặt."
 
+#. Tag: para
 #: install-methods.xml:1103
 #, no-c-format
-#. Tag: para
 msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
 msgstr ""
 "Để khởi động trình cài đặt, hãy tiếp tục tới <xref linkend=\"boot-newworld\"/"
 ">."
 
+#. Tag: title
 #: install-methods.xml:1116
 #, no-c-format
-#. Tag: title
 msgid "Preparing Files for TFTP Net Booting"
 msgstr "Chuẩn bị tập tin để khởi động qua mạng TFTP"
 
+#. Tag: para
 #: install-methods.xml:1117
 #, no-c-format
-#. Tag: para
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
 "boot it over the network from another machine, using TFTP. If you intend to "
@@ -1811,9 +1731,9 @@ msgstr ""
 "từ máy khác, cần phải để các tập tin khởi động vào vị trí dứt khoát trên máy "
 "đó, cũng cấu hình máy đó để hỗ trợ khả năng khởi động máy tính riêng của bạn."
 
+#. Tag: para
 #: install-methods.xml:1125
 #, no-c-format
-#. Tag: para
 msgid ""
 "You need to set up a TFTP server, and for many machines a DHCP server<phrase "
 "condition=\"supports-rarp\">, or RARP server</phrase><phrase condition="
@@ -1824,9 +1744,9 @@ msgstr ""
 "RARP</phrase><phrase condition=\"supports-bootp\">, hay trình phục vụ BOOTP</"
 "phrase>."
 
+#. Tag: para
 #: install-methods.xml:1132
 #, no-c-format
-#. Tag: para
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
 "(RARP) is one way to tell your client what IP address to use for itself. "
@@ -1845,9 +1765,9 @@ msgstr ""
 "một phần mở rộng BOOTP dẻo hơn và có khả năng tương thích ngược. Một số hệ "
 "thống riêng chỉ có thể được cấu hình bằng DHCP.</phrase>"
 
+#. Tag: para
 #: install-methods.xml:1146
 #, no-c-format
-#. Tag: para
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
 "idea to use DHCP instead of BOOTP. Some of the latest machines are unable to "
@@ -1857,12 +1777,9 @@ msgstr ""
 "DHCP thay cho BOOTP. Một số máy mới nhất không có khả năng khởi động bằng "
 "BOOTP."
 
+#. Tag: para
 #: install-methods.xml:1152
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. "
-#| "There is an <classname>rbootd</classname> package available in Debian."
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
 "is an <classname>rbootd</classname> package available in &debian;."
@@ -1870,9 +1787,9 @@ msgstr ""
 "Một số máy HPPA cũ (v.d. 715/75) dùng RBOOTD hơn là BOOTP. &debian; có sẵn "
 "một gói <classname>rbootd</classname>."
 
+#. Tag: para
 #: install-methods.xml:1157
 #, no-c-format
-#. Tag: para
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
 "the client. Theoretically, any server, on any platform, which implements "
@@ -1885,9 +1802,9 @@ msgstr ""
 "dụ trong tiết đoạn này sẽ cung cấp lệnh riêng cho hệ điều hành SunOS 4.x, "
 "SunOS 5.x (cũng tên Solaris), và GNU/Linux."
 
+#. Tag: para
 #: install-methods.xml:1165
 #, no-c-format
-#. Tag: para
 msgid ""
 "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
 "It's written by the same author as the <classname>syslinux</classname> "
@@ -1899,15 +1816,15 @@ msgstr ""
 "nạp khởi động <classname>syslinux</classname> thì ít nhất có thể gây ra vấn "
 "đề. Một sự chọn tốt khác là <classname>atftpd</classname>."
 
+#. Tag: title
 #: install-methods.xml:1181
 #, no-c-format
-#. Tag: title
 msgid "Setting up RARP server"
 msgstr "Thiết lập trình phục vụ RARP"
 
+#. Tag: para
 #: install-methods.xml:1182
 #, no-c-format
-#. Tag: para
 msgid ""
 "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
 "address) of the client computers to be installed. If you don't know this "
@@ -1924,9 +1841,9 @@ msgstr ""
 "phrase>khởi động vào chế độ <quote>Cứu</quote> (v.d. từ đĩa mềm cứu) và sử "
 "dụng câu lệnh <userinput>ip addr show dev eth0</userinput>."
 
+#. Tag: para
 #: install-methods.xml:1194
 #, no-c-format
-#. Tag: para
 msgid ""
 "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
 "you use the <command>rarpd</command> program. You need to ensure that the "
@@ -1949,15 +1866,15 @@ msgstr ""
 "a</userinput> trên một số hệ thống Linux khác, hoặc <userinput>/usr/etc/"
 "rarpd -a</userinput> trên hệ thống SunOS 4 (Solaris 1)."
 
+#. Tag: title
 #: install-methods.xml:1215
 #, no-c-format
-#. Tag: title
 msgid "Setting up a DHCP server"
 msgstr "Thiết lập trình phục vụ DHCP"
 
+#. Tag: para
 #: install-methods.xml:1216
 #, no-c-format
-#. Tag: para
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
 "gnu;, the <classname>dhcp3-server</classname> package is recommended. Here "
@@ -1969,9 +1886,9 @@ msgstr ""
 "là một tập tin cấu hình mẫu cho nó (xem <filename>/etc/dhcp3/dhcpd.conf</"
 "filename>):"
 
+#. Tag: screen
 #: install-methods.xml:1223
 #, no-c-format
-#. Tag: screen
 msgid ""
 "option domain-name \"example.com\";\n"
 "option domain-name-servers ns1.example.com;\n"
@@ -2029,9 +1946,9 @@ msgstr ""
 "hardware ethernet\tEthernet phần cứng\n"
 "fixed-address\t\tđịa chỉ cố định]"
 
+#. Tag: para
 #: install-methods.xml:1225
 #, no-c-format
-#. Tag: para
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
 "which performs all of the work of DHCP server, TFTP server, and network "
@@ -2047,9 +1964,9 @@ msgstr ""
 "cứng (hardware address) của máy khách. Tùy chọn <replaceable>filename</"
 "replaceable> (tên tập tin) nên là tên tập tin sẽ được lấy thông qua TFTP."
 
+#. Tag: para
 #: install-methods.xml:1235
 #, no-c-format
-#. Tag: para
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
 "restart it with <userinput>/etc/init.d/dhcpd3-server restart</userinput>."
@@ -2058,15 +1975,15 @@ msgstr ""
 "command>, hãy khởi chạy lại nó bằng lệnh <userinput>/etc/init.d/dhcpd3-"
 "server restart</userinput>."
 
+#. Tag: title
 #: install-methods.xml:1243
 #, no-c-format
-#. Tag: title
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "Bật khả năng khởi động PXE trong cấu hình DHCP"
 
+#. Tag: para
 #: install-methods.xml:1244
 #, no-c-format
-#. Tag: para
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
 "boot Execution Environment (PXE) method of TFTP. <informalexample><screen>\n"
@@ -2135,15 +2052,15 @@ msgstr ""
 "khách <filename>pxelinux.0</filename> là bộ nạp khởi động, không phải là ảnh "
 "hạt nhân (xem <xref linkend=\"tftp-images\"/> bên dưới)."
 
+#. Tag: title
 #: install-methods.xml:1264
 #, no-c-format
-#. Tag: title
 msgid "Setting up a BOOTP server"
 msgstr "Thiết lập trình phục vụ BOOTP"
 
+#. Tag: para
 #: install-methods.xml:1265
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
 "<command>bootpd</command>. The other is actually a DHCP server: ISC "
@@ -2157,40 +2074,9 @@ msgstr ""
 "gói<classname>bootp</classname> và <classname>dhcp3-server</classname> riêng "
 "từng cái."
 
+#. Tag: para
 #: install-methods.xml:1273
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "To use CMU <command>bootpd</command>, you must first uncomment (or add) "
-#| "the relevant line in <filename>/etc/inetd.conf</filename>. On &debian-"
-#| "gnu;, you can run <userinput>update-inetd --enable bootps</userinput>, "
-#| "then <userinput>/etc/init.d/inetd reload</userinput> to do so. Just in "
-#| "case your BOOTP server does not run Debian, the line in question should "
-#| "look like: <informalexample><screen>\n"
-#| "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-#| "</screen></informalexample> Now, you must create an <filename>/etc/"
-#| "bootptab</filename> file. This has the same sort of familiar and cryptic "
-#| "format as the good old BSD <filename>printcap</filename>, "
-#| "<filename>termcap</filename>, and <filename>disktab</filename> files. See "
-#| "the <filename>bootptab</filename> manual page for more information. For "
-#| "CMU <command>bootpd</command>, you will need to know the hardware (MAC) "
-#| "address of the client. Here is an example <filename>/etc/bootptab</"
-#| "filename>: <informalexample><screen>\n"
-#| "client:\\\n"
-#| "  hd=/tftpboot:\\\n"
-#| "  bf=tftpboot.img:\\\n"
-#| "  ip=192.168.1.90:\\\n"
-#| "  sm=255.255.255.0:\\\n"
-#| "  sa=192.168.1.1:\\\n"
-#| "  ha=0123456789AB:\n"
-#| "</screen></informalexample> You will need to change at least the "
-#| "<quote>ha</quote> option, which specifies the hardware address of the "
-#| "client. The <quote>bf</quote> option specifies the file a client should "
-#| "retrieve via TFTP; see <xref linkend=\"tftp-images\"/> for more details. "
-#| "<phrase arch=\"mips\"> On SGI machines you can just enter the command "
-#| "monitor and type <userinput>printenv</userinput>. The value of the "
-#| "<userinput>eaddr</userinput> variable is the machine's MAC address. </"
-#| "phrase>"
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
 "relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you "
@@ -2254,9 +2140,9 @@ msgstr ""
 "<userinput>eaddr</userinput> là địa chỉ phần cứng (địa chỉ MAC) của máy đó. "
 "</phrase>"
 
+#. Tag: para
 #: install-methods.xml:1306
 #, no-c-format
-#. Tag: para
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
 "easy, because it treats BOOTP clients as a moderately special case of DHCP "
@@ -2279,15 +2165,15 @@ msgstr ""
 "trình nền <command>dhcpd</command> bằng câu lệnh <userinput>/etc/init.d/"
 "dhcpd3-server restart</userinput>."
 
+#. Tag: title
 #: install-methods.xml:1325
 #, no-c-format
-#. Tag: title
 msgid "Enabling the TFTP Server"
 msgstr "Bật chạy trình phục vụ TFTP"
 
+#. Tag: para
 #: install-methods.xml:1326
 #, no-c-format
-#. Tag: para
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
 "<command>tftpd</command> is enabled."
@@ -2295,9 +2181,9 @@ msgstr ""
 "Để chuẩn bị trình phục vụ TFTP, trước tiên bạn nên đảm bảo rằng "
 "<command>tftpd</command> được hiệu lực."
 
+#. Tag: para
 #: install-methods.xml:1331
 #, no-c-format
-#. Tag: para
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
 "service can be run. It can be started on demand by the system's "
@@ -2311,9 +2197,9 @@ msgstr ""
 "chạy như là một trình nền độc lập. Phương pháp này được chọn khi gói được "
 "cài đặt, và lúc nào cũng có thể được thay đổi bằng cách cấu hình lại gói đó."
 
+#. Tag: para
 #: install-methods.xml:1340
 #, no-c-format
-#. Tag: para
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
 "to serve images from. However, &debian-gnu; packages may use other "
@@ -2330,15 +2216,9 @@ msgstr ""
 "filename>. Có lẽ bạn cần phải điều chỉnh những mẫu cấu hình trong phần này "
 "một cách tương ứng."
 
+#. Tag: para
 #: install-methods.xml:1350
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "All <command>in.tftpd</command> alternatives available in Debian should "
-#| "log TFTP requests to the system logs by default. Some of them support a "
-#| "<userinput>-v</userinput> argument to increase verbosity. It is "
-#| "recommended to check these log messages in case of boot problems as they "
-#| "are a good starting point for diagnosing the cause of errors."
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
 "log TFTP requests to the system logs by default. Some of them support a "
@@ -2346,25 +2226,16 @@ msgid ""
 "to check these log messages in case of boot problems as they are a good "
 "starting point for diagnosing the cause of errors."
 msgstr ""
-"Tất cả các sự chọn <command>in.tftpd</command> khác sẵn sàng trong &debian; thì nên ghi lưu các yêu cầu TFTP vào sổ theo dõi hệ thống theo mặc định. Một số điều cũng hỗ trợ một đối số <userinput>-v</userinput> để tăng mức chi tiết của kết xuất. Khuyên bạn kiểm tra các thông điệp ghi lưu này trong trường hợp gặp vấn đề khởi động, vì sổ theo dõi là một điểm bắt đầu hữu ích để chẩn đoán "
-"nguyên nhân của lỗi."
+"Tất cả các sự chọn <command>in.tftpd</command> khác sẵn sàng trong &debian; "
+"thì nên ghi lưu các yêu cầu TFTP vào sổ theo dõi hệ thống theo mặc định. Một "
+"số điều cũng hỗ trợ một đối số <userinput>-v</userinput> để tăng mức chi "
+"tiết của kết xuất. Khuyên bạn kiểm tra các thông điệp ghi lưu này trong "
+"trường hợp gặp vấn đề khởi động, vì sổ theo dõi là một điểm bắt đầu hữu ích "
+"để chẩn đoán nguyên nhân của lỗi."
 
+#. Tag: para
 #: install-methods.xml:1358
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you intend to install Debian on an SGI machine and your TFTP server is "
-#| "a GNU/Linux box running Linux 2.4, you'll need to set the following on "
-#| "your server: <informalexample><screen>\n"
-#| "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-#| "</screen></informalexample> to turn off Path MTU discovery, otherwise the "
-#| "SGI's PROM can't download the kernel. Furthermore, make sure TFTP packets "
-#| "are sent from a source port no greater than 32767, or the download will "
-#| "stall after the first packet. Again, it's Linux 2.4.X tripping this bug "
-#| "in the PROM, and you can avoid it by setting <informalexample><screen>\n"
-#| "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-#| "</screen></informalexample> to adjust the range of source ports the Linux "
-#| "TFTP server uses."
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
 "a GNU/Linux box running Linux 2.4, you'll need to set the following on your "
@@ -2393,15 +2264,15 @@ msgstr ""
 "</screen></informalexample> để điều chỉnh phạm vị cổng nguồn sẵn sàng cho "
 "trình phục vụ TFTP Linux sử dụng."
 
+#. Tag: title
 #: install-methods.xml:1380
 #, no-c-format
-#. Tag: title
 msgid "Move TFTP Images Into Place"
 msgstr "Xác định vị trí của ảnh TFTP"
 
+#. Tag: para
 #: install-methods.xml:1381
 #, no-c-format
-#. Tag: para
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
 "files\"/>, in the <command>tftpd</command> boot image directory. You may "
@@ -2416,9 +2287,9 @@ msgstr ""
 "riêng. Tiếc là tên tập tin được quyết định bởi máy khách TFTP, và chưa có "
 "tiêu chuẩn mạnh nào."
 
+#. Tag: para
 #: install-methods.xml:1390
 #, no-c-format
-#. Tag: para
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
 "<command>yaboot</command> boot loader as the TFTP boot image. "
@@ -2432,15 +2303,15 @@ msgstr ""
 "chính nó. Bạn cần phải tải xuống thư mục <filename>netboot/</filename> những "
 "tập tin theo đây:"
 
+#. Tag: filename
 #: install-methods.xml:1421
 #, no-c-format
-#. Tag: filename
 msgid "boot.msg"
 msgstr "boot.msg"
 
+#. Tag: para
 #: install-methods.xml:1426
 #, no-c-format
-#. Tag: para
 msgid ""
 "For PXE booting, everything you should need is set up in the "
 "<filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this "
@@ -2455,9 +2326,9 @@ msgstr ""
 "pxelinux.0</filename> cho trình nền<command>tftpd</command> như là tên tập "
 "tin cần khởi động."
 
+#. Tag: para
 #: install-methods.xml:1434
 #, no-c-format
-#. Tag: para
 msgid ""
 "For PXE booting, everything you should need is set up in the "
 "<filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this "
@@ -2472,15 +2343,15 @@ msgstr ""
 "installer/ia64/elilo.efi</filename> cho trình nền <command>tftpd</command> "
 "như là tên tập tin cần khởi động."
 
+#. Tag: title
 #: install-methods.xml:1446
 #, no-c-format
-#. Tag: title
 msgid "SPARC TFTP Booting"
 msgstr "Khởi động TFTP SPARC"
 
+#. Tag: para
 #: install-methods.xml:1447
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
 "<quote>SUN4M</quote> or <quote>SUN4C</quote>, to the filename. Thus, if your "
@@ -2508,9 +2379,9 @@ msgstr ""
 "</screen></informalexample> Để giành tên tập tin đúng, bạn cần phải chuyển "
 "đổi mọi chữ sang chữ hoa, cũng (nếu cần thiết) phụ thêm tên kiến trúc phụ đó."
 
+#. Tag: para
 #: install-methods.xml:1463
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
 "userinput> from the OpenPROM should load the image. If the image cannot be "
@@ -2521,9 +2392,9 @@ msgstr ""
 "userinput> từ dấu nhắc OpenPROM nên nạp ảnh đó. Không tìm thấy ảnh thì kiểm "
 "tra các bản ghi trên trình phục vụ TFTP để xem tên ảnh nào được yêu cầu."
 
+#. Tag: para
 #: install-methods.xml:1470
 #, no-c-format
-#. Tag: para
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
 "adding it to the end of the OpenPROM boot command, such as <userinput>boot "
@@ -2535,15 +2406,15 @@ msgstr ""
 "ảnh_sparc.tôi</userinput>. Nó vẫn còn phải nằm trong thư mục trong đó máy "
 "phục vụ TFTP tìm."
 
+#. Tag: title
 #: install-methods.xml:1481
 #, no-c-format
-#. Tag: title
 msgid "SGI TFTP Booting"
 msgstr "Khởi động TFTP SGI"
 
+#. Tag: para
 #: install-methods.xml:1482
 #, no-c-format
-#. Tag: para
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
 "name of the TFTP file. It is given either as the <userinput>bf=</userinput> "
@@ -2556,21 +2427,15 @@ msgstr ""
 "filename> hoặc là tùy chọn <userinput>filename=</userinput> nằm trong tập "
 "tin cấu hình <filename>/etc/dhcpd.conf</filename>."
 
+#. Tag: title
 #: install-methods.xml:1590
 #, no-c-format
-#. Tag: title
 msgid "Automatic Installation"
 msgstr "Cài đặt tự động"
 
+#. Tag: para
 #: install-methods.xml:1591
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For installing on multiple computers it's possible to do fully automatic "
-#| "installations. Debian packages intended for this include <classname>fai</"
-#| "classname> (which uses an install server), <classname>replicator</"
-#| "classname>, <classname>systemimager</classname>, <classname>autoinstall</"
-#| "classname>, and the Debian Installer itself."
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
 "installations. &debian; packages intended for this include <classname>fai-"
@@ -2578,34 +2443,34 @@ msgid ""
 "Installer itself. Have a look at the <ulink url=\"http://fai-project.org"
 "\">FAI home page</ulink> for detailed information."
 msgstr ""
-"Để cài đặt vào nhiều máy tính, có thể chạy việc cài đặt đầy đủ tự động. Những gói &debian; dự định nhằm mục đích này bao gồm <classname>fai</classname> (mà có thể dùng một trình phục vụ cài đặt), và trình cài đặt &debian; chính nó. Xem <ulink url=\"http://fai-project.org\">trang chủ FAI</ulink> để tìm thông tin chi tiết."
+"Để cài đặt vào nhiều máy tính, có thể chạy việc cài đặt đầy đủ tự động. "
+"Những gói &debian; dự định nhằm mục đích này bao gồm <classname>fai</"
+"classname> (mà có thể dùng một trình phục vụ cài đặt), và trình cài đặt "
+"&debian; chính nó. Xem <ulink url=\"http://fai-project.org\">trang chủ FAI</"
+"ulink> để tìm thông tin chi tiết."
 
+#. Tag: title
 #: install-methods.xml:1603
 #, no-c-format
-#. Tag: title
-#| msgid "Automatic Installation Using the Debian Installer"
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Tự động cài đặt dùng trình cài đặt &debian;"
 
+#. Tag: para
 #: install-methods.xml:1604
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The Debian Installer supports automating installs via preconfiguration "
-#| "files. A preconfiguration file can be loaded from the network or from "
-#| "removable media, and used to fill in answers to questions asked during "
-#| "the installation process."
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
 "files. A preconfiguration file can be loaded from the network or from "
 "removable media, and used to fill in answers to questions asked during the "
 "installation process."
 msgstr ""
-"Trình cài đặt &debian; hỗ trợ tự động hoá việc cài đặt thông qua tập tin cấu hình sẵn. Tập tin cấu hình sẵn có thể được nạp từ mạng hoặc từ vật chứa rời, cũng cung cấp trả lời cho câu được hỏi trong khi cài đặt."
+"Trình cài đặt &debian; hỗ trợ tự động hoá việc cài đặt thông qua tập tin cấu "
+"hình sẵn. Tập tin cấu hình sẵn có thể được nạp từ mạng hoặc từ vật chứa rời, "
+"cũng cung cấp trả lời cho câu được hỏi trong khi cài đặt."
 
+#. Tag: para
 #: install-methods.xml:1611
 #, no-c-format
-#. Tag: para
 msgid ""
 "Full documentation on preseeding including a working example that you can "
 "edit is in <xref linkend=\"appendix-preseed\"/>."
diff --git a/po/vi/installation-howto.po b/po/vi/installation-howto.po
index 196150277..45a797ab4 100644
--- a/po/vi/installation-howto.po
+++ b/po/vi/installation-howto.po
@@ -17,15 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: installation-howto.xml:5
 #, no-c-format
-#. Tag: title
 msgid "Installation Howto"
 msgstr "Cài đặt Thế nào"
 
+#. Tag: para
 #: installation-howto.xml:7
 #, no-c-format
-#. Tag: para
 msgid ""
 "This document describes how to install &debian-gnu; &releasename; for the "
 "&arch-title; (<quote>&architecture;</quote>) with the new &d-i;. It is a "
@@ -41,15 +41,15 @@ msgstr ""
 "ích, chúng tôi sẽ liên kết đến sự giải thích chi tiết hơn trong phần tài "
 "liệu khác."
 
+#. Tag: title
 #: installation-howto.xml:19
 #, no-c-format
-#. Tag: title
 msgid "Preliminaries"
 msgstr "Chuẩn bị"
 
+#. Tag: para
 #: installation-howto.xml:20
 #, no-c-format
-#. Tag: para
 msgid ""
 "<phrase condition=\"unofficial-build\"> The debian-installer is still in a "
 "beta state. </phrase> If you encounter bugs during your install, please "
@@ -65,15 +65,15 @@ msgstr ""
 "hoặc trong hộp thư chung « debian-boot » (&email-debian-boot-list;) hoặc "
 "trên IRC (kênh #debian-boot trên mạng OFTC)."
 
+#. Tag: title
 #: installation-howto.xml:36
 #, no-c-format
-#. Tag: title
 msgid "Booting the installer"
 msgstr "Khởi động trình cài đặt"
 
+#. Tag: para
 #: installation-howto.xml:37
 #, no-c-format
-#. Tag: para
 msgid ""
 "<phrase condition=\"unofficial-build\"> For some quick links to CD images, "
 "check out the <ulink url=\"&url-d-i;\"> &d-i; home page</ulink>. </phrase> "
@@ -87,28 +87,23 @@ msgstr ""
 "url=\"&url-debian-cd;\">trang đĩa CD Debian</ulink>. Để tìm thông tin thêm "
 "về nơi cần lấy đĩa CD, xem <xref linkend=\"official-cdrom\"/>."
 
+#. Tag: para
 #: installation-howto.xml:47
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Some installation methods require other images than CD images. <phrase "
-#| "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
-#| "page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
-#| "files\"/> explains how to find images on Debian mirrors."
 msgid ""
 "Some installation methods require other images than CD images. <phrase "
 "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
 "page</ulink> has links to other images. </phrase> <xref linkend=\"where-files"
 "\"/> explains how to find images on &debian; mirrors."
 msgstr ""
-"Một số phương pháp cài đặt nào đó yêu cầu ảnh khác với ảnh đĩa CD. "
-"<phrase condition=\"unofficial-build\"> <ulink url=\"&url-d-i;\">Trang chủ "
-"&d-i;</ulink> chứa liên kết đến ảnh loại khác. </phrase> <xref linkend="
-"\"where-files\"/> diễn tả cách tìm ảnh trên máy nhân bản &debian;."
+"Một số phương pháp cài đặt nào đó yêu cầu ảnh khác với ảnh đĩa CD. <phrase "
+"condition=\"unofficial-build\"> <ulink url=\"&url-d-i;\">Trang chủ &d-i;</"
+"ulink> chứa liên kết đến ảnh loại khác. </phrase> <xref linkend=\"where-files"
+"\"/> diễn tả cách tìm ảnh trên máy nhân bản &debian;."
 
+#. Tag: para
 #: installation-howto.xml:57
 #, no-c-format
-#. Tag: para
 msgid ""
 "The subsections below will give the details about which images you should "
 "get for each possible means of installation."
@@ -116,15 +111,15 @@ msgstr ""
 "Những tiết đoạn phụ dưới đây cung cấp chi tiết về ảnh nào bạn nên lấy để "
 "thực hiện mỗi phương pháp cài đặt."
 
+#. Tag: title
 #: installation-howto.xml:65
 #, no-c-format
-#. Tag: title
 msgid "CDROM"
 msgstr "CD-ROM"
 
+#. Tag: para
 #: installation-howto.xml:67
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are two different netinst CD images which can be used to install "
 "&releasename; with the &d-i;. These images are intended to boot from CD and "
@@ -142,9 +137,9 @@ msgstr ""
 "thẻ kinh doanh. Hoặc bạn có thể lấy một đĩa CD kích cỡ đầy đủ mà không cần "
 "mạng để cài đặt. Bạn cần có chỉ đĩa CD thứ nhất của bộ này."
 
+#. Tag: para
 #: installation-howto.xml:78
 #, no-c-format
-#. Tag: para
 msgid ""
 "Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-"
 "x86\">To boot the CD, you may need to change your BIOS configuration, as "
@@ -160,29 +155,28 @@ msgstr ""
 "phím <keycap>c</keycap> trong khi khởi động. Xem <xref linkend=\"boot-cd\"/> "
 "để tìm phương pháp khác khởi động từ đĩa CD. </phrase>"
 
+#. Tag: title
 #: installation-howto.xml:92
 #, no-c-format
-#. Tag: title
 msgid "Floppy"
 msgstr "Đĩa mềm"
 
+#. Tag: para
 #: installation-howto.xml:93
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you can't boot from CD, you can download floppy images to install "
-#| "Debian. You need the <filename>floppy/boot.img</filename>, the "
-#| "<filename>floppy/root.img</filename> and one or more of the driver disks."
 msgid ""
 "If you can't boot from CD, you can download floppy images to install "
 "&debian;. You need the <filename>floppy/boot.img</filename>, the "
 "<filename>floppy/root.img</filename> and one or more of the driver disks."
 msgstr ""
-"Không có khả năng khởi động từ đĩa CD thì bạn vẫn có thể tải về ảnh đĩa mềm để cài đặt &debian;. Bạn cần có hai tập tin <filename>floppy/boot.img</filename> và <filename>floppy/root.img</filename>, cùng với một hay nhiều đĩa trình điều khiển."
+"Không có khả năng khởi động từ đĩa CD thì bạn vẫn có thể tải về ảnh đĩa mềm "
+"để cài đặt &debian;. Bạn cần có hai tập tin <filename>floppy/boot.img</"
+"filename> và <filename>floppy/root.img</filename>, cùng với một hay nhiều "
+"đĩa trình điều khiển."
 
+#. Tag: para
 #: installation-howto.xml:99
 #, no-c-format
-#. Tag: para
 msgid ""
 "The boot floppy is the one with <filename>boot.img</filename> on it. This "
 "floppy, when booted, will prompt you to insert a second floppy &mdash; use "
@@ -192,9 +186,9 @@ msgstr ""
 "này, khi được khởi động, sẽ nhắc bạn nạp đĩa mềm thứ hai &mdash; đĩa mang "
 "nhãn <filename>root.img</filename>."
 
+#. Tag: para
 #: installation-howto.xml:105
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you're planning to install over the network, you will usually need the "
 "<filename>floppy/net-drivers-1.img</filename>. For PCMCIA or USB networking, "
@@ -206,9 +200,9 @@ msgstr ""
 "USB, và một số thẻ mạng ít thường hơn, bạn cũng cần có một đĩa mềm điều "
 "khiển thứ hai, <filename>floppy/net-drivers-2.img</filename>."
 
+#. Tag: para
 #: installation-howto.xml:112
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have a CD, but cannot boot from it, then boot from floppies and use "
 "<filename>floppy/cd-drivers.img</filename> on a driver disk to complete the "
@@ -218,9 +212,9 @@ msgstr ""
 "đĩa mềm thay thế, rồi sử dụng tập tin <filename>floppy/cd-drivers.img</"
 "filename> trên đĩa mềm trình điều khiển, để cài đặt xong bằng đĩa CD."
 
+#. Tag: para
 #: installation-howto.xml:118
 #, no-c-format
-#. Tag: para
 msgid ""
 "Floppy disks are one of the least reliable media around, so be prepared for "
 "lots of bad disks (see <xref linkend=\"unreliable-floppies\"/>). Each "
@@ -236,38 +230,27 @@ msgstr ""
 "(xem <xref linkend=\"create-floppy\"/> để tìm chi tiết). Vì bạn sẽ cần phải "
 "quản lý nhiều đĩa mềm, khuyên bạn nhãn mỗi đĩa riêng."
 
+#. Tag: title
 #: installation-howto.xml:131
 #, no-c-format
-#. Tag: title
 msgid "USB memory stick"
 msgstr "Thanh bộ nhớ USB"
 
+#. Tag: para
 #: installation-howto.xml:132
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "It's also possible to install from removable USB storage devices. For "
-#| "example a USB keychain can make a handy Debian install medium that you "
-#| "can take with you anywhere."
 msgid ""
 "It's also possible to install from removable USB storage devices. For "
 "example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
-"Cũng có thể cài đặt từ thiết bị lưu trữ USB rời. Chẳng hạn, một dây khoá USB có thể làm vật chứa cài đặt &debian; hữu ích mà bạn có thể mang đến khắp chốn."
+"Cũng có thể cài đặt từ thiết bị lưu trữ USB rời. Chẳng hạn, một dây khoá USB "
+"có thể làm vật chứa cài đặt &debian; hữu ích mà bạn có thể mang đến khắp "
+"chốn."
 
+#. Tag: para
 #: installation-howto.xml:138
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The easiest way to prepare your USB memory stick is to download "
-#| "<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the "
-#| "256 MB image from that file. Write this image directly to your memory "
-#| "stick, which must be at least 256 mb in size. Of course this will destroy "
-#| "anything already on the memory stick. Then mount the memory stick, which "
-#| "will now have a FAT filesystem on it. Next, download a Debian netinst CD "
-#| "image, and copy that file to the memory stick; any filename is ok as long "
-#| "as it ends in <literal>.iso</literal>."
 msgid ""
 "The easiest way to prepare your USB memory stick is to download <filename>hd-"
 "media/boot.img.gz</filename>, and use gunzip to extract the 256 MB image "
@@ -278,12 +261,18 @@ msgid ""
 "file to the memory stick; any filename is ok as long as it ends in <literal>."
 "iso</literal>."
 msgstr ""
-"Phương pháp dễ nhất chuẩn bị thanh bộ nhớ USB là tải về kho nén <filename>hd-media/boot.img.gz</filename>, sau đó chạy chương trình « gunzip » để giải nén ảnh 256 MB từ tập tin đó. Ghi ảnh này một cách trực tiếp vào thanh bộ nhớ có kích cỡ ít nhất 256 MB (cũng hủy dữ liệu nào đã có trên thanh đó). Sau đó, hãy gắn kết thanh bộ nhớ, mà lúc bây giờ chứa hệ thống tập tin kiểu FAT. Bước kế tiếp, "
-"tải về một ảnh đĩa CD cài đặt qua mạng (netinst) &debian;, và sao chép tập tin này vào thanh bộ nhớ; có thể sử dụng bất cứ tên tập tin nào kết thúc bằng <literal>.iso</literal>."
+"Phương pháp dễ nhất chuẩn bị thanh bộ nhớ USB là tải về kho nén <filename>hd-"
+"media/boot.img.gz</filename>, sau đó chạy chương trình « gunzip » để giải "
+"nén ảnh 256 MB từ tập tin đó. Ghi ảnh này một cách trực tiếp vào thanh bộ "
+"nhớ có kích cỡ ít nhất 256 MB (cũng hủy dữ liệu nào đã có trên thanh đó). "
+"Sau đó, hãy gắn kết thanh bộ nhớ, mà lúc bây giờ chứa hệ thống tập tin kiểu "
+"FAT. Bước kế tiếp, tải về một ảnh đĩa CD cài đặt qua mạng (netinst) "
+"&debian;, và sao chép tập tin này vào thanh bộ nhớ; có thể sử dụng bất cứ "
+"tên tập tin nào kết thúc bằng <literal>.iso</literal>."
 
+#. Tag: para
 #: installation-howto.xml:149
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are other, more flexible ways to set up a memory stick to use the "
 "debian-installer, and it's possible to get it to work with smaller memory "
@@ -293,9 +282,9 @@ msgstr ""
 "i;, cũng có thể làm cho nó hoạt động được với thanh bộ nhớ nhỏ hơn. Để tìm "
 "chi tiết, xem <xref linkend=\"boot-usb-files\"/>."
 
+#. Tag: para
 #: installation-howto.xml:155
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some BIOSes can boot USB storage directly, and some cannot. You may need to "
 "configure your BIOS to boot from a <quote>removable drive</quote> or even a "
@@ -308,9 +297,9 @@ msgstr ""
 "được từ thiết bị USB. Để tìm mẹo có ích và chi tiết, xem  <xref linkend="
 "\"usb-boot\"/>."
 
+#. Tag: para
 #: installation-howto.xml:162
 #, no-c-format
-#. Tag: para
 msgid ""
 "Booting Macintosh systems from USB storage devices involves manual use of "
 "Open Firmware. For directions, see <xref linkend=\"usb-boot\"/>."
@@ -319,15 +308,15 @@ msgstr ""
 "phải tự sử dụng Open Firmware (phần vững mở). Để tìm chỉ dẫn, xem <xref "
 "linkend=\"usb-boot\"/>."
 
+#. Tag: title
 #: installation-howto.xml:171
 #, no-c-format
-#. Tag: title
 msgid "Booting from network"
 msgstr "Khởi động từ mạng"
 
+#. Tag: para
 #: installation-howto.xml:172
 #, no-c-format
-#. Tag: para
 msgid ""
 "It's also possible to boot &d-i; completely from the net. The various "
 "methods to netboot depend on your architecture and netboot setup. The files "
@@ -338,9 +327,9 @@ msgstr ""
 "bạn. Những tập tin nằm trong thư mục <filename>netboot/</filename> có thể "
 "được dùng để khởi động &d-i; từ mạng."
 
+#. Tag: para
 #: installation-howto.xml:178
 #, no-c-format
-#. Tag: para
 msgid ""
 "The easiest thing to set up is probably PXE netbooting. Untar the file "
 "<filename>netboot/pxeboot.tar.gz</filename> into <filename>/var/lib/"
@@ -357,24 +346,15 @@ msgstr ""
 "khách, và nếu có may, mọi điều nên đơn giản hoạt động được. Để tìm chỉ dẫn "
 "chi tiết, xem <xref linkend=\"install-tftp\"/>."
 
+#. Tag: title
 #: installation-howto.xml:192
 #, no-c-format
-#. Tag: title
 msgid "Booting from hard disk"
 msgstr "Khởi động từ đĩa cứng"
 
+#. Tag: para
 #: installation-howto.xml:193
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "It's possible to boot the installer using no removable media, but just an "
-#| "existing hard disk, which can have a different OS on it. Download "
-#| "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-#| "filename>, and a Debian CD image to the top-level directory of the hard "
-#| "disk. Make sure that the CD image has a filename ending in <literal>.iso</"
-#| "literal>. Now it's just a matter of booting linux with the initrd. "
-#| "<phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to "
-#| "do it. </phrase>"
 msgid ""
 "It's possible to boot the installer using no removable media, but just an "
 "existing hard disk, which can have a different OS on it. Download "
@@ -385,18 +365,23 @@ msgid ""
 "arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to do it. </"
 "phrase>"
 msgstr ""
-"Chỉ có một đĩa cứng đã có (không dùng vật chứa rời nào), ngay cả đĩa cứng đã có hệ điều hành, thì cũng có thể khởi động trình cài đặt. Tải về hai tập tin <filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</filename>, và một ảnh đĩa CD &debian; vào thư mục cấp đầu của đĩa cứng đó. Kiểm tra lại ảnh đĩa CD có tên tập tin kết thúc bằng <literal>.iso</literal>. Sau "
-"đó, đơn giản cần khởi động Linux bằng initrd. <phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> diễn tả một phương pháp. </phrase>"
+"Chỉ có một đĩa cứng đã có (không dùng vật chứa rời nào), ngay cả đĩa cứng đã "
+"có hệ điều hành, thì cũng có thể khởi động trình cài đặt. Tải về hai tập tin "
+"<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
+"filename>, và một ảnh đĩa CD &debian; vào thư mục cấp đầu của đĩa cứng đó. "
+"Kiểm tra lại ảnh đĩa CD có tên tập tin kết thúc bằng <literal>.iso</"
+"literal>. Sau đó, đơn giản cần khởi động Linux bằng initrd. <phrase arch="
+"\"x86\"> <xref linkend=\"boot-initrd\"/> diễn tả một phương pháp. </phrase>"
 
+#. Tag: title
 #: installation-howto.xml:210
 #, no-c-format
-#. Tag: title
 msgid "Installation"
 msgstr "Cài đặt"
 
+#. Tag: para
 #: installation-howto.xml:211
 #, no-c-format
-#. Tag: para
 msgid ""
 "Once the installer starts, you will be greeted with an initial screen. Press "
 "&enterkey; to boot, or read the instructions for other boot methods and "
@@ -406,9 +391,9 @@ msgstr ""
 "&enterkey; để khởi động, hoặc đọc các chỉ dẫn về những phương pháp khởi động "
 "và tham số khác (xem <xref linkend=\"boot-parms\"/>). "
 
+#. Tag: para
 #: installation-howto.xml:217
 #, no-c-format
-#. Tag: para
 msgid ""
 "After a while you will be asked to select your language. Use the arrow keys "
 "to pick a language and press &enterkey; to continue. Next you'll be asked to "
@@ -422,9 +407,9 @@ msgstr ""
 "Nếu chỗ bạn không nằm trong danh sách ngắn, có sẵn một danh sách mọi quốc "
 "gia trên khắp thế giới."
 
+#. Tag: para
 #: installation-howto.xml:225
 #, no-c-format
-#. Tag: para
 msgid ""
 "You may be asked to confirm your keyboard layout. Choose the default unless "
 "you know better."
@@ -432,9 +417,9 @@ msgstr ""
 "Có lẽ bạn sẽ được nhắc xác nhận bố trí bàn phím của mình. Hãy chọn bố trí "
 "bàn phím thích hợp, hoặc chọn điều mặc định nếu bạn chưa chắc."
 
+#. Tag: para
 #: installation-howto.xml:230
 #, no-c-format
-#. Tag: para
 msgid ""
 "Now sit back while debian-installer detects some of your hardware, and loads "
 "the rest of itself from CD, floppy, USB, etc."
@@ -442,9 +427,9 @@ msgstr ""
 "Sau đó, bạn có thể nghỉ trong khi trình cài đặt Debian phát hiện một số phần "
 "cứng của bạn, và tải phần còn lại của nó từ đĩa CD, đĩa mềm, USB v.v."
 
+#. Tag: para
 #: installation-howto.xml:235
 #, no-c-format
-#. Tag: para
 msgid ""
 "Next the installer will try to detect your network hardware and set up "
 "networking by DHCP. If you are not on a network or do not have DHCP, you "
@@ -454,9 +439,9 @@ msgstr ""
 "lập thao tác chạy mạng bằng DHCP. Nếu bạn chưa lên mạng, hoặc không có khả "
 "năng DHCP, bạn sẽ có dịp tự cấu hình mạng."
 
+#. Tag: para
 #: installation-howto.xml:241
 #, no-c-format
-#. Tag: para
 msgid ""
 "The next step is setting up your clock and time zone. The installer will try "
 "to contact a time server on the Internet to ensure the clock is set "
@@ -468,9 +453,9 @@ msgstr ""
 "đúng. Múi giờ dựa vào quốc gia được chọn ở một bước trước thì tiến trình cài "
 "đặt sẽ chỉ nhắc bạn chọn thêm nếu quốc gia có nhiều miền thời gian."
 
+#. Tag: para
 #: installation-howto.xml:248
 #, no-c-format
-#. Tag: para
 msgid ""
 "Now it is time to partition your disks. First you will be given the "
 "opportunity to automatically partition either an entire drive, or available "
@@ -484,15 +469,9 @@ msgstr ""
 "dùng mới hoặc người nào vội vàng. Nếu bạn không muốn tự động phân vùng, hãy "
 "chọn mục <guimenuitem>Bằng tay</guimenuitem> trong trình đơn."
 
+#. Tag: para
 #: installation-howto.xml:256
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you have an existing DOS or Windows partition that you want to "
-#| "preserve, be very careful with automatic partitioning. If you choose "
-#| "manual partitioning, you can use the installer to resize existing FAT or "
-#| "NTFS partitions to create room for the Debian install: simply select the "
-#| "partition and specify its new size."
 msgid ""
 "If you have an existing DOS or Windows partition that you want to preserve, "
 "be very careful with automatic partitioning. If you choose manual "
@@ -500,11 +479,15 @@ msgid ""
 "partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
-"Nếu bạn muốn bảo tồn một phân vùng loại DOS hay Windows đã có, hãy rất cẩn thận khi tự động khởi động. Nếu bạn chọn phân vùng bằng tay, có thể sử dụng trình cài đặt để thay đổi kích cỡ của phân vùng FAT hay NTFS tồn tại để tạo đủ sức chứa cho bản cài đặt &debian;: đơn giản chọn phân vùng đó rồi ghi rõ kích cỡ mới cho nó."
+"Nếu bạn muốn bảo tồn một phân vùng loại DOS hay Windows đã có, hãy rất cẩn "
+"thận khi tự động khởi động. Nếu bạn chọn phân vùng bằng tay, có thể sử dụng "
+"trình cài đặt để thay đổi kích cỡ của phân vùng FAT hay NTFS tồn tại để tạo "
+"đủ sức chứa cho bản cài đặt &debian;: đơn giản chọn phân vùng đó rồi ghi rõ "
+"kích cỡ mới cho nó."
 
+#. Tag: para
 #: installation-howto.xml:263
 #, no-c-format
-#. Tag: para
 msgid ""
 "On the next screen you will see your partition table, how the partitions "
 "will be formatted, and where they will be mounted. Select a partition to "
@@ -526,9 +509,9 @@ msgstr ""
 "phân vùng như thế nào, xem <xref linkend=\"di-partition\"/>; phụ lục <xref "
 "linkend=\"partitioning\"/> chứa thông tin chung hơn về thao tác phân vùng."
 
+#. Tag: para
 #: installation-howto.xml:276
 #, no-c-format
-#. Tag: para
 msgid ""
 "Now &d-i; formats your partitions and starts to install the base system, "
 "which can take a while. That is followed by installing a kernel."
@@ -536,9 +519,9 @@ msgstr ""
 "Lúc này, &d-i; định dạng các phân vùng của bạn, rồi bắt đầu cài đặt hệ thống "
 "cơ bản, mà có thể hơi lâu. Sau đó, hạt nhân sẽ được cài đặt."
 
+#. Tag: para
 #: installation-howto.xml:281
 #, no-c-format
-#. Tag: para
 msgid ""
 "The base system that was installed earlier is a working, but very minimal "
 "installation. To make the system more functional the next step allows you to "
@@ -559,9 +542,9 @@ msgstr ""
 "<quote>Màn hình nền</quote> nếu bạn muốn sử dụng môi trường màn hình nền đồ "
 "họa (v.d. GNOME hay KDE). Xem thêm phần <xref linkend=\"pkgsel\"/>."
 
+#. Tag: para
 #: installation-howto.xml:293
 #, no-c-format
-#. Tag: para
 msgid ""
 "Installation of the base system is followed by setting up user accounts. By "
 "default you will need to provide a password for the <quote>root</quote> "
@@ -573,9 +556,9 @@ msgstr ""
 "khoản <quote>root</quote> (quản trị), và đủ thông tin để tạo một tài khoản "
 "người dùng tiêu chuẩn."
 
+#. Tag: para
 #: installation-howto.xml:300
 #, no-c-format
-#. Tag: para
 msgid ""
 "The last step is to install a boot loader. If the installer detects other "
 "operating systems on your computer, it will add them to the boot menu and "
@@ -591,9 +574,9 @@ msgstr ""
 "cứng thứ nhất, mà thường là sự chọn tốt. Bạn sẽ có dịp bỏ qua sự chọn đó và "
 "cài đặt GRUB vào nơi khác. </phrase>"
 
+#. Tag: para
 #: installation-howto.xml:310
 #, no-c-format
-#. Tag: para
 msgid ""
 "&d-i; will now tell you that the installation has finished. Remove the cdrom "
 "or other boot media and hit &enterkey; to reboot your machine. It should "
@@ -605,9 +588,9 @@ msgstr ""
 "máy tính. Nó nên khởi động vào hệ thống mới cài đặt, và cho phép bạn đăng "
 "nhập. (Xem thêm phần <xref linkend=\"boot-new\"/>.)"
 
+#. Tag: para
 #: installation-howto.xml:317
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you need more information on the install process, see <xref linkend=\"d-i-"
 "intro\"/>."
@@ -615,15 +598,15 @@ msgstr ""
 "Nếu bạn muốn tìm thông tin thêm về tiến trình cài đặt, xem <xref linkend=\"d-"
 "i-intro\"/>."
 
+#. Tag: title
 #: installation-howto.xml:326
 #, no-c-format
-#. Tag: title
 msgid "Send us an installation report"
 msgstr "Gởi báo cáo cài đặt cho chúng tôi"
 
+#. Tag: para
 #: installation-howto.xml:327
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you successfully managed an installation with &d-i;, please take time to "
 "provide us with a report. The simplest way to do so is to install the "
@@ -638,9 +621,9 @@ msgstr ""
 "\"mail-outgoing\"/>, rồi chạy lệnh <command>reportbug installation-reports</"
 "command>."
 
+#. Tag: para
 #: installation-howto.xml:337
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you did not complete the install, you probably found a bug in debian-"
 "installer. To improve the installer it is necessary that we know about them, "
@@ -653,22 +636,19 @@ msgstr ""
 "báo cáo nhé. Bạn có thể thông báo lỗi trong báo cáo cài đặt; nếu tiến trình "
 "cài đặt thất bại hoàn toàn, xem <xref linkend=\"problem-report\"/>."
 
+#. Tag: title
 #: installation-howto.xml:349
 #, no-c-format
-#. Tag: title
 msgid "And finally&hellip;"
 msgstr "Vậy cuối cùng&hellip;"
 
+#. Tag: para
 #: installation-howto.xml:350
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "We hope that your Debian installation is pleasant and that you find "
-#| "Debian useful. You might want to read <xref linkend=\"post-install\"/>."
 msgid ""
 "We hope that your &debian; installation is pleasant and that you find "
 "&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
 msgstr ""
 "Chúng tôi hy vọng tiến trình cài đặt &debian; chạy được cho bạn, cũng là bạn "
-"tìm thấy &debian; là hữu hiệu. Đề nghị bạn đọc <xref linkend=\"post-install\"/"
-">."
+"tìm thấy &debian; là hữu hiệu. Đề nghị bạn đọc <xref linkend=\"post-install"
+"\"/>."
diff --git a/po/vi/partitioning.po b/po/vi/partitioning.po
index 84395ce86..1e0d791c0 100644
--- a/po/vi/partitioning.po
+++ b/po/vi/partitioning.po
@@ -17,23 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: partitioning.xml:5
 #, no-c-format
-#. Tag: title
-#| msgid "Partitioning for Debian"
 msgid "Partitioning for &debian;"
 msgstr "Phân vùng cho &debian;"
 
+#. Tag: title
 #: partitioning.xml:13
 #, no-c-format
-#. Tag: title
-#| msgid "Deciding on Debian Partitions and Sizes"
 msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Chọn phân vùng &debian;, lập kích cỡ phân vùng"
 
+#. Tag: para
 #: partitioning.xml:14
 #, no-c-format
-#. Tag: para
 msgid ""
 "At a bare minimum, GNU/&arch-kernel; needs one partition for itself. You can "
 "have a single partition containing the entire operating system, "
@@ -54,9 +52,9 @@ msgstr ""
 "đó hơn. Có thể ép buộc &arch-kernel; sử dụng tập tin chuẩn là chỗ trao đổi, "
 "nhưng mà phương pháp đó không khuyến khích."
 
+#. Tag: para
 #: partitioning.xml:26
 #, no-c-format
-#. Tag: para
 msgid ""
 "Most people choose to give GNU/&arch-kernel; more than the minimum number of "
 "partitions, however. There are two reasons you might want to break up the "
@@ -81,9 +79,9 @@ msgstr ""
 "GNU/&arch-kernel; trên phân vùng riêng này, để sửa chữa hệ thống. Phân vùng "
 "gốc này có thể tránh trường hợp mà bạn cần phải cài đặt lại toàn bộ hệ thống."
 
+#. Tag: para
 #: partitioning.xml:40
 #, no-c-format
-#. Tag: para
 msgid ""
 "The second reason is generally more important in a business setting, but it "
 "really depends on your use of the machine. For example, a mail server "
@@ -98,9 +96,9 @@ msgstr ""
 "phục vụ thư tín, phần lớn của hệ thống còn lại hoạt động được thậm chí nếu "
 "nó bị rác tràn."
 
+#. Tag: para
 #: partitioning.xml:48
 #, no-c-format
-#. Tag: para
 msgid ""
 "The only real drawback to using more partitions is that it is often "
 "difficult to know in advance what your needs will be. If you make a "
@@ -117,22 +115,15 @@ msgstr ""
 "lớn, bạn sẽ hoài phí sức chứa có thể được tận dụng trên vùng khác. Hiện thời "
 "sức chứa trên đĩa là rẻ, nhưng tại sao xài phí tiền?"
 
+#. Tag: title
 #: partitioning.xml:67
 #, no-c-format
-#. Tag: title
 msgid "The Directory Tree"
 msgstr "Cây thư mục"
 
+#. Tag: para
 #: partitioning.xml:68
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
-#| "Hierarchy Standard</ulink> for directory and file naming. This standard "
-#| "allows users and software programs to predict the location of files and "
-#| "directories. The root level directory is represented simply by the slash "
-#| "<filename>/</filename>. At the root level, all Debian systems include "
-#| "these directories:"
 msgid ""
 "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
 "Hierarchy Standard</ulink> for directory and file naming. This standard "
@@ -147,225 +138,225 @@ msgstr ""
 "và thư mục. Thư mục cấp gốc được đại diện đơn giản bằng dấu xuyệc <filename>/"
 "</filename>. Trên cấp gốc, mọi hệ thống &debian; chứa những thư mục này:"
 
+#. Tag: entry
 #: partitioning.xml:82
 #, no-c-format
-#. Tag: entry
 msgid "Directory"
 msgstr "Thư mục"
 
+#. Tag: entry
 #: partitioning.xml:82
 #, no-c-format
-#. Tag: entry
 msgid "Content"
 msgstr "Nội dung"
 
+#. Tag: filename
 #: partitioning.xml:88
 #, no-c-format
-#. Tag: filename
 msgid "<filename>bin</filename>"
 msgstr "<filename>bin</filename>"
 
+#. Tag: entry
 #: partitioning.xml:89
 #, no-c-format
-#. Tag: entry
 msgid "Essential command binaries"
 msgstr "Tập tin nhị phân lệnh chủ yếu"
 
+#. Tag: filename
 #: partitioning.xml:91
 #, no-c-format
-#. Tag: filename
 msgid "boot"
 msgstr "<filename>boot</filename>"
 
+#. Tag: entry
 #: partitioning.xml:92
 #, no-c-format
-#. Tag: entry
 msgid "Static files of the boot loader"
 msgstr "Tập tin tĩnh của bộ nạp khởi động"
 
+#. Tag: filename
 #: partitioning.xml:94
 #, no-c-format
-#. Tag: filename
 msgid "<filename>dev</filename>"
 msgstr "<filename>dev</filename>"
 
+#. Tag: entry
 #: partitioning.xml:95
 #, no-c-format
-#. Tag: entry
 msgid "Device files"
 msgstr "Tập tin thiết bị"
 
+#. Tag: filename
 #: partitioning.xml:97
 #, no-c-format
-#. Tag: filename
 msgid "<filename>etc</filename>"
 msgstr "<filename>etc</filename>"
 
+#. Tag: entry
 #: partitioning.xml:98
 #, no-c-format
-#. Tag: entry
 msgid "Host-specific system configuration"
 msgstr "Cấu hình hệ thống đặc trưng cho máy"
 
+#. Tag: filename
 #: partitioning.xml:100
 #, no-c-format
-#. Tag: filename
 msgid "home"
 msgstr "<filename>home</filename>"
 
+#. Tag: entry
 #: partitioning.xml:101
 #, no-c-format
-#. Tag: entry
 msgid "User home directories"
 msgstr "Thư mục chính của người dùng"
 
+#. Tag: filename
 #: partitioning.xml:103
 #, no-c-format
-#. Tag: filename
 msgid "<filename>lib</filename>"
 msgstr "<filename>lib</filename>"
 
+#. Tag: entry
 #: partitioning.xml:104
 #, no-c-format
-#. Tag: entry
 msgid "Essential shared libraries and kernel modules"
 msgstr "Thư viện dùng chung và mô-đun hạt nhân chủ yếu"
 
+#. Tag: filename
 #: partitioning.xml:106
 #, no-c-format
-#. Tag: filename
 msgid "media"
 msgstr "<filename>media</filename>"
 
+#. Tag: entry
 #: partitioning.xml:107
 #, no-c-format
-#. Tag: entry
 msgid "Contains mount points for replaceable media"
 msgstr "Chứa điểm lắp cho vật chứa có thể thay thế"
 
+#. Tag: filename
 #: partitioning.xml:109
 #, no-c-format
-#. Tag: filename
 msgid "<filename>mnt</filename>"
 msgstr "<filename>mnt</filename>"
 
+#. Tag: entry
 #: partitioning.xml:110
 #, no-c-format
-#. Tag: entry
 msgid "Mount point for mounting a file system temporarily"
 msgstr "Điểm lắp để gắn kết tạm thời hệ thống tập tin"
 
+#. Tag: filename
 #: partitioning.xml:112
 #, no-c-format
-#. Tag: filename
 msgid "proc"
 msgstr "<filename>proc</filename>"
 
+#. Tag: entry
 #: partitioning.xml:113
 #, no-c-format
-#. Tag: entry
 msgid "Virtual directory for system information (2.4 and 2.6 kernels)"
 msgstr "Thư mục ảo cho thông tin hệ thống (hạt nhân 2.4 và 2.6)"
 
+#. Tag: filename
 #: partitioning.xml:115
 #, no-c-format
-#. Tag: filename
 msgid "root"
 msgstr "<filename>root</filename>"
 
+#. Tag: entry
 #: partitioning.xml:116
 #, no-c-format
-#. Tag: entry
 msgid "Home directory for the root user"
 msgstr "Thư mục chính của người dùng chủ"
 
+#. Tag: filename
 #: partitioning.xml:118
 #, no-c-format
-#. Tag: filename
 msgid "sbin"
 msgstr "<filename>sbin</filename>"
 
+#. Tag: entry
 #: partitioning.xml:119
 #, no-c-format
-#. Tag: entry
 msgid "Essential system binaries"
 msgstr "Tập tin nhị phân hệ thống chủ yếu"
 
+#. Tag: filename
 #: partitioning.xml:121
 #, no-c-format
-#. Tag: filename
 msgid "<filename>sys</filename>"
 msgstr "<filename>sys</filename>"
 
+#. Tag: entry
 #: partitioning.xml:122
 #, no-c-format
-#. Tag: entry
 msgid "Virtual directory for system information (2.6 kernels)"
 msgstr "Thư mục ảo cho thông tin hệ thống (hạt nhân 2.6)"
 
+#. Tag: filename
 #: partitioning.xml:124
 #, no-c-format
-#. Tag: filename
 msgid "<filename>tmp</filename>"
 msgstr "<filename>tmp</filename>"
 
+#. Tag: entry
 #: partitioning.xml:125
 #, no-c-format
-#. Tag: entry
 msgid "Temporary files"
 msgstr "Tập tin tạm thời"
 
+#. Tag: filename
 #: partitioning.xml:127
 #, no-c-format
-#. Tag: filename
 msgid "<filename>usr</filename>"
 msgstr "<filename>usr</filename>"
 
+#. Tag: entry
 #: partitioning.xml:128
 #, no-c-format
-#. Tag: entry
 msgid "Secondary hierarchy"
 msgstr "Phân cấp phụ"
 
+#. Tag: filename
 #: partitioning.xml:130
 #, no-c-format
-#. Tag: filename
 msgid "<filename>var</filename>"
 msgstr "<filename>var</filename>"
 
+#. Tag: entry
 #: partitioning.xml:131
 #, no-c-format
-#. Tag: entry
 msgid "Variable data"
 msgstr "Dữ liệu có thể thay đổi"
 
+#. Tag: filename
 #: partitioning.xml:133
 #, no-c-format
-#. Tag: filename
 msgid "<filename>srv</filename>"
 msgstr "<filename>srv</filename>"
 
+#. Tag: entry
 #: partitioning.xml:134
 #, no-c-format
-#. Tag: entry
 msgid "Data for services provided by the system"
 msgstr "Dữ liệu cho dịch vụ do hệ thống cung cấp"
 
+#. Tag: filename
 #: partitioning.xml:136
 #, no-c-format
-#. Tag: filename
 msgid "<filename>opt</filename>"
 msgstr "<filename>opt</filename>"
 
+#. Tag: entry
 #: partitioning.xml:137
 #, no-c-format
-#. Tag: entry
 msgid "Add-on application software packages"
 msgstr "Gói phần mềm ứng dụng phụ trợ"
 
+#. Tag: para
 #: partitioning.xml:142
 #, no-c-format
-#. Tag: para
 msgid ""
 "The following is a list of important considerations regarding directories "
 "and partitions. Note that disk usage varies widely given system "
@@ -377,9 +368,9 @@ msgstr ""
 "thống và mẫu sử dụng riêng. Những sự giới thiệu này là hướng dẫn chung và "
 "cung cấp một điểm bắt đầu khi tạo phân vùng."
 
+#. Tag: para
 #: partitioning.xml:152
 #, no-c-format
-#. Tag: para
 msgid ""
 "The root partition <filename>/</filename> must always physically contain "
 "<filename>/etc</filename>, <filename>/bin</filename>, <filename>/sbin</"
@@ -393,9 +384,9 @@ msgstr ""
 "thì bạn không thể khởi động được. Thường cần thiết vùng 150&ndash;250 MB "
 "dành cho phân vùng gốc."
 
+#. Tag: para
 #: partitioning.xml:161
 #, no-c-format
-#. Tag: para
 msgid ""
 "<filename>/usr</filename>: contains all user programs (<filename>/usr/bin</"
 "filename>), libraries (<filename>/usr/lib</filename>), documentation "
@@ -413,22 +404,9 @@ msgstr ""
 "kiểu gói phần mềm cần cài đặt. Bản cài đặt chạy trên máy trạm hay máy phục "
 "vụ nên tính rộng lượng đến 4-6 GB."
 
+#. Tag: para
 #: partitioning.xml:174
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "<filename>/var</filename>: variable data like news articles, e-mails, web "
-#| "sites, databases, the packaging system cache, etc. will be placed under "
-#| "this directory. The size of this directory depends greatly on the usage "
-#| "of your system, but for most people will be dictated by the package "
-#| "management tool's overhead. If you are going to do a full installation of "
-#| "just about everything Debian has to offer, all in one session, setting "
-#| "aside 2 or 3 GB of space for <filename>/var</filename> should be "
-#| "sufficient. If you are going to install in pieces (that is to say, "
-#| "install services and utilities, followed by text stuff, then X, ...), you "
-#| "can get away with 300&ndash;500 MB. If hard drive space is at a premium "
-#| "and you don't plan on doing major system updates, you can get by with as "
-#| "little as 30 or 40 MB."
 msgid ""
 "<filename>/var</filename>: variable data like news articles, e-mails, web "
 "sites, databases, the packaging system cache, etc. will be placed under this "
@@ -447,17 +425,17 @@ msgstr ""
 "mềm, nằm dưới thư mục này. Kích cỡ của thư mục này phụ thuộc nhiều vào cách "
 "sử dụng hệ thống, nhưng thường được điều khiển bởi những tài nguyên cần "
 "thiết cho công cụ quản lý gói. Nếu bạn định chạy tiến trình cài đặt đầy đủ, "
-"gồm gần mọi thứ do &debian; cung cấp, trong cùng một phiên chạy, cấp phát 2-3 "
-"GB sức chứa riêng cho thư mục <filename>/var</filename> nên là đủ. Còn nếu "
-"bạn định chạy tiến trình cài đặt từ từ (tức là cài đặt các dịch vụ và tiện "
-"ích, rồi các điều nhập thô, rồi X v.v.), bạn có thể làm trôi chảy bằng cách "
-"gán 300&ndash;500 MB riêng. Nếu bạn không có nhiều sức chứa còn rảnh trên "
-"đĩa, cũng không định chạy tiến trình cập nhật hệ thống quan trọng, 30 hay 40 "
-"MB có thể là đủ."
+"gồm gần mọi thứ do &debian; cung cấp, trong cùng một phiên chạy, cấp phát "
+"2-3 GB sức chứa riêng cho thư mục <filename>/var</filename> nên là đủ. Còn "
+"nếu bạn định chạy tiến trình cài đặt từ từ (tức là cài đặt các dịch vụ và "
+"tiện ích, rồi các điều nhập thô, rồi X v.v.), bạn có thể làm trôi chảy bằng "
+"cách gán 300&ndash;500 MB riêng. Nếu bạn không có nhiều sức chứa còn rảnh "
+"trên đĩa, cũng không định chạy tiến trình cập nhật hệ thống quan trọng, 30 "
+"hay 40 MB có thể là đủ."
 
+#. Tag: para
 #: partitioning.xml:190
 #, no-c-format
-#. Tag: para
 msgid ""
 "<filename>/tmp</filename>: temporary data created by programs will most "
 "likely go in this directory. 40&ndash;100MB should usually be enough. Some "
@@ -473,9 +451,9 @@ msgstr ""
 "tạm thời tập tin ảnh. Nếu bạn định sử dụng ứng dụng như vậy, bạn nên điều "
 "chỉnh sức chứa sẵn sàng trong thư mục <filename>/tmp</filename> cho phù hợp."
 
+#. Tag: para
 #: partitioning.xml:201
 #, no-c-format
-#. Tag: para
 msgid ""
 "<filename>/home</filename>: every user will put his personal data into a "
 "subdirectory of this directory. Its size depends on how many users will be "
@@ -493,22 +471,15 @@ msgstr ""
 "dành riêng rất nhiều sức chứa hơn nếu bạn định lưu nhiều tập tin đa phương "
 "tiện (ảnh, âm nhạc, phim) vào thư mục chính này."
 
+#. Tag: title
 #: partitioning.xml:222
 #, no-c-format
-#. Tag: title
 msgid "Recommended Partitioning Scheme"
 msgstr "Bố trí phân vùng khuyến khích"
 
+#. Tag: para
 #: partitioning.xml:223
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For new users, personal Debian boxes, home systems, and other single-user "
-#| "setups, a single <filename>/</filename> partition (plus swap) is probably "
-#| "the easiest, simplest way to go. However, if your partition is larger "
-#| "than around 6GB, choose ext3 as your partition type. Ext2 partitions need "
-#| "periodic file system integrity checking, and this can cause delays during "
-#| "booting when the partition is large."
 msgid ""
 "For new users, personal &debian; boxes, home systems, and other single-user "
 "setups, a single <filename>/</filename> partition (plus swap) is probably "
@@ -525,9 +496,9 @@ msgstr ""
 "nguyên vẹn hệ thống tập tin) mà có thể gây ra tiến trình khởi động bị hoãn "
 "trên phân vùng lớn."
 
+#. Tag: para
 #: partitioning.xml:232
 #, no-c-format
-#. Tag: para
 msgid ""
 "For multi-user systems or systems with lots of disk space, it's best to put "
 "<filename>/usr</filename>, <filename>/var</filename>, <filename>/tmp</"
@@ -539,19 +510,9 @@ msgstr ""
 "filename>, <filename>/tmp</filename>, và <filename>/home</filename> trên một "
 "phân vùng riêng, khác với phân vùng <filename>/</filename> (5 phân vùng)."
 
+#. Tag: para
 #: partitioning.xml:240
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "You might need a separate <filename>/usr/local</filename> partition if "
-#| "you plan to install many programs that are not part of the Debian "
-#| "distribution. If your machine will be a mail server, you might need to "
-#| "make <filename>/var/mail</filename> a separate partition. Often, putting "
-#| "<filename>/tmp</filename> on its own partition, for instance "
-#| "20&ndash;50MB, is a good idea. If you are setting up a server with lots "
-#| "of user accounts, it's generally good to have a separate, large "
-#| "<filename>/home</filename> partition. In general, the partitioning "
-#| "situation varies from computer to computer depending on its uses."
 msgid ""
 "You might need a separate <filename>/usr/local</filename> partition if you "
 "plan to install many programs that are not part of the &debian; "
@@ -563,11 +524,19 @@ msgid ""
 "partition. In general, the partitioning situation varies from computer to "
 "computer depending on its uses."
 msgstr ""
-"Có thể là yêu cầu một phân vùng <filename>/usr/local</filename> riêng nếu bạn định cài đặt nhiều chương trình không thuộc về bản phát hành &debian;. Nếu máy tính của bạn sẽ chạy trình phục vụ thư tín, bạn có thể cần phải lập thư mục <filename>/var/mail</filename> là một phân vùng riêng. Bình thường, việc để thư mục <filename>/tmp</filename> trên một phân vùng riêng (v.d. 20-50 MB) là một ý kiến tốt. Nếu bạn đang thiết lập một máy phục vụ có nhiều tài khoản người dùng, thường có ích khi tạo một phân vùng <filename>/home</filename> lớn riêng. Nói chung, trường hợp cấu hình phân vùng thay đổi từ máy tính này đến máy tính khác, phụ thuộc vào cách sử dụng."
+"Có thể là yêu cầu một phân vùng <filename>/usr/local</filename> riêng nếu "
+"bạn định cài đặt nhiều chương trình không thuộc về bản phát hành &debian;. "
+"Nếu máy tính của bạn sẽ chạy trình phục vụ thư tín, bạn có thể cần phải lập "
+"thư mục <filename>/var/mail</filename> là một phân vùng riêng. Bình thường, "
+"việc để thư mục <filename>/tmp</filename> trên một phân vùng riêng (v.d. "
+"20-50 MB) là một ý kiến tốt. Nếu bạn đang thiết lập một máy phục vụ có nhiều "
+"tài khoản người dùng, thường có ích khi tạo một phân vùng <filename>/home</"
+"filename> lớn riêng. Nói chung, trường hợp cấu hình phân vùng thay đổi từ "
+"máy tính này đến máy tính khác, phụ thuộc vào cách sử dụng."
 
+#. Tag: para
 #: partitioning.xml:252
 #, no-c-format
-#. Tag: para
 msgid ""
 "For very complex systems, you should see the <ulink url=\"&url-multidisk-"
 "howto;\"> Multi Disk HOWTO</ulink>. This contains in-depth information, "
@@ -578,9 +547,9 @@ msgstr ""
 "chi tiết, phần lớn có ích cho nhà cung cấp dịch vụ Mạng và người thiết lập "
 "máy phục vụ."
 
+#. Tag: para
 #: partitioning.xml:259
 #, no-c-format
-#. Tag: para
 msgid ""
 "With respect to the issue of swap partition size, there are many views. One "
 "rule of thumb which works well is to use as much swap as you have system "
@@ -596,9 +565,9 @@ msgstr ""
 "thời trên máy tính có chỉ 256 MB bộ nhớ, bạn có thể cần thiết 1 GB vùng trao "
 "đổi."
 
+#. Tag: para
 #: partitioning.xml:268
 #, no-c-format
-#. Tag: para
 msgid ""
 "On 32-bit architectures (i386, m68k, 32-bit SPARC, and PowerPC), the maximum "
 "size of a swap partition is 2GB. That should be enough for nearly any "
@@ -616,9 +585,9 @@ msgstr ""
 "nhau. Hạt nhân sẽ làm cho cân xứng cách sử dụng vùng trao đổi giữa nhiều "
 "phân vùng trao đổi, làm hiệu suất tốt hơn."
 
+#. Tag: para
 #: partitioning.xml:278
 #, no-c-format
-#. Tag: para
 msgid ""
 "As an example, an older home machine might have 32MB of RAM and a 1.7GB IDE "
 "drive on <filename>/dev/hda</filename>. There might be a 500MB partition for "
@@ -632,9 +601,9 @@ msgstr ""
 "<filename>/dev/hda3</filename> và khoảng 1.2 GB phân vùng Linux trên "
 "<filename>/dev/hda2</filename>."
 
+#. Tag: para
 #: partitioning.xml:287
 #, no-c-format
-#. Tag: para
 msgid ""
 "For an idea of the space taken by tasks you might be interested in adding "
 "after your system installation is complete, check <xref linkend=\"tasksel-"
@@ -643,15 +612,15 @@ msgstr ""
 "Để tìm biết sức chứa được chiếm bởi công việc bạn có thể muốn thêm sau khi "
 "cài đặt xong hệ thống, xem <xref linkend=\"tasksel-size-list\"/>."
 
+#. Tag: title
 #: partitioning.xml:303
 #, no-c-format
-#. Tag: title
 msgid "Device Names in Linux"
 msgstr "Tên thiết bị dưới Linux"
 
+#. Tag: para
 #: partitioning.xml:304
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linux disks and partition names may be different from other operating "
 "systems. You need to know the names that Linux uses when you create and "
@@ -661,21 +630,21 @@ msgstr ""
 "phải biết những tên bị Linux dùng khi bạn tạo và gắn kết phân vùng. Đây là "
 "lược đồ đặt tên cơ bản:"
 
+#. Tag: para
 #: partitioning.xml:312
 #, no-c-format
-#. Tag: para
 msgid "The first floppy drive is named <filename>/dev/fd0</filename>."
 msgstr "Đĩa mềm thứ nhất có tên <filename>/dev/fd0</filename>."
 
+#. Tag: para
 #: partitioning.xml:317
 #, no-c-format
-#. Tag: para
 msgid "The second floppy drive is named <filename>/dev/fd1</filename>."
 msgstr "Đĩa mềm thứ hai có tên <filename>/dev/fd1</filename>."
 
+#. Tag: para
 #: partitioning.xml:322
 #, no-c-format
-#. Tag: para
 msgid ""
 "The first SCSI disk (SCSI ID address-wise) is named <filename>/dev/sda</"
 "filename>."
@@ -683,18 +652,18 @@ msgstr ""
 "Đĩa SCSI thứ nhất (theo địa chỉ SCSI ID) có tên <filename>/dev/sda</"
 "filename>."
 
+#. Tag: para
 #: partitioning.xml:328
 #, no-c-format
-#. Tag: para
 msgid ""
 "The second SCSI disk (address-wise) is named <filename>/dev/sdb</filename>, "
 "and so on."
 msgstr ""
 "Đĩa SCSI thứ hai (theo địa chỉ) có tên <filename>/dev/sdb</filename>, v.v."
 
+#. Tag: para
 #: partitioning.xml:334
 #, no-c-format
-#. Tag: para
 msgid ""
 "The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also known as "
 "<filename>/dev/sr0</filename>."
@@ -702,27 +671,27 @@ msgstr ""
 "Đĩa CD-ROM SCSI thứ nhất có tên <filename>/dev/scd0</filename>, cũng được "
 "biết như là <filename>/dev/sr0</filename>."
 
+#. Tag: para
 #: partitioning.xml:340
 #, no-c-format
-#. Tag: para
 msgid ""
 "The master disk on IDE primary controller is named <filename>/dev/hda</"
 "filename>."
 msgstr ""
 "Đĩa cái trên bộ điều khiển chính IDE có tên <filename>/dev/hda</filename>."
 
+#. Tag: para
 #: partitioning.xml:346
 #, no-c-format
-#. Tag: para
 msgid ""
 "The slave disk on IDE primary controller is named <filename>/dev/hdb</"
 "filename>."
 msgstr ""
 "Đĩa phụ trên bộ điều khiển chính IDE có tên <filename>/dev/hdb</filename>."
 
+#. Tag: para
 #: partitioning.xml:352
 #, no-c-format
-#. Tag: para
 msgid ""
 "The master and slave disks of the secondary controller can be called "
 "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, "
@@ -734,22 +703,22 @@ msgstr ""
 "IDE mới hơn thật sự có khả năng có hai kênh, kết quả là hoạt động như hai bộ "
 "điều khiển."
 
+#. Tag: para
 #: partitioning.xml:363
 #, no-c-format
-#. Tag: para
 msgid "The first DASD device is named <filename>/dev/dasda</filename>."
 msgstr "Thiết bị DASD thứ nhất có tên <filename>/dev/dasda</filename>."
 
+#. Tag: para
 #: partitioning.xml:369
 #, no-c-format
-#. Tag: para
 msgid ""
 "The second DASD device is named <filename>/dev/dasdb</filename>, and so on."
 msgstr "Thiết bị DASD thứ hai có tên <filename>/dev/dasdb</filename>, v.v."
 
+#. Tag: para
 #: partitioning.xml:377
 #, no-c-format
-#. Tag: para
 msgid ""
 "The partitions on each disk are represented by appending a decimal number to "
 "the disk name: <filename>sda1</filename> and <filename>sda2</filename> "
@@ -761,9 +730,9 @@ msgstr ""
 "filename> đại diện phân vùng thứ nhất và thứ hai của ổ đĩa SCSI thứ nhất "
 "trên hệ thống."
 
+#. Tag: para
 #: partitioning.xml:384
 #, no-c-format
-#. Tag: para
 msgid ""
 "Here is a real-life example. Let's assume you have a system with 2 SCSI "
 "disks, one at SCSI address 2 and the other at SCSI address 4. The first disk "
@@ -781,9 +750,9 @@ msgstr ""
 "filename>. Cũng vậy với đĩa <filename>sdb</filename> và các phân vùng nằm "
 "trên nó."
 
+#. Tag: para
 #: partitioning.xml:395
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that if you have two SCSI host bus adapters (i.e., controllers), the "
 "order of the drives can get confusing. The best solution in this case is to "
@@ -795,9 +764,9 @@ msgstr ""
 "phương pháp tốt nhất là theo dõi các thông điệp khởi động, giả sử bạn biết "
 "mô hình và/hay khả năng của các ổ đĩa."
 
+#. Tag: para
 #: partitioning.xml:402
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linux represents the primary partitions as the drive name, plus the numbers "
 "1 through 4. For example, the first primary partition on the first IDE drive "
@@ -815,9 +784,9 @@ msgstr ""
 "lý, không thể được dùng riêng. Cũng vậy với đĩa SCSI, không phải chỉ kiểu "
 "IDE."
 
+#. Tag: para
 #: partitioning.xml:413
 #, no-c-format
-#. Tag: para
 msgid ""
 "Sun disk partitions allow for 8 separate partitions (or slices). The third "
 "partition is usually (and is preferred to have) the <quote>Whole Disk</"
@@ -829,9 +798,9 @@ msgstr ""
 "Phân vùng này tham chiếu đến mọi rãnh ghi của đĩa đó, và được dùng bởi bộ "
 "tải khởi động (hoặc SILO, hoặc điều của Sun)."
 
+#. Tag: para
 #: partitioning.xml:420
 #, no-c-format
-#. Tag: para
 msgid ""
 "The partitions on each disk are represented by appending a decimal number to "
 "the disk name: <filename>dasda1</filename> and <filename>dasda2</filename> "
@@ -843,21 +812,15 @@ msgstr ""
 "đại diện phân vùng thứ nhất và thứ hai của thiết bị DASD thứ nhất trên hệ "
 "thống."
 
+#. Tag: title
 #: partitioning.xml:435
 #, no-c-format
-#. Tag: title
-#| msgid "Debian Partitioning Programs"
 msgid "&debian; Partitioning Programs"
 msgstr "Chương trình tạo phân vùng &debian;"
 
+#. Tag: para
 #: partitioning.xml:436
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Several varieties of partitioning programs have been adapted by Debian "
-#| "developers to work on various types of hard disks and computer "
-#| "architectures. Following is a list of the program(s) applicable for your "
-#| "architecture."
 msgid ""
 "Several varieties of partitioning programs have been adapted by &debian; "
 "developers to work on various types of hard disks and computer "
@@ -870,20 +833,15 @@ msgstr ""
 "trúc của máy tính này."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:448
 #, no-c-format
-#. Tag: command
 msgid "partman"
 msgstr "partman"
 
+#. Tag: para
 #: partitioning.xml:449
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Recommended partitioning tool in Debian. This Swiss army knife can also "
-#| "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
-#| "(<quote>format</quote> in Windows speak)</phrase> and assign them to the "
-#| "mountpoints."
 msgid ""
 "Recommended partitioning tool in &debian;. This Swiss army knife can also "
 "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
@@ -896,21 +854,21 @@ msgstr ""
 "điều hành Windows)</phrase> và gán nó vào điểm lắp."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:460
 #, no-c-format
-#. Tag: command
 msgid "fdisk"
 msgstr "fdisk"
 
+#. Tag: para
 #: partitioning.xml:461
 #, no-c-format
-#. Tag: para
 msgid "The original Linux disk partitioner, good for gurus."
 msgstr "Bộ tạo phân vùng Linux gốc, thích hợp với người dùng rất kinh nghiệm."
 
+#. Tag: para
 #: partitioning.xml:465
 #, no-c-format
-#. Tag: para
 msgid ""
 "Be careful if you have existing FreeBSD partitions on your machine. The "
 "installation kernels include support for these partitions, but the way that "
@@ -925,22 +883,22 @@ msgstr ""
 "freebsd;\">Linux+FreeBSD HOWTO</ulink>."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:477
 #, no-c-format
-#. Tag: command
 msgid "cfdisk"
 msgstr "cfdisk"
 
+#. Tag: para
 #: partitioning.xml:478
 #, no-c-format
-#. Tag: para
 msgid "A simple-to-use, full-screen disk partitioner for the rest of us."
 msgstr ""
 "Bộ tạo phân vùng đĩa toàn màn hình dễ dàng, thích hợp với phần lớn người."
 
+#. Tag: para
 #: partitioning.xml:482
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that <command>cfdisk</command> doesn't understand FreeBSD partitions at "
 "all, and, again, device names may differ as a result."
@@ -950,54 +908,54 @@ msgstr ""
 "biệt."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:491
 #, no-c-format
-#. Tag: command
 msgid "atari-fdisk"
 msgstr "atari-fdisk"
 
+#. Tag: para
 #: partitioning.xml:492
 #, no-c-format
-#. Tag: para
 msgid "Atari-aware version of <command>fdisk</command>."
 msgstr "Phiên bản của <command>fdisk</command> thích hợp với máy tính Atari."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:500
 #, no-c-format
-#. Tag: command
 msgid "amiga-fdisk"
 msgstr "amiga-fdisk"
 
+#. Tag: para
 #: partitioning.xml:501
 #, no-c-format
-#. Tag: para
 msgid "Amiga-aware version of <command>fdisk</command>."
 msgstr "Phiên bản của <command>fdisk</command> thích hợp với máy tính Amiga."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:509
 #, no-c-format
-#. Tag: command
 msgid "mac-fdisk"
 msgstr "mac-fdisk"
 
+#. Tag: para
 #: partitioning.xml:510
 #, no-c-format
-#. Tag: para
 msgid "Mac-aware version of <command>fdisk</command>."
 msgstr "Phiên bản của <command>fdisk</command> thích hợp với máy tính Mac."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:518
 #, no-c-format
-#. Tag: command
 msgid "pmac-fdisk"
 msgstr "pmac-fdisk"
 
+#. Tag: para
 #: partitioning.xml:519
 #, no-c-format
-#. Tag: para
 msgid ""
 "PowerMac-aware version of <command>fdisk</command>, also used by BVM and "
 "Motorola VMEbus systems."
@@ -1006,15 +964,15 @@ msgstr ""
 "được dùng bởi hệ thống kiểu BVM và VMEbus Motorola."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: command
 #: partitioning.xml:528
 #, no-c-format
-#. Tag: command
 msgid "fdasd"
 msgstr "fdasd"
 
+#. Tag: para
 #: partitioning.xml:529
 #, no-c-format
-#. Tag: para
 msgid ""
 "&arch-title; version of <command>fdisk</command>; Please read the fdasd "
 "manual page or chapter 13 in <ulink url=\"http://oss.software.ibm.com/"
@@ -1027,9 +985,9 @@ msgstr ""
 "l390dd08.pdf\"> Các trình điều khiển thiết bị và lệnh cài đặt</ulink> để tìm "
 "chi tiết."
 
+#. Tag: para
 #: partitioning.xml:540
 #, no-c-format
-#. Tag: para
 msgid ""
 "One of these programs will be run by default when you select "
 "<guimenuitem>Partition disks</guimenuitem> (or similar). It may be possible "
@@ -1041,17 +999,17 @@ msgstr ""
 "dụng công cụ tạo phân vùng khác từ dòng lệnh trên VT2, nhưng không khuyên "
 "bạn làm như thế."
 
+#. Tag: para
 #: partitioning.xml:547
 #, no-c-format
-#. Tag: para
 msgid "Remember to mark your boot partition as <quote>Bootable</quote>."
 msgstr ""
 "Hãy ghi nhớ cần phải đánh dấu phân vùng khởi động như là <quote>Khởi động "
 "được</quote> (Bootable)."
 
+#. Tag: para
 #: partitioning.xml:550
 #, no-c-format
-#. Tag: para
 msgid ""
 "One key point when partitioning for Mac type disks is that the swap "
 "partition is identified by its name; it must be named <quote>swap</quote>. "
@@ -1067,19 +1025,16 @@ msgstr ""
 "\">mac-fdisk Tutorial</ulink>, mà gồm những bước cần theo nếu bạn chia sẻ "
 "đĩa với hệ điều hành MacOS."
 
-#: partitioning.xml:566
-#: partitioning.xml:590
-#: partitioning.xml:687
-#: partitioning.xml:801
-#: partitioning.xml:878
-#, no-c-format
 #. Tag: title
+#: partitioning.xml:566 partitioning.xml:590 partitioning.xml:687
+#: partitioning.xml:801 partitioning.xml:878
+#, no-c-format
 msgid "Partitioning for &arch-title;"
 msgstr "Phân vùng cho &arch-title;"
 
+#. Tag: para
 #: partitioning.xml:567
 #, no-c-format
-#. Tag: para
 msgid ""
 "PALO, the HPPA boot loader, requires a partition of type <quote>F0</quote> "
 "somewhere in the first 2GB. This is where the boot loader and an optional "
@@ -1105,17 +1060,9 @@ msgstr ""
 "(các) hát nhân Linux. <filename>/boot</filename> cần phải là đủ lớn để chứa "
 "các hạt nhân (và bản sao lưu) bạn có thể muốn tải; 25-50 MB thường là đủ."
 
+#. Tag: para
 #: partitioning.xml:591
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you have an existing other operating system such as DOS or Windows and "
-#| "you want to preserve that operating system while installing Debian, you "
-#| "may need to resize its partition to free up space for the Debian "
-#| "installation. The installer supports resizing of both FAT and NTFS "
-#| "filesystems; when you get to the installer's partitioning step, select "
-#| "the option <guimenuitem>Manual</guimenuitem> and then simply select an "
-#| "existing partition and change its size."
 msgid ""
 "If you have an existing other operating system such as DOS or Windows and "
 "you want to preserve that operating system while installing &debian;, you "
@@ -1125,12 +1072,18 @@ msgid ""
 "option <guimenuitem>Manual</guimenuitem> and then simply select an existing "
 "partition and change its size."
 msgstr ""
-"Nếu bạn có một hệ điều hành khác đã có, v.d. DOS, Windows hay Mac OSX, và bạn muốn giữ lại hệ điều hành đó trong khi cài đặt &debian;, có thể là bạn cần phải thay đổi kích cỡ của phân vùng chứa nó để giải phóng thêm sức chứa trống trên đĩa cho bản cài đặt &debian;. Trình cài đặt hỗ trợ chức năng thay đổi kích cỡ của hệ thống tập tin kiểu cả hai FAT và NTFS; khi bạn tới bước phân vùng của "
-"tiến trình cài đặt, hãy bật tùy chọn <guimenuitem>Bằng tay</guimenuitem>, sau đó đơn giản chọn một phân vùng tồn tại và thay đổi kích cỡ của nó."
+"Nếu bạn có một hệ điều hành khác đã có, v.d. DOS, Windows hay Mac OSX, và "
+"bạn muốn giữ lại hệ điều hành đó trong khi cài đặt &debian;, có thể là bạn "
+"cần phải thay đổi kích cỡ của phân vùng chứa nó để giải phóng thêm sức chứa "
+"trống trên đĩa cho bản cài đặt &debian;. Trình cài đặt hỗ trợ chức năng thay "
+"đổi kích cỡ của hệ thống tập tin kiểu cả hai FAT và NTFS; khi bạn tới bước "
+"phân vùng của tiến trình cài đặt, hãy bật tùy chọn <guimenuitem>Bằng tay</"
+"guimenuitem>, sau đó đơn giản chọn một phân vùng tồn tại và thay đổi kích cỡ "
+"của nó."
 
+#. Tag: para
 #: partitioning.xml:601
 #, no-c-format
-#. Tag: para
 msgid ""
 "The PC BIOS generally adds additional constraints for disk partitioning. "
 "There is a limit to how many <quote>primary</quote> and <quote>logical</"
@@ -1150,9 +1103,9 @@ msgstr ""
 "faq-large-disk;\">Phoenix BIOS FAQ</ulink>, nhưng tiết đoạn này chứa một "
 "toàn cảnh ngắn để giúp đỡ bạn đặt kế hoạch phần lớn trường hợp."
 
+#. Tag: para
 #: partitioning.xml:612
 #, no-c-format
-#. Tag: para
 msgid ""
 "<quote>Primary</quote> partitions are the original partitioning scheme for "
 "PC disks. However, there can only be four of them. To get past this "
@@ -1171,9 +1124,9 @@ msgstr ""
 "tạo đến 60 phân vùng hợp lý trong mỗi phân vùng đã mở rộng; nhưng mà, mỗi "
 "đĩa có thể chứa chỉ một phân vùng đã mở rộng thôi."
 
+#. Tag: para
 #: partitioning.xml:623
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
 "usable primary partitions, 12 logical partitions), and 63 partitions on an "
@@ -1189,9 +1142,9 @@ msgstr ""
 "vì vậy bạn không thể cài đặt trên hơn 20 phân vùng nếu bạn chưa tự tạo một "
 "thiết bị dành cho mỗi phân vùng đó."
 
+#. Tag: para
 #: partitioning.xml:633
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have a large IDE disk, and are using neither LBA addressing, nor "
 "overlay drivers (sometimes provided by hard disk manufacturers), then the "
@@ -1205,21 +1158,9 @@ msgstr ""
 "động (phân vùng chứa ảnh hạt nhân) trong 1024 hình trụ đầu của đĩa cứng đó "
 "(thường là vùng khoảng 524 MB, không có khả năng dịch BIOS)."
 
+#. Tag: para
 #: partitioning.xml:641
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This restriction doesn't apply if you have a BIOS newer than around "
-#| "1995&ndash;98 (depending on the manufacturer) that supports the "
-#| "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-#| "Linux loader, and Debian's alternative <command>mbr</command> must use "
-#| "the BIOS to read the kernel from the disk into RAM. If the BIOS int 0x13 "
-#| "large disk access extensions are found to be present, they will be "
-#| "utilized. Otherwise, the legacy disk access interface is used as a fall-"
-#| "back, and it cannot be used to address any location on the disk higher "
-#| "than the 1023rd cylinder. Once &arch-kernel; is booted, no matter what "
-#| "BIOS your computer has, these restrictions no longer apply, since &arch-"
-#| "kernel; does not use the BIOS for disk access."
 msgid ""
 "This restriction doesn't apply if you have a BIOS newer than around "
 "1995&ndash;98 (depending on the manufacturer) that supports the "
@@ -1233,12 +1174,20 @@ msgid ""
 "has, these restrictions no longer apply, since &arch-kernel; does not use "
 "the BIOS for disk access."
 msgstr ""
-"Sự hạn chế này không có tác động nếu máy tính có BIOS mới hơn năm 1995&ndash;98 (phụ thuộc vào hãng chế tạo) hỗ trợ <quote>Đặc Tả Hỗ Trợ Ổ Đĩa Tăng Cường</quote> (EDDSS). Cả LILO (bộ nạp Linux) lẫn trình xen kẽ của &debian; <command>mbr</command> đều phải sử dụng BIOS để đọc hạt nhân từ đĩa vào vùng nhớ RAM. Phát hiện được phần mở rộng truy cập đến đĩa lớn kiểu BIOS int 0x13 thì sử dụng. Không thì giao diện thừa tự truy cập đến đĩa được dùng như là chức năng dự trữ; nó cũng không thể được dùng để định vị trí nào trên đĩa nằm cao hơn hình trụ thứ 1023. Một khi khởi động &arch-kernel;, kiểu BIOS nào không có tác động và những sự hạn chế này không còn có tác động "
+"Sự hạn chế này không có tác động nếu máy tính có BIOS mới hơn năm "
+"1995&ndash;98 (phụ thuộc vào hãng chế tạo) hỗ trợ <quote>Đặc Tả Hỗ Trợ Ổ Đĩa "
+"Tăng Cường</quote> (EDDSS). Cả LILO (bộ nạp Linux) lẫn trình xen kẽ của "
+"&debian; <command>mbr</command> đều phải sử dụng BIOS để đọc hạt nhân từ đĩa "
+"vào vùng nhớ RAM. Phát hiện được phần mở rộng truy cập đến đĩa lớn kiểu BIOS "
+"int 0x13 thì sử dụng. Không thì giao diện thừa tự truy cập đến đĩa được dùng "
+"như là chức năng dự trữ; nó cũng không thể được dùng để định vị trí nào trên "
+"đĩa nằm cao hơn hình trụ thứ 1023. Một khi khởi động &arch-kernel;, kiểu "
+"BIOS nào không có tác động và những sự hạn chế này không còn có tác động "
 "lại, vì &arch-kernel; không sử dụng BIOS để truy cập đến đĩa."
 
+#. Tag: para
 #: partitioning.xml:655
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have a large disk, you might have to use cylinder translation "
 "techniques, which you can set from your BIOS setup program, such as LBA "
@@ -1258,9 +1207,9 @@ msgstr ""
 "đĩa lớn, phân vùng khởi động phải nằm trong vùng đại diện <emphasis>đã dịch</"
 "emphasis> của hình trụ thứ 1024."
 
+#. Tag: para
 #: partitioning.xml:667
 #, no-c-format
-#. Tag: para
 msgid ""
 "The recommended way of accomplishing this is to create a small "
 "(25&ndash;50MB should suffice) partition at the beginning of the disk to be "
@@ -1281,9 +1230,9 @@ msgstr ""
 "hay khả năng dịch CHS đĩa lớn, và bất chấp BIOS hỗ trợ các phần mở rộng truy "
 "cấp đĩa lớn."
 
+#. Tag: para
 #: partitioning.xml:688
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <command>partman</command> disk partitioner is the default partitioning "
 "tool for the installer. It manages the set of partitions and their mount "
@@ -1297,15 +1246,15 @@ msgstr ""
 "công. Nó thật sự dùng trình <command>parted</command> để tạo phân vùng trên "
 "đĩa."
 
+#. Tag: title
 #: partitioning.xml:700
 #, no-c-format
-#. Tag: title
 msgid "EFI Recognized Formats"
 msgstr "Dạng thức do EFI chấp nhận"
 
+#. Tag: para
 #: partitioning.xml:701
 #, no-c-format
-#. Tag: para
 msgid ""
 "The IA-64 EFI firmware supports two partition table (or disk label) formats, "
 "GPT and MS-DOS. MS-DOS, the format typically used on i386 PCs, is no longer "
@@ -1321,9 +1270,9 @@ msgstr ""
 "txt\"> <command>parted</command></ulink> vì nó là chương trình duy nhất có "
 "khả năng quản lý được bảng kiểu cả hai GPT và MS-DOS thôi."
 
+#. Tag: para
 #: partitioning.xml:713
 #, no-c-format
-#. Tag: para
 msgid ""
 "The automatic partitioning recipes for <command>partman</command> allocate "
 "an EFI partition as the first partition on the disk. You can also set up the "
@@ -1337,9 +1286,9 @@ msgstr ""
 "vùng đã hướng dẫn</guimenuitem> nằm trong trình đơn chính, bằng cách tương "
 "tự với cách thiết lập phân vùng <emphasis>trao đổi</emphasis>."
 
+#. Tag: para
 #: partitioning.xml:721
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <command>partman</command> partitioner will handle most disk layouts. "
 "For those rare cases where it is necessary to manually set up a disk, you "
@@ -1386,15 +1335,15 @@ msgstr ""
 "trình định dạng vùng trao đổi bằng <command>parted</command> có thể mất vài "
 "phút, vì nó quét phân vùng tìm khối hỏng nào."
 
+#. Tag: title
 #: partitioning.xml:746
 #, no-c-format
-#. Tag: title
 msgid "Boot Loader Partition Requirements"
 msgstr "Nhu cầu phân vùng của bộ nạp khởi động"
 
+#. Tag: para
 #: partitioning.xml:747
 #, no-c-format
-#. Tag: para
 msgid ""
 "ELILO, the IA-64 boot loader, requires a partition containing a FAT file "
 "system with the <userinput>boot</userinput> flag set. The partition must be "
@@ -1408,9 +1357,9 @@ msgstr ""
 "RAM bạn muốn khởi động. Kích cỡ tối thiểu là khoảng 20 MB, nhưng nếu bạn "
 "muốn chạy với nhiều hạt nhân, 128 MB có thể là kích cỡ thích hợp hơn."
 
+#. Tag: para
 #: partitioning.xml:756
 #, no-c-format
-#. Tag: para
 msgid ""
 "The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
 "boot partition does not necessarily have to be the first partition or even "
@@ -1433,9 +1382,9 @@ msgstr ""
 "đặt gói có khởi chạy. Cách dễ nhất sửa lại sự bỏ quên này là thu hẹp phân "
 "vùng cuối cùng của đĩa để tạo đủ sức chứa còn rảnh để thêm một phân vùng EFI."
 
+#. Tag: para
 #: partitioning.xml:771
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is strongly recommended that you allocate the EFI boot partition on the "
 "same disk as the <emphasis>root</emphasis> filesystem."
@@ -1443,15 +1392,15 @@ msgstr ""
 "Rất khuyên bạn cấp phát phân vùng khởi động EFI nằm trên cùng một đĩa với hệ "
 "thống tập tin <emphasis>gốc</emphasis>."
 
+#. Tag: title
 #: partitioning.xml:779
 #, no-c-format
-#. Tag: title
 msgid "EFI Diagnostic Partitions"
 msgstr "Phân vùng chẩn đoán EFI"
 
+#. Tag: para
 #: partitioning.xml:780
 #, no-c-format
-#. Tag: para
 msgid ""
 "The EFI firmware is significantly more sophisticated than the usual BIOS "
 "seen on most x86 PCs. Some system vendors take advantage of the ability of "
@@ -1471,9 +1420,9 @@ msgstr ""
 "hệ thống để tìm chi tiết. Điểm thời dễ nhất để thiết lập một phân vùng chẩn "
 "đoán là cùng lúc thiết lập phân vùng khởi động EFI."
 
+#. Tag: para
 #: partitioning.xml:802
 #, no-c-format
-#. Tag: para
 msgid ""
 "SGI machines require an SGI disk label in order to make the system bootable "
 "from hard disk. It can be created in the fdisk expert menu. The thereby "
@@ -1489,15 +1438,15 @@ msgstr ""
 "có thể xoá bỏ phân vùng số 9 rồi thêm lại nó với kích cỡ khác. Ghi chú rằng "
 "phần đầu khối tin phải bắt đầu tại rãnh ghi 0."
 
+#. Tag: title
 #: partitioning.xml:819
 #, no-c-format
-#. Tag: title
 msgid "Partitioning Newer PowerMacs"
 msgstr "Tạo phân vùng trên PowerMac mới hơn"
 
+#. Tag: para
 #: partitioning.xml:820
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing onto a NewWorld PowerMac you must create a special "
 "bootstrap partition to hold the boot loader. The size of this partition must "
@@ -1520,9 +1469,9 @@ msgstr ""
 "NewWorld), hoặc bằng trình <command>mac-fdisk</command> dùng lệnh "
 "<userinput>b</userinput>."
 
+#. Tag: para
 #: partitioning.xml:833
 #, no-c-format
-#. Tag: para
 msgid ""
 "The special partition type Apple_Bootstrap is required to prevent MacOS from "
 "mounting and damaging the bootstrap partition, as there are special "
@@ -1533,9 +1482,9 @@ msgstr ""
 "đã được sửa đổi đặc biệt để cho phần vững OpenFirmware khả năng khởi động tự "
 "động nó."
 
+#. Tag: para
 #: partitioning.xml:840
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that the bootstrap partition is only meant to hold 3 very small files: "
 "the <command>yaboot</command> binary, its configuration <filename>yaboot."
@@ -1552,9 +1501,9 @@ msgstr ""
 "hay cái gì khác nào được sao chép vào nó. Những tiện ích <command>ybin</"
 "command> và <command>mkofboot</command> được dùng để thao tác phân vùng này."
 
+#. Tag: para
 #: partitioning.xml:850
 #, no-c-format
-#. Tag: para
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
 "partition should appear before other boot partitions on the disk, especially "
@@ -1575,9 +1524,9 @@ msgstr ""
 "sau sơ đồ đó (mà luôn luôn là phân vùng số 1). Quan trọng là thứ tự sơ đồ "
 "hợp lý, không phải thứ tự địa chỉ vật lý."
 
+#. Tag: para
 #: partitioning.xml:862
 #, no-c-format
-#. Tag: para
 msgid ""
 "Apple disks normally have several small driver partitions. If you intend to "
 "dual boot your machine with MacOSX, you should retain these partitions and a "
@@ -1591,9 +1540,9 @@ msgstr ""
 "hệ điều hành Mac OSX, mỗi khi khởi động, thử sở khởi đĩa nào chưa có phân "
 "vùng kiểu MacOS và trình điều khiển hoạt động."
 
+#. Tag: para
 #: partitioning.xml:879
 #, no-c-format
-#. Tag: para
 msgid ""
 "Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
 "is the only kind of partition scheme that the OpenBoot PROM understands, and "
@@ -1605,9 +1554,9 @@ msgstr ""
 "duy nhất từ đó bạn có khả năng khởi động. Trong trình <command>fdisk</"
 "command>, phím <keycap>s</keycap> được dùng để tạo nhãn đĩa Sun."
 
+#. Tag: para
 #: partitioning.xml:887
 #, no-c-format
-#. Tag: para
 msgid ""
 "Furthermore, on &arch-title; disks, make sure your first partition on your "
 "boot disk starts at cylinder 0. While this is required, it also means that "
@@ -1627,9 +1576,9 @@ msgstr ""
 "ext2 hay UFS vào đó ; chúng sẽ không sửa đổi bảng phân vùng hay khối khởi "
 "động."
 
+#. Tag: para
 #: partitioning.xml:898
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is also advised that the third partition should be of type <quote>Whole "
 "disk</quote> (type 5), and contain the entire disk (from the first cylinder "
diff --git a/po/vi/post-install.po b/po/vi/post-install.po
index 46bc8eb90..5aace7123 100644
--- a/po/vi/post-install.po
+++ b/po/vi/post-install.po
@@ -17,21 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: post-install.xml:5
 #, no-c-format
-#. Tag: title
 msgid "Next Steps and Where to Go From Here"
 msgstr "Bước kế tiếp và đi đâu vậy"
 
+#. Tag: title
 #: post-install.xml:13
 #, no-c-format
-#. Tag: title
 msgid "Shutting down the system"
 msgstr "Tắt hệ thống"
 
+#. Tag: para
 #: post-install.xml:15
 #, no-c-format
-#. Tag: para
 msgid ""
 "To shut down a running &debian-gnu; system, you must not reboot with the "
 "reset switch on the front or back of your computer, or just turn off the "
@@ -48,9 +48,9 @@ msgstr ""
 "nằm trong trình đơn ứng dụng mà cho bạn có khả năng tắt (hoặc khởi động lại) "
 "hệ thống."
 
+#. Tag: para
 #: post-install.xml:25
 #, no-c-format
-#. Tag: para
 msgid ""
 "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</"
 "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch="
@@ -72,15 +72,15 @@ msgstr ""
 "hãy sử dụng lệnh <command>reboot</command> (khởi động lại) để khởi động lại "
 "hệ thống."
 
+#. Tag: title
 #: post-install.xml:46
 #, no-c-format
-#. Tag: title
 msgid "If You Are New to Unix"
 msgstr "Bắt đầu sử dụng UNIX"
 
+#. Tag: para
 #: post-install.xml:47
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are new to Unix, you probably should go out and buy some books and do "
 "some reading. A lot of valuable information can also be found in the <ulink "
@@ -88,20 +88,15 @@ msgid ""
 "\"&url-unix-faq;\">list of Unix FAQs</ulink> contains a number of UseNet "
 "documents which provide a nice historical reference."
 msgstr ""
-"Nếu bạn chưa quen với UNIX, khuyên bạn đọc một số cuốn sách và tài liệu. Rất nhiều thông tin hữu ích nằm trong Tham Khảo Debian (<ulink url=\"&url-debian-reference;\">Debian Reference</ulink>). Danh sách các Hỏi Đáp UNIX (<ulink url=\"&url-unix-faq;\">list of Unix FAQs</ulink>) chứa một số tài liệu UseNet cung cấp tham khảo lịch sử tốt."
+"Nếu bạn chưa quen với UNIX, khuyên bạn đọc một số cuốn sách và tài liệu. Rất "
+"nhiều thông tin hữu ích nằm trong Tham Khảo Debian (<ulink url=\"&url-debian-"
+"reference;\">Debian Reference</ulink>). Danh sách các Hỏi Đáp UNIX (<ulink "
+"url=\"&url-unix-faq;\">list of Unix FAQs</ulink>) chứa một số tài liệu "
+"UseNet cung cấp tham khảo lịch sử tốt."
 
+#. Tag: para
 #: post-install.xml:55
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
-#| "Documentation Project (LDP)</ulink> collects a number of HOWTOs and "
-#| "online books relating to Linux. Most of these documents can be installed "
-#| "locally; just install the <classname>doc-linux-html</classname> package "
-#| "(HTML versions) or the <classname>doc-linux-text</classname> package "
-#| "(ASCII versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
-#| "International versions of the LDP HOWTOs are also available as Debian "
-#| "packages."
 msgid ""
 "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
 "Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
@@ -112,26 +107,24 @@ msgid ""
 "International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
-"Linux là một bản thực hiện UNIX riêng. Dự án tài liệu Linux (<ulink url=\"&url-ldp;\">Linux Documentation Project (LDP)</ulink>) tập hợp một số tài liệu Thế Nào và cuốn sách trực tuyến liên quan đến Linux. Phần lớn các tài liệu này có thể được cài đặt một cách cục bộ: chỉ đơn giản hãy cài đặt gói "
-"<classname>doc-linux-html</classname> (kiểu HTML) hay gói <classname>doc-linux-text</classname> (kiểu ASCII), sau đó tìm trong thư mục Thế Nào (<filename>/usr/share/doc/HOWTO</filename>). Phiên bản đã dịch nào của những tài liệu Thế Nào LDP cũng được công bố dưới dạng gói Debian."
+"Linux là một bản thực hiện UNIX riêng. Dự án tài liệu Linux (<ulink url="
+"\"&url-ldp;\">Linux Documentation Project (LDP)</ulink>) tập hợp một số tài "
+"liệu Thế Nào và cuốn sách trực tuyến liên quan đến Linux. Phần lớn các tài "
+"liệu này có thể được cài đặt một cách cục bộ: chỉ đơn giản hãy cài đặt gói "
+"<classname>doc-linux-html</classname> (kiểu HTML) hay gói <classname>doc-"
+"linux-text</classname> (kiểu ASCII), sau đó tìm trong thư mục Thế Nào "
+"(<filename>/usr/share/doc/HOWTO</filename>). Phiên bản đã dịch nào của những "
+"tài liệu Thế Nào LDP cũng được công bố dưới dạng gói Debian."
 
+#. Tag: title
 #: post-install.xml:76
 #, no-c-format
-#. Tag: title
-#| msgid "Orienting Yourself to Debian"
 msgid "Orienting Yourself to &debian;"
 msgstr "Giới thiệu về &debian;"
 
+#. Tag: para
 #: post-install.xml:77
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian is a little different from other distributions. Even if you're "
-#| "familiar with Linux in other distributions, there are things you should "
-#| "know about Debian to help you to keep your system in a good, clean state. "
-#| "This chapter contains material to help you get oriented; it is not "
-#| "intended to be a tutorial for how to use Debian, but just a very brief "
-#| "glimpse of the system for the very rushed."
 msgid ""
 "&debian; is a little different from other distributions. Even if you're "
 "familiar with Linux in other distributions, there are things you should know "
@@ -140,33 +133,21 @@ msgid ""
 "a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
-"&debian; hơi khác với các bản phát hành khác. Thậm chí nếu bạn quen với Linux trong bản phát hành khác, có vài thông tin cần biết về &debian; để giúp đỡ bạn bảo quản một hệ thống tốt đẹp. Chương này chứa thông tin để giúp đỡ bạn bắt đầu dùng &debian;; nó không phải là trợ lý hướng dẫn về cách sử dụng &debian;, chỉ là một bản tóm tắt rất vắn cho người quá bận thôi."
+"&debian; hơi khác với các bản phát hành khác. Thậm chí nếu bạn quen với "
+"Linux trong bản phát hành khác, có vài thông tin cần biết về &debian; để "
+"giúp đỡ bạn bảo quản một hệ thống tốt đẹp. Chương này chứa thông tin để giúp "
+"đỡ bạn bắt đầu dùng &debian;; nó không phải là trợ lý hướng dẫn về cách sử "
+"dụng &debian;, chỉ là một bản tóm tắt rất vắn cho người quá bận thôi."
 
+#. Tag: title
 #: post-install.xml:88
 #, no-c-format
-#. Tag: title
-#| msgid "Debian Packaging System"
 msgid "&debian; Packaging System"
 msgstr "Hệ thống quản lý gói &debian;"
 
+#. Tag: para
 #: post-install.xml:89
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The most important concept to grasp is the Debian packaging system. In "
-#| "essence, large parts of your system should be considered under the "
-#| "control of the packaging system. These include: <itemizedlist> "
-#| "<listitem><para> <filename>/usr</filename> (excluding <filename>/usr/"
-#| "local</filename>) </para></listitem> <listitem><para> <filename>/var</"
-#| "filename> (you could make <filename>/var/local</filename> and be safe in "
-#| "there) </para></listitem> <listitem><para> <filename>/bin</filename> </"
-#| "para></listitem> <listitem><para> <filename>/sbin</filename> </para></"
-#| "listitem> <listitem><para> <filename>/lib</filename> </para></listitem> </"
-#| "itemizedlist> For instance, if you replace <filename>/usr/bin/perl</"
-#| "filename>, that will work, but then if you upgrade your <classname>perl</"
-#| "classname> package, the file you put there will be replaced. Experts can "
-#| "get around this by putting packages on <quote>hold</quote> in "
-#| "<command>aptitude</command>."
 msgid ""
 "The most important concept to grasp is the &debian; packaging system. In "
 "essence, large parts of your system should be considered under the control "
@@ -183,19 +164,24 @@ msgid ""
 "around this by putting packages on <quote>hold</quote> in <command>aptitude</"
 "command>."
 msgstr ""
-"Khái niệm quan trọng nhất cần hiểu được là hệ thống gói &debian;. Về cơ bản thì nhiều phần lớn của hệ thống được điều khiển bởi hệ thống quản lý gói này. Những phần này bao gồm: <itemizedlist> <listitem><para> <filename>/usr</"
+"Khái niệm quan trọng nhất cần hiểu được là hệ thống gói &debian;. Về cơ bản "
+"thì nhiều phần lớn của hệ thống được điều khiển bởi hệ thống quản lý gói "
+"này. Những phần này bao gồm: <itemizedlist> <listitem><para> <filename>/usr</"
 "filename> (trừ <filename>/usr/local</filename>) </para></listitem> "
-"<listitem><para> <filename>/var</filename> (bạn có thể tạo thư mục <filename>/var/"
-"local</filename> và hoạt động trong đó một cách an toàn) </para></listitem> "
-"<listitem><para> <filename>/bin</filename> </para></listitem> "
-"<listitem><para> <filename>/sbin</filename> </para></listitem> "
+"<listitem><para> <filename>/var</filename> (bạn có thể tạo thư mục "
+"<filename>/var/local</filename> và hoạt động trong đó một cách an toàn) </"
+"para></listitem> <listitem><para> <filename>/bin</filename> </para></"
+"listitem> <listitem><para> <filename>/sbin</filename> </para></listitem> "
 "<listitem><para> <filename>/lib</filename> </para></listitem> </"
 "itemizedlist> Lấy thí dụ, nếu bạn thay thế thư mục <filename>/usr/bin/perl</"
-"filename>, lần kế tiếp nâng cấp gói <classname>perl</classname> sẽ ghi đè lên thư mục đó. Nhà chuyên môn có thể khắc phục trường hợp này bằng cách lập một số gói thành <quote>giữ lại</quote> trong chương trình <command>aptitude</command>."
+"filename>, lần kế tiếp nâng cấp gói <classname>perl</classname> sẽ ghi đè "
+"lên thư mục đó. Nhà chuyên môn có thể khắc phục trường hợp này bằng cách lập "
+"một số gói thành <quote>giữ lại</quote> trong chương trình "
+"<command>aptitude</command>."
 
+#. Tag: para
 #: post-install.xml:130
 #, no-c-format
-#. Tag: para
 msgid ""
 "One of the best installation methods is apt. You can use the command line "
 "version <command>apt-get</command> or full-screen text version "
@@ -210,15 +196,15 @@ msgstr ""
 "Khác tự do (non-free) để cho bạn truy cập gói bị hạn chế khi xuất, cũng như "
 "phiên bản chuẩn."
 
+#. Tag: title
 #: post-install.xml:141
 #, no-c-format
-#. Tag: title
 msgid "Application Version Management"
 msgstr "Quản lý phiên bản ứng dụng"
 
+#. Tag: para
 #: post-install.xml:142
 #, no-c-format
-#. Tag: para
 msgid ""
 "Alternative versions of applications are managed by update-alternatives. If "
 "you are maintaining multiple versions of your applications, read the update-"
@@ -229,15 +215,15 @@ msgstr ""
 "xem trang hướng dẫn cho chương trình này, bằng lệnh: « man update-"
 "alternatives »."
 
+#. Tag: title
 #: post-install.xml:152
 #, no-c-format
-#. Tag: title
 msgid "Cron Job Management"
 msgstr "Quản lý công việc định kỳ"
 
+#. Tag: para
 #: post-install.xml:153
 #, no-c-format
-#. Tag: para
 msgid ""
 "Any jobs under the purview of the system administrator should be in "
 "<filename>/etc</filename>, since they are configuration files. If you have a "
@@ -254,9 +240,9 @@ msgstr ""
 "được gọi từ <filename>/etc/crontab</filename>: chúng sẽ chạy theo thứ tự "
 "abc, mà sắp xếp chúng."
 
+#. Tag: para
 #: post-install.xml:162
 #, no-c-format
-#. Tag: para
 msgid ""
 "On the other hand, if you have a cron job that (a) needs to run as a special "
 "user, or (b) needs to run at a special time or frequency, you can use either "
@@ -272,9 +258,9 @@ msgstr ""
 "cái_nào</filename>. Những tập tin riêng này cũng có một trường thêm cho phép "
 "bạn qui định tài khoản người dùng dưới đó công việc định kỳ sẽ chạy."
 
+#. Tag: para
 #: post-install.xml:171
 #, no-c-format
-#. Tag: para
 msgid ""
 "In either case, you just edit the files and cron will notice them "
 "automatically. There is no need to run a special command. For more "
@@ -286,15 +272,15 @@ msgstr ""
 "Để tìm thông tin thêm, xem hai trang hướng dẫn cron(8) và crontab(5), và tập "
 "tin Đọc Đi <filename>/usr/share/doc/cron/README.Debian</filename>."
 
+#. Tag: title
 #: post-install.xml:186
 #, no-c-format
-#. Tag: title
 msgid "Further Reading and Information"
 msgstr "Thông tin thêm"
 
+#. Tag: para
 #: post-install.xml:187
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you need information about a particular program, you should first try "
 "<userinput>man <replaceable>program</replaceable></userinput>, or "
@@ -304,17 +290,9 @@ msgstr ""
 "<userinput>man <replaceable>tên_chương_trình</replaceable></userinput>, hoặc "
 "<userinput>info <replaceable>tên_chương_trình</replaceable></userinput>."
 
+#. Tag: para
 #: post-install.xml:193
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "There is lots of useful documentation in <filename>/usr/share/doc</"
-#| "filename> as well. In particular, <filename>/usr/share/doc/HOWTO</"
-#| "filename> and <filename>/usr/share/doc/FAQ</filename> contain lots of "
-#| "interesting information. To submit bugs, look at <filename>/usr/share/doc/"
-#| "debian/bug*</filename>. To read about Debian-specific issues for "
-#| "particular programs, look at <filename>/usr/share/doc/(package name)/"
-#| "README.Debian</filename>."
 msgid ""
 "There is lots of useful documentation in <filename>/usr/share/doc</filename> "
 "as well. In particular, <filename>/usr/share/doc/HOWTO</filename> and "
@@ -323,26 +301,17 @@ msgid ""
 "filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
 msgstr ""
-"Cũng có rất nhiều tài liệu hữu ích nằm trong thư mục <filename>/usr/share/doc</filename>. Cụ thể là thư mục con Thế Nào <filename>/usr/share/doc/HOWTO</filename> và Hỏi Đáp <filename>/usr/share/doc/FAQ</filename> chứa nhiều thông tin hữu dụng. Để thông báo lỗi, xem <filename>/usr/share/doc/"
-"debian/bug*</filename>. Để đọc thông tin về vấn đề đặc trưng cho &debian; đối với một chương trình riêng, xem tập tin Đọc Đi <filename>/usr/share/doc/"
+"Cũng có rất nhiều tài liệu hữu ích nằm trong thư mục <filename>/usr/share/"
+"doc</filename>. Cụ thể là thư mục con Thế Nào <filename>/usr/share/doc/"
+"HOWTO</filename> và Hỏi Đáp <filename>/usr/share/doc/FAQ</filename> chứa "
+"nhiều thông tin hữu dụng. Để thông báo lỗi, xem <filename>/usr/share/doc/"
+"debian/bug*</filename>. Để đọc thông tin về vấn đề đặc trưng cho &debian; "
+"đối với một chương trình riêng, xem tập tin Đọc Đi <filename>/usr/share/doc/"
 "(tên_gói)/README.Debian</filename>."
 
+#. Tag: para
 #: post-install.xml:204
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> "
-#| "contains a large quantity of documentation about Debian. In particular, "
-#| "see the <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux "
-#| "FAQ</ulink> and the <ulink url=\"http://www.debian.org/doc/user-"
-#| "manuals#quick-reference\">Debian Reference</ulink>. An index of more "
-#| "Debian documentation is available from the <ulink url=\"http://www.debian."
-#| "org/doc/ddp\">Debian Documentation Project</ulink>. The Debian community "
-#| "is self-supporting; to subscribe to one or more of the Debian mailing "
-#| "lists, see the <ulink url=\"http://www.debian.org/MailingLists/subscribe"
-#| "\"> Mail List Subscription</ulink> page. Last, but not least, the <ulink "
-#| "url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> "
-#| "contain a wealth of information on Debian."
 msgid ""
 "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
 "large quantity of documentation about &debian;. In particular, see the "
@@ -357,13 +326,22 @@ msgid ""
 "\">Debian Mailing List Archives</ulink> contain a wealth of information on "
 "&debian;."
 msgstr ""
-"<ulink url=\"http://www.debian.org/\">Địa chỉ Web &debian;</ulink> chứa rất nhiều tài liệu về &debian;. Cụ thể là Hỏi Đáp <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> và tham khảo <ulink url=\"http://www.debian.org/doc/user-manuals#quick-reference\">Debian Reference</ulink>. Có một bảng liệt kê nhiều tài liệu hướng dẫn &debian; bổ sung nằm tại dự án tài liệu "
-"&debian; (<ulink url=\"http://www.debian.org/doc/ddp\">Debian Documentation Project</ulink>). Cộng đồng &debian; hỗ trợ với nhau : để đăng ký tham gia một hay nhiều hộp thư chung &debian;, xem trang <ulink url=\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</ulink>. Cuối cùng nhưng không kém phần quan trọng là kho lưu hộp thư chung &debian; <ulink url=\"http://"
-"lists.debian.org/\">Debian Mailing List Archives</ulink> mà chứa thông tin phong phú về &debian;."
+"<ulink url=\"http://www.debian.org/\">Địa chỉ Web &debian;</ulink> chứa rất "
+"nhiều tài liệu về &debian;. Cụ thể là Hỏi Đáp <ulink url=\"http://www.debian."
+"org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> và tham khảo <ulink url=\"http://"
+"www.debian.org/doc/user-manuals#quick-reference\">Debian Reference</ulink>. "
+"Có một bảng liệt kê nhiều tài liệu hướng dẫn &debian; bổ sung nằm tại dự án "
+"tài liệu &debian; (<ulink url=\"http://www.debian.org/doc/ddp\">Debian "
+"Documentation Project</ulink>). Cộng đồng &debian; hỗ trợ với nhau : để đăng "
+"ký tham gia một hay nhiều hộp thư chung &debian;, xem trang <ulink url="
+"\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</"
+"ulink>. Cuối cùng nhưng không kém phần quan trọng là kho lưu hộp thư chung "
+"&debian; <ulink url=\"http://lists.debian.org/\">Debian Mailing List "
+"Archives</ulink> mà chứa thông tin phong phú về &debian;."
 
+#. Tag: para
 #: post-install.xml:222
 #, no-c-format
-#. Tag: para
 msgid ""
 "A general source of information on GNU/Linux is the <ulink url=\"http://www."
 "tldp.org/\">Linux Documentation Project</ulink>. There you will find the "
@@ -375,31 +353,28 @@ msgstr ""
 "bạn sẽ tìm các tài liệu Thế Nào và liên kết chỉ đến thông tin rất qúy giá "
 "khác về nhiều phần của hệ thống GNU/Linux."
 
+#. Tag: title
 #: post-install.xml:238
 #, no-c-format
-#. Tag: title
 msgid "Setting Up Your System To Use E-Mail"
 msgstr "Thiết lập thư điện tử trên hệ thống"
 
+#. Tag: para
 #: post-install.xml:239
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Today, email is an important part of many people's life. As there are "
-#| "many options as to how to set it up, and as having it set up correctly is "
-#| "important for some Debian utilities, we will try to cover the basics in "
-#| "this section."
 msgid ""
 "Today, email is an important part of many people's life. As there are many "
 "options as to how to set it up, and as having it set up correctly is "
 "important for some &debian; utilities, we will try to cover the basics in "
 "this section."
 msgstr ""
-"Thư điện tử đã trở thảnh chủ yếu trong đợi sống hiện đại. Có nhiều tuỳ chọn thiết lập nó, và một số tiện ích &debian; yêu cầu một thiết lập riêng, thì tiến đoạn này chứa thông tin cơ bản yêu cầu."
+"Thư điện tử đã trở thảnh chủ yếu trong đợi sống hiện đại. Có nhiều tuỳ chọn "
+"thiết lập nó, và một số tiện ích &debian; yêu cầu một thiết lập riêng, thì "
+"tiến đoạn này chứa thông tin cơ bản yêu cầu."
 
+#. Tag: para
 #: post-install.xml:246
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are three main functions that make up an e-mail system. First there is "
 "the <firstterm>Mail User Agent</firstterm> (MUA) which is the program a user "
@@ -416,9 +391,9 @@ msgstr ""
 "máy khác. Điều thứ ba là <firstterm>Tác nhân phát thư tín</firstterm> (MDA) "
 "mà truyền các bài thư gửi đến vào Hộp Đến của người dùng."
 
+#. Tag: para
 #: post-install.xml:256
 #, no-c-format
-#. Tag: para
 msgid ""
 "These three functions can be performed by separate programs, but they can "
 "also be combined in one or two programs. It is also possible to have "
@@ -429,9 +404,9 @@ msgstr ""
 "lập chương trình khác nhau quản lý những chức năng này cho các kiểu thư khác "
 "nhau."
 
+#. Tag: para
 #: post-install.xml:262
 #, no-c-format
-#. Tag: para
 msgid ""
 "On Linux and Unix systems <command>mutt</command> is historically a very "
 "popular MUA. Like most traditional Linux programs it is text based. It is "
@@ -444,20 +419,9 @@ msgstr ""
 "<command>sendmail</command> như là MTA và <command>procmail</command> như là "
 "MDA."
 
+#. Tag: para
 #: post-install.xml:269
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "With the increasing popularity of graphical desktop systems, the use of "
-#| "graphical e-mail programs like GNOME's <command>evolution</command>, "
-#| "KDE's <command>kmail</command> or Mozilla's <command>thunderbird</"
-#| "command> (in Debian available as <command>icedove</command><footnote> "
-#| "<para> The reason that <command>thunderbird</command> has been renamed to "
-#| "<command>icedove</command> in Debian has to do with licensing issues. "
-#| "Details are outside the scope of this manual. </para> </footnote>) is "
-#| "becoming more popular. These programs combine the function of a MUA, MTA "
-#| "and MDA, but can &mdash; and often are &mdash; also be used in "
-#| "combination with the traditional Linux tools."
 msgid ""
 "With the increasing popularity of graphical desktop systems, the use of "
 "graphical e-mail programs like GNOME's <command>evolution</command>, KDE's "
@@ -470,17 +434,26 @@ msgid ""
 "and often are &mdash; also be used in combination with the traditional Linux "
 "tools."
 msgstr ""
-"Do tính phổ biến ngày càng tăng của môi trường đồ họa, sử dụng chương trình thư điện tử đồ họa như <command>evolution</command> của GNOME, <command>kmail</command> của KDE hay <command>thunderbird</command> của Mozilla (trong &debian; có tên <command>icedove</command><footnote> <para> Lý do chương trình <command>thunderbird</command> bị thay tên thành <command>icedove</command> trong &debian; là vấn đề cấp quyền sử dụng. Chi tiết về vấn đề này nằm ở ngoại phạm vi của sổ tay này. </para> </footnote>) cũng trở thành phổ biến hơn. Chương trình như vậy kết hợp chức năng của MUA, MTA và MDA, nhưng cũng có thể (và thường có phải) được sử dụng cùng với các công cụ Linux truyền thống."
+"Do tính phổ biến ngày càng tăng của môi trường đồ họa, sử dụng chương trình "
+"thư điện tử đồ họa như <command>evolution</command> của GNOME, "
+"<command>kmail</command> của KDE hay <command>thunderbird</command> của "
+"Mozilla (trong &debian; có tên <command>icedove</command><footnote> <para> "
+"Lý do chương trình <command>thunderbird</command> bị thay tên thành "
+"<command>icedove</command> trong &debian; là vấn đề cấp quyền sử dụng. Chi "
+"tiết về vấn đề này nằm ở ngoại phạm vi của sổ tay này. </para> </footnote>) "
+"cũng trở thành phổ biến hơn. Chương trình như vậy kết hợp chức năng của MUA, "
+"MTA và MDA, nhưng cũng có thể (và thường có phải) được sử dụng cùng với các "
+"công cụ Linux truyền thống."
 
+#. Tag: title
 #: post-install.xml:289
 #, no-c-format
-#. Tag: title
 msgid "Default E-Mail Configuration"
 msgstr "Cấu hình thư điện tử mặc định"
 
+#. Tag: para
 #: post-install.xml:290
 #, no-c-format
-#. Tag: para
 msgid ""
 "Even if you are planning to use a graphical mail program, it is important "
 "that a traditional MTA/MDA is also installed and correctly set up on your "
@@ -498,9 +471,9 @@ msgstr ""
 "footnote>cũng có khả năng gửi thông báo quan trọng qua thư điện tử, để báo "
 "quản trị hệ thống biết về vấn đề hay thay đổi."
 
+#. Tag: para
 #: post-install.xml:305
 #, no-c-format
-#. Tag: para
 msgid ""
 "For this reason the packages <classname>exim4</classname> and "
 "<classname>mutt</classname> will be installed by default (provided you did "
@@ -526,9 +499,9 @@ msgstr ""
 "người dùng chuẩn nào, các thư như vậy sẽ được phát cho tài khoản người chủ.</"
 "para> </footnote>."
 
+#. Tag: para
 #: post-install.xml:324
 #, no-c-format
-#. Tag: para
 msgid ""
 "When system e-mails are delivered they are added to a file in <filename>/var/"
 "mail/<replaceable>account_name</replaceable></filename>. The e-mails can be "
@@ -538,29 +511,27 @@ msgstr ""
 "<filename>/var/mail/<replaceable>tên_tài_khoản</replaceable></filename>. Có "
 "thể đọc các thư này bằng <command>mutt</command>."
 
+#. Tag: title
 #: post-install.xml:334
 #, no-c-format
-#. Tag: title
 msgid "Sending E-Mails Outside The System"
 msgstr "Gửi thư ra hệ thống"
 
+#. Tag: para
 #: post-install.xml:335
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "As mentioned earlier, the installed Debian system is only set up to "
-#| "handle e-mail local to the system, not for sending mail to others nor for "
-#| "receiving mail from others."
 msgid ""
 "As mentioned earlier, the installed &debian; system is only set up to handle "
 "e-mail local to the system, not for sending mail to others nor for receiving "
 "mail from others."
 msgstr ""
-"Như nói trên, hệ thống &debian; đã cài đặt chỉ được thiết lập để thao tác các thư cục bộ với hệ thống, không phải để gửi thư cho người khác, cũng không phải để nhận thư từ người khác."
+"Như nói trên, hệ thống &debian; đã cài đặt chỉ được thiết lập để thao tác "
+"các thư cục bộ với hệ thống, không phải để gửi thư cho người khác, cũng "
+"không phải để nhận thư từ người khác."
 
+#. Tag: para
 #: post-install.xml:341
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you would like <classname>exim4</classname> to handle external e-mail, "
 "please refer to the next subsection for the basic available configuration "
@@ -570,9 +541,9 @@ msgstr ""
 "ngoài, xem phần phụ kế tiếp tìm những tùy chọn cấu hình cơ bản. Hãy thử ra "
 "việc gửi và nhận thư chạy đúng không."
 
+#. Tag: para
 #: post-install.xml:347
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you intend to use a graphical mail program and use a mail server of your "
 "Internet Service Provider (ISP) or your company, there is not really any "
@@ -586,15 +557,9 @@ msgstr ""
 "cấu hình chương trình thư đồ họa để sử dụng những máy phục vụ đúng để gửi và "
 "nhận thư điện tử (các hướng dẫn này nằm ở ngoại phạm vị của sổ tay này)."
 
+#. Tag: para
 #: post-install.xml:356
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "However, in that case you may need to configure individual utilities to "
-#| "correctly send e-mails. One such utility is <command>reportbug</command>, "
-#| "a program that facilitates submitting bug reports against Debian "
-#| "packages. By default it expects to be able to use <classname>exim4</"
-#| "classname> to submit bug reports."
 msgid ""
 "However, in that case you may need to configure individual utilities to "
 "correctly send e-mails. One such utility is <command>reportbug</command>, a "
@@ -602,11 +567,15 @@ msgid ""
 "By default it expects to be able to use <classname>exim4</classname> to "
 "submit bug reports."
 msgstr ""
-"Tuy nhiên, trong trường hợp đó, bạn có thể cần phải cấu hình một số tiện ích để gửi đúng thư điện tử. Một tiện ích như vậy là <command>reportbug</command>, một chương trình làm cho dễ dàng việc thông báo lỗi trong gói &debian;. Mặc định là nó chờ đợi gửi thư báo lỗi bằng <classname>exim4</classname>. "
+"Tuy nhiên, trong trường hợp đó, bạn có thể cần phải cấu hình một số tiện ích "
+"để gửi đúng thư điện tử. Một tiện ích như vậy là <command>reportbug</"
+"command>, một chương trình làm cho dễ dàng việc thông báo lỗi trong gói "
+"&debian;. Mặc định là nó chờ đợi gửi thư báo lỗi bằng <classname>exim4</"
+"classname>. "
 
+#. Tag: para
 #: post-install.xml:364
 #, no-c-format
-#. Tag: para
 msgid ""
 "To correctly set up <command>reportbug</command> to use an external mail "
 "server, please run the command <command>reportbug --configure</command> and "
@@ -619,15 +588,15 @@ msgstr ""
 "đó, bạn sẽ được nhắc nhập máy phục vụ SMTP (gửi thư) cần dùng để đệ trình "
 "báo cáo lỗi."
 
+#. Tag: title
 #: post-install.xml:375
 #, no-c-format
-#. Tag: title
 msgid "Configuring the Exim4 Mail Transport Agent"
 msgstr "Cấu hình tác nhân truyền thư tín Exim4"
 
+#. Tag: para
 #: post-install.xml:376
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you would like your system to also handle external e-mail, you will need "
 "to reconfigure the <classname>exim4</classname> package<footnote> <para> You "
@@ -639,15 +608,15 @@ msgstr ""
 "<classname>exim4</classname> và thay thế bằng MTA/MDA khác. </para> </"
 "footnote>:"
 
+#. Tag: screen
 #: post-install.xml:388
 #, no-c-format
-#. Tag: screen
 msgid "# dpkg-reconfigure exim4-config"
 msgstr "# dpkg-reconfigure exim4-config"
 
+#. Tag: para
 #: post-install.xml:390
 #, no-c-format
-#. Tag: para
 msgid ""
 "After entering that command (as root), you will be asked if you want split "
 "the configuration into small files. If you are unsure, select the default "
@@ -656,9 +625,9 @@ msgstr ""
 "Sau khi nhập lệnh này (dưới người chủ), tiến trình sẽ hỏi nếu bạn muốn chia "
 "cấu hình ra nhiều tập tin nhỏ. Chưa chắc thì bặt tùy chọn mặc định."
 
+#. Tag: para
 #: post-install.xml:396
 #, no-c-format
-#. Tag: para
 msgid ""
 "Next you will be presented with several common mail scenarios. Choose the "
 "one that most closely resembles your needs."
@@ -666,15 +635,15 @@ msgstr ""
 "Tiếp theo hiển thị vài trường hợp thư tín thường gặp. Hãy chọn điều thích "
 "hợp với những nhu cầu của bạn."
 
+#. Tag: term
 #: post-install.xml:405
 #, no-c-format
-#. Tag: term
 msgid "internet site"
 msgstr "nơi Internet"
 
+#. Tag: para
 #: post-install.xml:406
 #, no-c-format
-#. Tag: para
 msgid ""
 "Your system is connected to a network and your mail is sent and received "
 "directly using SMTP. On the following screens you will be asked a few basic "
@@ -686,15 +655,15 @@ msgstr ""
 "tên thư tín của máy tính này, hay danh sách miền cho chúng bạn chấp nhận hay "
 "chuyển tiếp lại thư tín."
 
+#. Tag: term
 #: post-install.xml:417
 #, no-c-format
-#. Tag: term
 msgid "mail sent by smarthost"
 msgstr "thư được gởi bởi máy thông minh"
 
+#. Tag: para
 #: post-install.xml:418
 #, no-c-format
-#. Tag: para
 msgid ""
 "In this scenario your outgoing mail is forwarded to another machine, called "
 "a <quote>smarthost</quote>, which takes care of sending the message on to "
@@ -709,9 +678,9 @@ msgstr ""
 "cần tải các thư xuống máy khéo bằng chương trình như <classname>fetchmail</"
 "classname>."
 
+#. Tag: para
 #: post-install.xml:428
 #, no-c-format
-#. Tag: para
 msgid ""
 "In a lot of cases the smarthost will be your ISP's mail server, which makes "
 "this option very suitable for dial-up users. It can also be a company mail "
@@ -722,15 +691,15 @@ msgstr ""
 "Máy khéo cũng có thể là máy phục vụ thư tín ở chỗ làm, hoặc ngay cả một hệ "
 "thống khác trên cùng mạng."
 
+#. Tag: term
 #: post-install.xml:438
 #, no-c-format
-#. Tag: term
 msgid "mail sent by smarthost; no local mail"
 msgstr "thư gửi bởi máy khéo; không có thư cục bộ"
 
+#. Tag: para
 #: post-install.xml:439
 #, no-c-format
-#. Tag: para
 msgid ""
 "This option is basically the same as the previous one except that the system "
 "will not be set up to handle mail for a local e-mail domain. Mail on the "
@@ -740,27 +709,27 @@ msgstr ""
 "thao tác thư cho miền thư điện tử cục bộ. Các thư trên hệ thống chính nó (v."
 "d. cho quản trị hệ thống) vẫn còn sẽ được xử lý."
 
+#. Tag: term
 #: post-install.xml:450
 #, no-c-format
-#. Tag: term
 msgid "local delivery only"
 msgstr "chỉ phát cục bộ"
 
+#. Tag: para
 #: post-install.xml:451
 #, no-c-format
-#. Tag: para
 msgid "This is the option your system is configured for by default."
 msgstr "Đây là tùy chọn mặc định trong cấu hình hệ thống."
 
+#. Tag: term
 #: post-install.xml:459
 #, no-c-format
-#. Tag: term
 msgid "no configuration at this time"
 msgstr "chưa cấu hình"
 
+#. Tag: para
 #: post-install.xml:460
 #, no-c-format
-#. Tag: para
 msgid ""
 "Choose this if you are absolutely convinced you know what you are doing. "
 "This will leave you with an unconfigured mail system &mdash; until you "
@@ -772,9 +741,9 @@ msgstr ""
 "gởi hay nhận thư nào, thì có thể mất một số thông điệp quan trong từ tiện "
 "ích hệ thống."
 
+#. Tag: para
 #: post-install.xml:471
 #, no-c-format
-#. Tag: para
 msgid ""
 "If none of these scenarios suits your needs, or if you need a finer grained "
 "setup, you will need to edit configuration files under the <filename>/etc/"
@@ -792,9 +761,9 @@ msgstr ""
 "<filename>README.Debian.gz</filename> chứa chi tiết thêm về cách thiết lập "
 "<classname>exim4</classname>, và giải thích tìm tài liệu thêm như thế nào."
 
+#. Tag: para
 #: post-install.xml:482
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that sending mail directly to the Internet when you don't have an "
 "official domain name, can result in your mail being rejected because of anti-"
@@ -812,22 +781,15 @@ msgstr ""
 "Dùng <classname>exim4</classname> như là MTA, thì có thể làm như thế bằng "
 "cách thêm một mục nhập vào tập tin <filename>/etc/email-addresses</filename>."
 
+#. Tag: title
 #: post-install.xml:500
 #, no-c-format
-#. Tag: title
 msgid "Compiling a New Kernel"
 msgstr "Biên dịch hạt nhân mới"
 
+#. Tag: para
 #: post-install.xml:501
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Why would someone want to compile a new kernel? It is often not necessary "
-#| "since the default kernel shipped with Debian handles most configurations. "
-#| "Also, Debian often offers several alternative kernels. So you may want to "
-#| "check first if there is an alternative kernel image package that better "
-#| "corresponds to your hardware. However, it can be useful to compile a new "
-#| "kernel in order to:"
 msgid ""
 "Why would someone want to compile a new kernel? It is often not necessary "
 "since the default kernel shipped with &debian; handles most configurations. "
@@ -836,11 +798,15 @@ msgid ""
 "corresponds to your hardware. However, it can be useful to compile a new "
 "kernel in order to:"
 msgstr ""
-"Tại sao biên dịch hạt nhân mới? Thường không cần, vì hạt nhân mặc định có sẵn trong &debian; có khả năng quản lý hậu hết cấu hình máy tính. Hơn nữa, &debian; cung cấp vài hạt nhân xen kẽ. Vì vậy trước tiên, khuyên bạn kiểm tra xem nếu có một gói ảnh hạt nhân xen kẽ thích hợp hơn với phần cứng của mình. Tuy nhiên, có thể là hữu ích khi biên dịch một hạt nhân mới để:"
+"Tại sao biên dịch hạt nhân mới? Thường không cần, vì hạt nhân mặc định có "
+"sẵn trong &debian; có khả năng quản lý hậu hết cấu hình máy tính. Hơn nữa, "
+"&debian; cung cấp vài hạt nhân xen kẽ. Vì vậy trước tiên, khuyên bạn kiểm "
+"tra xem nếu có một gói ảnh hạt nhân xen kẽ thích hợp hơn với phần cứng của "
+"mình. Tuy nhiên, có thể là hữu ích khi biên dịch một hạt nhân mới để:"
 
+#. Tag: para
 #: post-install.xml:511
 #, no-c-format
-#. Tag: para
 msgid ""
 "handle special hardware needs, or hardware conflicts with the pre-supplied "
 "kernels"
@@ -848,9 +814,9 @@ msgstr ""
 "quản lý vấn đề phần cứng đặc biệt, hoặc chỉnh sửa sự xung đột giữa phần cứng "
 "và hạt nhân có sẵn"
 
+#. Tag: para
 #: post-install.xml:517
 #, no-c-format
-#. Tag: para
 msgid ""
 "use options of the kernel which are not supported in the pre-supplied "
 "kernels (such as high memory support)"
@@ -858,53 +824,47 @@ msgstr ""
 "sử dụng tùy chọn hạt nhân nào chưa được hỗ trợ trong hạt nhân có sẵn (như "
 "khả năng hỗ trợ bộ nhớ cao)"
 
+#. Tag: para
 #: post-install.xml:523
 #, no-c-format
-#. Tag: para
 msgid "optimize the kernel by removing useless drivers to speed up boot time"
 msgstr ""
 "tối ưu hóa hạt nhân bằng cách gỡ bỏ các trình điều khiển vô ích, để tăng tốc "
 "độ khởi động"
 
+#. Tag: para
 #: post-install.xml:528
 #, no-c-format
-#. Tag: para
 msgid "create a monolithic instead of a modularized kernel"
 msgstr "tạo hạt nhân cả một phần, thay cho hạt nhân chứa nhiều mô-đun riêng"
 
+#. Tag: para
 #: post-install.xml:533
 #, no-c-format
-#. Tag: para
 msgid "run an updated or development kernel"
 msgstr "chạy hạt nhân đã cập nhật hay hạt nhân phiên bản phát triển"
 
+#. Tag: para
 #: post-install.xml:538
 #, no-c-format
-#. Tag: para
 msgid "learn more about linux kernels"
 msgstr "học biết thêm về hạt nhân Linux"
 
+#. Tag: title
 #: post-install.xml:547
 #, no-c-format
-#. Tag: title
 msgid "Kernel Image Management"
 msgstr "Quản lý ảnh hạt nhân"
 
+#. Tag: para
 #: post-install.xml:548
 #, no-c-format
-#. Tag: para
 msgid "Don't be afraid to try compiling the kernel. It's fun and profitable."
 msgstr "Đừng sợ thử biên dịch hạt nhân: kinh nghiệm này là thú vị và hữu dụng."
 
+#. Tag: para
 #: post-install.xml:552
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "To compile a kernel the Debian way, you need some packages: "
-#| "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
-#| "<classname>linux-source-2.6</classname> and a few others which are "
-#| "probably already installed (see <filename>/usr/share/doc/kernel-package/"
-#| "README.gz</filename> for the complete list)."
 msgid ""
 "To compile a kernel the &debian; way, you need some packages: "
 "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
@@ -914,11 +874,13 @@ msgid ""
 msgstr ""
 "Để biên dịch một hạt nhân bằng cách &debian;, bạn cần lấy một số gói: "
 "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
-"<classname>linux-source-2.6</classname> và một số gói khác rất có thể đã được cài đặt (xem tài liệu Đọc Đi <filename>/usr/share/doc/kernel-package/README.gz</filename> để tìm danh sách đầy đủ)."
+"<classname>linux-source-2.6</classname> và một số gói khác rất có thể đã "
+"được cài đặt (xem tài liệu Đọc Đi <filename>/usr/share/doc/kernel-package/"
+"README.gz</filename> để tìm danh sách đầy đủ)."
 
+#. Tag: para
 #: post-install.xml:561
 #, no-c-format
-#. Tag: para
 msgid ""
 "This method will make a .deb of your kernel source, and, if you have non-"
 "standard modules, make a synchronized dependent .deb of those too. It's a "
@@ -931,16 +893,9 @@ msgstr ""
 "<filename>/boot</filename> sẽ chứa hạt nhân, tập tin « System.map », và bản "
 "ghi của tập tin cấu hình hoạt động của bản xâu dựng đó."
 
+#. Tag: para
 #: post-install.xml:569
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
-#| "<quote>Debian way</quote>; but we find that using the packaging system to "
-#| "manage your kernel is actually safer and easier. In fact, you can get "
-#| "your kernel sources right from Linus instead of <classname>linux-"
-#| "source-2.6</classname>, yet still use the <classname>kernel-package</"
-#| "classname> compilation method."
 msgid ""
 "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
 "<quote>&debian; way</quote>; but we find that using the packaging system to "
@@ -949,11 +904,16 @@ msgid ""
 "classname>, yet still use the <classname>kernel-package</classname> "
 "compilation method."
 msgstr ""
-"Ghi chú rằng bạn không <emphasis>cần phải</emphasis> biên dịch hạt nhân bằng <quote>cách &debian;</quote>; nhưng mà chúng tôi cho là dễ hơn và an toàn hơn khi sử dụng hệ thống quản lý gói để quản lý hạt nhân riêng. Tức là, bạn có thể lấy mã nguồn hạt nhân một cách trực tiếp từ bác Linus thay cho <classname>linux-source-2.6</classname>, còn vẫn sử dụng phương pháp biên dịch <classname>kernel-package</classname>."
+"Ghi chú rằng bạn không <emphasis>cần phải</emphasis> biên dịch hạt nhân bằng "
+"<quote>cách &debian;</quote>; nhưng mà chúng tôi cho là dễ hơn và an toàn "
+"hơn khi sử dụng hệ thống quản lý gói để quản lý hạt nhân riêng. Tức là, bạn "
+"có thể lấy mã nguồn hạt nhân một cách trực tiếp từ bác Linus thay cho "
+"<classname>linux-source-2.6</classname>, còn vẫn sử dụng phương pháp biên "
+"dịch <classname>kernel-package</classname>."
 
+#. Tag: para
 #: post-install.xml:578
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that you'll find complete documentation on using <classname>kernel-"
 "package</classname> under <filename>/usr/share/doc/kernel-package</"
@@ -963,9 +923,9 @@ msgstr ""
 "package</classname> nằm dưới thư mục <filename>/usr/share/doc/kernel-"
 "package</filename>. Tiết đoạn này chỉ chứa trợ lý hướng dẫn vắn thôi."
 
+#. Tag: para
 #: post-install.xml:585
 #, no-c-format
-#. Tag: para
 msgid ""
 "Hereafter, we'll assume you have free rein over your machine and will "
 "extract your kernel source to somewhere in your home directory<footnote> "
@@ -989,22 +949,9 @@ msgstr ""
 "bz2</userinput> và chuyển đổi sang thư mục <filename>linux-source-"
 "&kernelversion;</filename> mới tạo."
 
+#. Tag: para
 #: post-install.xml:605
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Now, you can configure your kernel. Run <userinput>make xconfig</"
-#| "userinput> if X11 is installed, configured and being run; run "
-#| "<userinput>make menuconfig</userinput> otherwise (you'll need "
-#| "<classname>libncurses5-dev</classname> installed). Take the time to read "
-#| "the online help and choose carefully. When in doubt, it is typically "
-#| "better to include the device driver (the software which manages hardware "
-#| "peripherals, such as Ethernet cards, SCSI controllers, and so on) you are "
-#| "unsure about. Be careful: other options, not related to a specific "
-#| "hardware, should be left at the default value if you do not understand "
-#| "them. Do not forget to select <quote>Kernel module loader</quote> in "
-#| "<quote>Loadable module support</quote> (it is not selected by default). "
-#| "If not included, your Debian installation will experience problems."
 msgid ""
 "Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
 "if X11 is installed, configured and being run; run <userinput>make "
@@ -1019,13 +966,22 @@ msgid ""
 "selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
-"Này bạn có thể cấu hình hạt nhân mới. Nếu bạn đã cài đặt và cấu hình X11, và nó đang chạy, thì chạy câu lệnh <userinput>make xconfig</userinput>; không thì chạy câu lệnh <userinput>make menuconfig</userinput> (yêu cầu cài đặt gói <classname>libncurses5-dev</classname>). Bạn nên mất thời gian để "
-"đọc trợ giúp trực tuyến, và chọn cẩn thận. Khi chưa chắc, khuyên bạn bao gồm trình điều khiển thiết bị (phần mềm quản lý phần cứng ngoại vi: thẻ Ethernet, bộ điều khiển SCSI v.v.) bổ sung. Lại cẩn thận: các tùy chọn khác mà không liên quan đến phần cứng đặc trưng nên vẫn giữ giá trị mặc định nếu bạn không hiểu trường hợp tương ứng. Đừng quên chọn <quote>Kernel module loader</quote> (bộ nạp mô-đun hạt nhân) trong phần <quote>Loadable module support</quote> (khả năng hỗ trợ mô-đun nạp được): "
-"mặc định là nó chưa chọn. Quên thì bản cài đặt &debian; sẽ gặp vấn đề."
+"Này bạn có thể cấu hình hạt nhân mới. Nếu bạn đã cài đặt và cấu hình X11, và "
+"nó đang chạy, thì chạy câu lệnh <userinput>make xconfig</userinput>; không "
+"thì chạy câu lệnh <userinput>make menuconfig</userinput> (yêu cầu cài đặt "
+"gói <classname>libncurses5-dev</classname>). Bạn nên mất thời gian để đọc "
+"trợ giúp trực tuyến, và chọn cẩn thận. Khi chưa chắc, khuyên bạn bao gồm "
+"trình điều khiển thiết bị (phần mềm quản lý phần cứng ngoại vi: thẻ "
+"Ethernet, bộ điều khiển SCSI v.v.) bổ sung. Lại cẩn thận: các tùy chọn khác "
+"mà không liên quan đến phần cứng đặc trưng nên vẫn giữ giá trị mặc định nếu "
+"bạn không hiểu trường hợp tương ứng. Đừng quên chọn <quote>Kernel module "
+"loader</quote> (bộ nạp mô-đun hạt nhân) trong phần <quote>Loadable module "
+"support</quote> (khả năng hỗ trợ mô-đun nạp được): mặc định là nó chưa chọn. "
+"Quên thì bản cài đặt &debian; sẽ gặp vấn đề."
 
+#. Tag: para
 #: post-install.xml:620
 #, no-c-format
-#. Tag: para
 msgid ""
 "Clean the source tree and reset the <classname>kernel-package</classname> "
 "parameters. To do that, do <userinput>make-kpkg clean</userinput>."
@@ -1034,9 +990,9 @@ msgstr ""
 "package</classname>. Để làm như thế, hãy chạy lệnh <userinput>make-kpkg "
 "clean</userinput>."
 
+#. Tag: para
 #: post-install.xml:625
 #, no-c-format
-#. Tag: para
 msgid ""
 "Now, compile the kernel: <userinput>fakeroot make-kpkg --initrd --"
 "revision=custom.1.0 kernel_image</userinput>. The version number of "
@@ -1052,9 +1008,9 @@ msgstr ""
 "quote> (riêng) bằng bất cứ từ khác nào (v.d. tên máy). Tiến trình biên dịch "
 "hạt nhân có thể hơi lâu, tùy thuộc vào tốc độ của máy tính."
 
+#. Tag: para
 #: post-install.xml:635
 #, no-c-format
-#. Tag: para
 msgid ""
 "Once the compilation is complete, you can install your custom kernel like "
 "any package. As root, do <userinput>dpkg -i ../&kernelpackage;-"
@@ -1085,9 +1041,9 @@ msgstr ""
 "cập nhật tự động bộ nạp khởi động để sử dụng hạt nhân mới. Nếu bạn đã tạo "
 "một gói modules (các mô-đun), bạn cũng cần phải cài đặt nó."
 
+#. Tag: para
 #: post-install.xml:655
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is time to reboot the system: read carefully any warning that the above "
 "step may have produced, then <userinput>shutdown -r now</userinput>."
@@ -1096,32 +1052,30 @@ msgstr ""
 "trước mới tạo, rồi chạy lệnh <userinput>shutdown -r now</userinput> (tắt bây "
 "giờ, rồi khởi động lại)."
 
+#. Tag: para
 #: post-install.xml:660
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For more information on Debian kernels and kernel compilation, see the "
-#| "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</"
-#| "ulink>. For more information on <classname>kernel-package</classname>, "
-#| "read the fine documentation in <filename>/usr/share/doc/kernel-package</"
-#| "filename>."
 msgid ""
 "For more information on &debian; kernels and kernel compilation, see the "
 "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink>. "
 "For more information on <classname>kernel-package</classname>, read the fine "
 "documentation in <filename>/usr/share/doc/kernel-package</filename>."
 msgstr ""
-"Để tìm thêm thông tin về hạt nhân &debian; và phương pháp biên dịch hạt nhân, xem Sổ Tay Hạt Nhân Linux &debian; (<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink>). Còn để tìm chi tiết về gói hạt nhân <classname>kernel-package</classname>, đọc những tài liệu hướng dẫn chi tiết nằm trong thư mục <filename>/usr/share/doc/kernel-package</filename>."
+"Để tìm thêm thông tin về hạt nhân &debian; và phương pháp biên dịch hạt "
+"nhân, xem Sổ Tay Hạt Nhân Linux &debian; (<ulink url=\"&url-kernel-handbook;"
+"\">Debian Linux Kernel Handbook</ulink>). Còn để tìm chi tiết về gói hạt "
+"nhân <classname>kernel-package</classname>, đọc những tài liệu hướng dẫn chi "
+"tiết nằm trong thư mục <filename>/usr/share/doc/kernel-package</filename>."
 
+#. Tag: title
 #: post-install.xml:676
 #, no-c-format
-#. Tag: title
 msgid "Recovering a Broken System"
 msgstr "Phục hồi hệ thống bị hỏng"
 
+#. Tag: para
 #: post-install.xml:677
 #, no-c-format
-#. Tag: para
 msgid ""
 "Sometimes, things go wrong, and the system you've carefully installed is no "
 "longer bootable. Perhaps the boot loader configuration broke while trying "
@@ -1136,9 +1090,9 @@ msgstr ""
 "rất lạ đã xảy ra, bạn chưa biết sao. Trong mọi trường hợp đều, bạn cần có hệ "
 "thống hoạt động trong khi sửa điều bị hỏng thì chế độ cứu có ích."
 
+#. Tag: para
 #: post-install.xml:687
 #, no-c-format
-#. Tag: para
 msgid ""
 "To access rescue mode, type <userinput>rescue</userinput> at the "
 "<prompt>boot:</prompt> prompt, or boot with the <userinput>rescue/"
@@ -1159,9 +1113,9 @@ msgstr ""
 "trong trình cài đặt để chắc là các đĩa, thiết bị mạng v.v. sẵn sàng cho bạn "
 "trong khi sửa chữa hệ thống."
 
+#. Tag: para
 #: post-install.xml:702
 #, no-c-format
-#. Tag: para
 msgid ""
 "Instead of the partitioning tool, you should now be presented with a list of "
 "the partitions on your system, and asked to select one of them. Normally, "
@@ -1175,16 +1129,9 @@ msgstr ""
 "khả năng chọn phân vùng nằm trên thiết bị kiểu RAID và LVM cũng như điều "
 "được tạo trực tiếp trên đĩa."
 
+#. Tag: para
 #: post-install.xml:710
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If possible, the installer will now present you with a shell prompt in "
-#| "the file system you selected, which you can use to perform any necessary "
-#| "repairs. <phrase arch=\"x86\"> For example, if you need to reinstall the "
-#| "GRUB boot loader into the master boot record of the first hard disk, you "
-#| "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
-#| "so. </phrase>"
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
 "file system you selected, which you can use to perform any necessary "
@@ -1193,12 +1140,15 @@ msgid ""
 "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
 "so. </phrase>"
 msgstr ""
-"Nếu có thể, trình cài đặt lúc bây giờ hiển thị một dấu nhắc trình bao trong hệ thống tập tin đã chọn, cho bạn thực hiện việc sửa chữa nào yêu cầu. <phrase arch=\"any-x86\"> Ví dụ, nếu bạn cần phải cài đặt lại bộ nạp khởi động GRUB vào mục ghi khởi động cái của đĩa cứng thứ nhất, bạn có thể gõ câu lệnh "
-"<userinput>grub-install '(hd0)'</userinput> để làm như thế. </phrase>"
+"Nếu có thể, trình cài đặt lúc bây giờ hiển thị một dấu nhắc trình bao trong "
+"hệ thống tập tin đã chọn, cho bạn thực hiện việc sửa chữa nào yêu cầu. "
+"<phrase arch=\"any-x86\"> Ví dụ, nếu bạn cần phải cài đặt lại bộ nạp khởi "
+"động GRUB vào mục ghi khởi động cái của đĩa cứng thứ nhất, bạn có thể gõ câu "
+"lệnh <userinput>grub-install '(hd0)'</userinput> để làm như thế. </phrase>"
 
+#. Tag: para
 #: post-install.xml:722
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the installer cannot run a usable shell in the root file system you "
 "selected, perhaps because the file system is corrupt, then it will issue a "
@@ -1214,17 +1164,17 @@ msgstr ""
 "thống tập tin gốc mới chọn sẽ được gắn kết vào thư mục <filename>/target</"
 "filename>."
 
+#. Tag: para
 #: post-install.xml:731
 #, no-c-format
-#. Tag: para
 msgid "In either case, after you exit the shell, the system will reboot."
 msgstr ""
 "Trong mỗi trường hợp, sau khi bạn thoát khỏi trình bao, hệ thống sẽ khởi "
 "động lại."
 
+#. Tag: para
 #: post-install.xml:735
 #, no-c-format
-#. Tag: para
 msgid ""
 "Finally, note that repairing broken systems can be difficult, and this "
 "manual does not attempt to go into all the things that might have gone wrong "
diff --git a/po/vi/preface.po b/po/vi/preface.po
index 85f497584..427fc5cce 100644
--- a/po/vi/preface.po
+++ b/po/vi/preface.po
@@ -17,21 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: preface.xml:5
 #, no-c-format
-#. Tag: title
 msgid "Installing &debian-gnu; &release; For &architecture;"
 msgstr "Cài đặt &release; &debian-gnu; trên &architecture;"
 
+#. Tag: para
 #: preface.xml:6
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "We are delighted that you have decided to try Debian, and are sure that "
-#| "you will find that Debian's GNU/&arch-kernel; distribution is unique. "
-#| "&debian-gnu; brings together high-quality free software from around the "
-#| "world, integrating it into a coherent whole. We believe that you will "
-#| "find that the result is truly more than the sum of the parts."
 msgid ""
 "We are delighted that you have decided to try &debian;, and are sure that "
 "you will find that &debian;'s GNU/&arch-kernel; distribution is unique. "
@@ -39,19 +33,15 @@ msgid ""
 "world, integrating it into a coherent whole. We believe that you will find "
 "that the result is truly more than the sum of the parts."
 msgstr ""
-"Chúng tôi rất vui thích thấy biết rằng bạn chọn thử sử dụng &debian;; chúng tôi cũng chắc chắn là bạn sẽ tìm thấy bản phát hành GNU/&arch-kernel; của &debian; là duy nhất. &debian-gnu; tập hợp phần mềm có chất lượng cao từ trên khắp thế giới, hợp nhất nó vào một toàn bộ mạch lạc. Chúng tôi cho rằng bạn sẽ tìm biết là kết quả này thực sự lớn hơn tổng số các phần."
+"Chúng tôi rất vui thích thấy biết rằng bạn chọn thử sử dụng &debian;; chúng "
+"tôi cũng chắc chắn là bạn sẽ tìm thấy bản phát hành GNU/&arch-kernel; của "
+"&debian; là duy nhất. &debian-gnu; tập hợp phần mềm có chất lượng cao từ "
+"trên khắp thế giới, hợp nhất nó vào một toàn bộ mạch lạc. Chúng tôi cho rằng "
+"bạn sẽ tìm biết là kết quả này thực sự lớn hơn tổng số các phần."
 
+#. Tag: para
 #: preface.xml:15
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "We understand that many of you want to install Debian without reading "
-#| "this manual, and the Debian installer is designed to make this possible. "
-#| "If you don't have time to read the whole Installation Guide right now, we "
-#| "recommend that you read the Installation Howto, which will walk you "
-#| "through the basic installation process, and links to the manual for more "
-#| "advanced topics or for when things go wrong. The Installation Howto can "
-#| "be found in <xref linkend=\"installation-howto\"/>."
 msgid ""
 "We understand that many of you want to install &debian; without reading this "
 "manual, and the &debian; installer is designed to make this possible. If you "
@@ -61,12 +51,17 @@ msgid ""
 "for when things go wrong. The Installation Howto can be found in <xref "
 "linkend=\"installation-howto\"/>."
 msgstr ""
-"Có thể là bạn muốn cài đặt &debian; mà không đọc sổ tay này: trình cài đặt &debian; được thiết kế để cho bạn có khả năng này. Nếu bạn lúc này không có đủ rảnh đọc toàn bộ Sổ Tay Cài Đặt ngay bây giờ, khuyên bạn đọc ít nhất tài liệu Cài Đặt Thế Nào, mà hướng dẫn bạn qua tiến trình cài đặt cơ bản, cung cấp nhiều liên kết đến sổ tay về chủ đề cấp cao hoặc về thông tin giải đáp thắc mắc. Tài liệu Cài "
-"Đặt Thế Nào nằm trong <xref linkend=\"installation-howto\"/>."
+"Có thể là bạn muốn cài đặt &debian; mà không đọc sổ tay này: trình cài đặt "
+"&debian; được thiết kế để cho bạn có khả năng này. Nếu bạn lúc này không có "
+"đủ rảnh đọc toàn bộ Sổ Tay Cài Đặt ngay bây giờ, khuyên bạn đọc ít nhất tài "
+"liệu Cài Đặt Thế Nào, mà hướng dẫn bạn qua tiến trình cài đặt cơ bản, cung "
+"cấp nhiều liên kết đến sổ tay về chủ đề cấp cao hoặc về thông tin giải đáp "
+"thắc mắc. Tài liệu Cài Đặt Thế Nào nằm trong <xref linkend=\"installation-"
+"howto\"/>."
 
+#. Tag: para
 #: preface.xml:25
 #, no-c-format
-#. Tag: para
 msgid ""
 "With that said, we hope that you have the time to read most of this manual, "
 "and doing so will lead to a more informed and likely more successful "
diff --git a/po/vi/preparing.po b/po/vi/preparing.po
index 62c28d259..e75b55e68 100644
--- a/po/vi/preparing.po
+++ b/po/vi/preparing.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-23 19:59+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,52 +17,45 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: preparing.xml:5
 #, no-c-format
-#. Tag: title
 msgid "Before Installing &debian-gnu;"
 msgstr "Trước khi cài đặt &debian-gnu;"
 
+#. Tag: para
 #: preparing.xml:6
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This chapter deals with the preparation for installing Debian before you "
-#| "even boot the installer. This includes backing up your data, gathering "
-#| "information about your hardware, and locating any necessary information."
 msgid ""
 "This chapter deals with the preparation for installing &debian; before you "
 "even boot the installer. This includes backing up your data, gathering "
 "information about your hardware, and locating any necessary information."
 msgstr ""
-"Chương này diễn tả cách chuẩn bị để cài đặt hệ thống &debian;, trước khi bạn ngay "
-"cả khởi động trình cài đặt. Gồm có tiến trình sao lưu dữ liệu, tập hợp "
+"Chương này diễn tả cách chuẩn bị để cài đặt hệ thống &debian;, trước khi bạn "
+"ngay cả khởi động trình cài đặt. Gồm có tiến trình sao lưu dữ liệu, tập hợp "
 "thông tin về phần cứng, và tìm thông tin khác nào cần thiết."
 
+#. Tag: title
 #: preparing.xml:19
 #, no-c-format
-#. Tag: title
 msgid "Overview of the Installation Process"
 msgstr "Toàn cảnh tiến trình cài đặt"
 
+#. Tag: para
 #: preparing.xml:20
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "First, just a note about re-installations. With Debian, a circumstance "
-#| "that will require a complete re-installation of your system is very rare; "
-#| "perhaps mechanical failure of the hard disk would be the most common case."
 msgid ""
 "First, just a note about re-installations. With &debian;, a circumstance "
 "that will require a complete re-installation of your system is very rare; "
 "perhaps mechanical failure of the hard disk would be the most common case."
 msgstr ""
-"Trước tiên có chú thích về việc cài đặt lại. Đối với hệ thống &debian;, có rất "
-"ít trường hợp yêu cầu cài đặt lại toàn bộ hệ thống (v.d. cơ chế đĩa cứng thất bại)."
+"Trước tiên có chú thích về việc cài đặt lại. Đối với hệ thống &debian;, có "
+"rất ít trường hợp yêu cầu cài đặt lại toàn bộ hệ thống (v.d. cơ chế đĩa cứng "
+"thất bại)."
 
+#. Tag: para
 #: preparing.xml:27
 #, no-c-format
-#. Tag: para
 msgid ""
 "Many common operating systems may require a complete installation to be "
 "performed when critical failures take place or for upgrades to new OS "
@@ -74,20 +67,9 @@ msgstr ""
 "HĐH mới. Thậm chí nếu không cần thiết cài đặt lại hoàn toàn, thường bạn phải "
 "cài đặt lại các chương trình để hoạt động cho đúng trên HĐH mới."
 
+#. Tag: para
 #: preparing.xml:35
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Under &debian-gnu;, it is much more likely that your OS can be repaired "
-#| "rather than replaced if things go wrong. Upgrades never require a "
-#| "wholesale installation; you can always upgrade in-place. And the programs "
-#| "are almost always compatible with successive OS releases. If a new "
-#| "program version requires newer supporting software, the Debian packaging "
-#| "system ensures that all the necessary software is automatically "
-#| "identified and installed. The point is, much effort has been put into "
-#| "avoiding the need for re-installation, so think of it as your very last "
-#| "option. The installer is <emphasis>not</emphasis> designed to re-install "
-#| "over an existing system."
 msgid ""
 "Under &debian-gnu;, it is much more likely that your OS can be repaired "
 "rather than replaced if things go wrong. Upgrades never require a wholesale "
@@ -99,22 +81,28 @@ msgid ""
 "installation, so think of it as your very last option. The installer is "
 "<emphasis>not</emphasis> designed to re-install over an existing system."
 msgstr ""
-"Gặp vấn đề dưới &debian-gnu;, thì rất có thể là hệ điều hành có thể được sửa chữa, thay vào "
-"bị thay thế. Tiến trình nâng cấp không bao giờ yêu cầu bạn cài đặt lại hoàn toàn: lúc nào bạn cũng có thể nâng cấp « tại chỗ ». Hơn nữa, hậu hết chương trình vẫn còn tương thích với bản "
-"phát hành HĐH mới. Nếu một phiên bản chương trình mới nào đó cũng yêu cầu phần mềm hỗ "
-"trợ mới, hệ thống quản lý gói &debian; đảm bảo là tất cả phần mềm cần thiết được tự động nhận diện và cài đặt. Điểm quan trọng là rất nhiều sự cố gắng đã được đóng góp để tránh yêu cầu cài đặt lại, vì vậy bạn nên thấy việc đó là tùy chọn cuối cùng. Trình cài đặt &debian; <emphasis>không phải</emphasis> được thiết kế để cài đặt lại trên một hệ thống đã có."
+"Gặp vấn đề dưới &debian-gnu;, thì rất có thể là hệ điều hành có thể được sửa "
+"chữa, thay vào bị thay thế. Tiến trình nâng cấp không bao giờ yêu cầu bạn "
+"cài đặt lại hoàn toàn: lúc nào bạn cũng có thể nâng cấp « tại chỗ ». Hơn "
+"nữa, hậu hết chương trình vẫn còn tương thích với bản phát hành HĐH mới. Nếu "
+"một phiên bản chương trình mới nào đó cũng yêu cầu phần mềm hỗ trợ mới, hệ "
+"thống quản lý gói &debian; đảm bảo là tất cả phần mềm cần thiết được tự động "
+"nhận diện và cài đặt. Điểm quan trọng là rất nhiều sự cố gắng đã được đóng "
+"góp để tránh yêu cầu cài đặt lại, vì vậy bạn nên thấy việc đó là tùy chọn "
+"cuối cùng. Trình cài đặt &debian; <emphasis>không phải</emphasis> được thiết "
+"kế để cài đặt lại trên một hệ thống đã có."
 
+#. Tag: para
 #: preparing.xml:48
 #, no-c-format
-#. Tag: para
 msgid ""
 "Here's a road map for the steps you will take during the installation "
 "process."
 msgstr "Đây là các bước chính bạn nên theo trong tiến trình cài đặt."
 
+#. Tag: para
 #: preparing.xml:56
 #, no-c-format
-#. Tag: para
 msgid ""
 "Back up any existing data or documents on the hard disk where you plan to "
 "install."
@@ -122,9 +110,9 @@ msgstr ""
 "Sao lưu mọi dữ liệu hay tài liệu hiện thời nằm trên đĩa cứng nơi bạn định "
 "cài đặt Debian."
 
+#. Tag: para
 #: preparing.xml:62
 #, no-c-format
-#. Tag: para
 msgid ""
 "Gather information about your computer and any needed documentation, before "
 "starting the installation."
@@ -132,86 +120,78 @@ msgstr ""
 "Tập hợp thông tin về máy tính đích, và tài liệu hướng dẫn nào cần thiết, "
 "trước khi khởi chạy tiến trình cài đặt."
 
+#. Tag: para
 #: preparing.xml:68
 #, no-c-format
-#. Tag: para
-#| msgid "Create partitionable space for Debian on your hard disk."
 msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "Trên đĩa cứng, tạo sức chứa có thể phân vùng được dành cho &debian;."
 
+#. Tag: para
 #: preparing.xml:73
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Locate and/or download the installer software and any specialized driver "
-#| "files your machine requires (except Debian CD users)."
 msgid ""
 "Locate and/or download the installer software and any specialized driver "
 "files your machine requires (except &debian; CD users)."
 msgstr ""
 "Tìm và/hay tải về phần mềm cài đặt &debian;, và tập tin trình điều khiển đặc "
-"biệt nào máy tính yêu cầu (người dùng đĩa CD &debian; nên bỏ qua bước "
-"này)."
+"biệt nào máy tính yêu cầu (người dùng đĩa CD &debian; nên bỏ qua bước này)."
 
+#. Tag: para
 #: preparing.xml:79
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Set up boot tapes/floppies/USB sticks, or place boot files (most Debian "
-#| "CD users can boot from one of the CDs)."
 msgid ""
 "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
-"Thiết lập băng hay đĩa mềm hay thanh USB có khả năng khởi động, hoặc để tập tin khởi động vào vị trí (hậu hết người dùng đĩa CD &debian; có khả năng khởi động từ một của những đĩa CD "
-"đó)."
+"Thiết lập băng hay đĩa mềm hay thanh USB có khả năng khởi động, hoặc để tập "
+"tin khởi động vào vị trí (hậu hết người dùng đĩa CD &debian; có khả năng "
+"khởi động từ một của những đĩa CD đó)."
 
+#. Tag: para
 #: preparing.xml:85
 #, no-c-format
-#. Tag: para
 msgid "Boot the installation system."
 msgstr "Khởi động hệ thống cài đặt."
 
+#. Tag: para
 #: preparing.xml:90
 #, no-c-format
-#. Tag: para
 msgid "Select the installation language."
 msgstr "Chọn ngôn ngữ cài đặt."
 
+#. Tag: para
 #: preparing.xml:95
 #, no-c-format
-#. Tag: para
 msgid "Activate the ethernet network connection, if available."
 msgstr "Kích hoạt sự kết nối mạng Ethernet, nếu có."
 
+#. Tag: para
 #: preparing.xml:101
 #, no-c-format
-#. Tag: para
 msgid "Configure one network interface."
 msgstr "Cấu hình một giao diện mạng."
 
+#. Tag: para
 #: preparing.xml:106
 #, no-c-format
-#. Tag: para
 msgid "Open an ssh connection to the new system."
 msgstr "Mở một sự kết nối SSH đến hệ thống mới."
 
+#. Tag: para
 #: preparing.xml:111
 #, no-c-format
-#. Tag: para
 msgid "Attach one or more DASDs (Direct Access Storage Device)."
 msgstr "Gắn một hay nhiều DASD (thiết bị cất giữ truy cập trực tiếp)."
 
+#. Tag: para
 #: preparing.xml:117
 #, no-c-format
-#. Tag: para
-#| msgid "Create and mount the partitions on which Debian will be installed."
 msgid "Create and mount the partitions on which &debian; will be installed."
 msgstr "Tạo và gắn kết những phân vùng nơi &debian; sẽ được cài đặt."
 
+#. Tag: para
 #: preparing.xml:122
 #, no-c-format
-#. Tag: para
 msgid ""
 "Watch the automatic download/install/setup of the <firstterm>base system</"
 "firstterm>."
@@ -219,9 +199,9 @@ msgstr ""
 "Theo dõi tiến trình tải về/cài đặt/thiết lập tự động <firstterm>hệ thống cơ "
 "bản</firstterm>."
 
+#. Tag: para
 #: preparing.xml:128
 #, no-c-format
-#. Tag: para
 msgid ""
 "Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; "
 "and/or your existing system."
@@ -229,20 +209,15 @@ msgstr ""
 "Cài đặt một <firstterm>bộ nạp khởi động</firstterm> có khả năng khởi chạy "
 "&debian-gnu; và/hay hệ thống đã có."
 
+#. Tag: para
 #: preparing.xml:134
 #, no-c-format
-#. Tag: para
 msgid "Load the newly installed system for the first time."
 msgstr "Tải lần đầu tiên hệ thống mới được cài đặt."
 
+#. Tag: para
 #: preparing.xml:141
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For &arch-title; you have the option of using <phrase arch=\"x86\">a</"
-#| "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical "
-#| "version of the installation system. For more information about this "
-#| "graphical installer, see <xref linkend=\"graphical\"/>."
 msgid ""
 "For &arch-title; you have the option of using <phrase arch=\"any-x86\">a</"
 "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical version "
@@ -250,11 +225,13 @@ msgid ""
 "installer, see <xref linkend=\"graphical\"/>."
 msgstr ""
 "Đối với &arch-title;, bạn có tùy chọn sử dụng <phrase arch=\"any-x86\">một</"
-"phrase><phrase arch=\"powerpc\">một kiểu thử nghiệm của</phrase> phiên bản đồ họa của hệ thống cài đặt. Để tìm thêm thông tin về bộ cài đặt đồ họa, xem <xref linkend=\"graphical\"/>."
+"phrase><phrase arch=\"powerpc\">một kiểu thử nghiệm của</phrase> phiên bản "
+"đồ họa của hệ thống cài đặt. Để tìm thêm thông tin về bộ cài đặt đồ họa, xem "
+"<xref linkend=\"graphical\"/>."
 
+#. Tag: para
 #: preparing.xml:149
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you have problems during the installation, it helps to know which "
 "packages are involved in which steps. Introducing the leading software "
@@ -263,9 +240,9 @@ msgstr ""
 "Nếu bạn gặp khó khăn trong tiến trình cài đặt, có ích khi biết bước nào sử "
 "dụng gói nào. Ở đây giới thiệu những gói phần mềm quan trọng nhất:"
 
+#. Tag: para
 #: preparing.xml:155
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installer software, <classname>debian-installer</classname>, is the "
 "primary concern of this manual. It detects hardware and loads appropriate "
@@ -285,9 +262,9 @@ msgstr ""
 "đặt này, nhưng trình <classname>debian-installer</classname> đã làm xong "
 "công việc khi bạn nạp lần đầu tiên hệ thống mới."
 
+#. Tag: para
 #: preparing.xml:167
 #, no-c-format
-#. Tag: para
 msgid ""
 "To tune the system to your needs, <classname>tasksel</classname> allows you "
 "to choose to install various predefined bundles of software like a Web "
@@ -297,9 +274,9 @@ msgstr ""
 "classname> cho bạn khả năng cài đặt một số phần mềm bó riêng, v.d. trình "
 "phục vụ Mạng hay môi trường làm việc."
 
+#. Tag: para
 #: preparing.xml:173
 #, no-c-format
-#. Tag: para
 msgid ""
 "One important option during the installation is whether or not to install a "
 "graphical desktop environment, consisting of the X Window System and one of "
@@ -318,9 +295,9 @@ msgstr ""
 "vì nhiều hệ thống &debian-gnu; là máy phục vụ không thật cần chạy giao diện "
 "người dùng đồ họa (GUI) để hoạt động."
 
+#. Tag: para
 #: preparing.xml:185
 #, no-c-format
-#. Tag: para
 msgid ""
 "Just be aware that the X Window System is completely separate from "
 "<classname>debian-installer</classname>, and in fact is much more "
@@ -332,15 +309,15 @@ msgstr ""
 "trình cài đặt hệ thống cửa sổ X và giải đáp thắc mắc về nó nằm ở ngoại phạm "
 "vi của sổ tay này."
 
+#. Tag: title
 #: preparing.xml:200
 #, no-c-format
-#. Tag: title
 msgid "Back Up Your Existing Data!"
 msgstr "Sao lưu mọi dữ liệu đã có đi !"
 
+#. Tag: para
 #: preparing.xml:201
 #, no-c-format
-#. Tag: para
 msgid ""
 "Before you start, make sure to back up every file that is now on your "
 "system. If this is the first time a non-native operating system has been "
@@ -363,9 +340,9 @@ msgstr ""
 "bạn nên suy tính mỗi đáp ứng và hành động riêng. Hai phút nghĩ có thể tiết "
 "kiệm nhiều tiếng làm việc thêm."
 
+#. Tag: para
 #: preparing.xml:214
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are creating a multi-boot system, make sure that you have the "
 "distribution media of any other present operating systems on hand. "
@@ -379,45 +356,40 @@ msgstr ""
 "đó, hoặc trong nhiều trường hợp, cài đặt lại toàn bộ HĐH đó và mọi tập tin "
 "nằm trong phần vùng bị tác động."
 
+#. Tag: title
 #: preparing.xml:232
 #, no-c-format
-#. Tag: title
 msgid "Information You Will Need"
 msgstr "Thông tin cần thiết"
 
+#. Tag: title
 #: preparing.xml:235
 #, no-c-format
-#. Tag: title
 msgid "Documentation"
 msgstr "Tài liệu hướng dẫn"
 
+#. Tag: title
 #: preparing.xml:238
 #, no-c-format
-#. Tag: title
 msgid "Installation Manual"
 msgstr "Sổ tay cài đặt"
 
+#. Tag: para
 #: preparing.xml:240
 #, no-c-format
-#. Tag: para
 msgid "This document you are now reading, in plain ASCII, HTML or PDF format."
 msgstr "Tài liệu này, dạng ASCII, HTML hay PDF."
 
 # Variable: don't translate / Biến: đừng dịch
+#. Tag: itemizedlist
 #: preparing.xml:246
 #, no-c-format
-#. Tag: itemizedlist
 msgid "&list-install-manual-files;"
 msgstr "&list-install-manual-files;"
 
+#. Tag: para
 #: preparing.xml:252
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The document you are now reading, which is the official version of the "
-#| "Installation Guide for the &releasename; release of Debian; available in "
-#| "<ulink url=\"&url-release-area;/installmanual\">various formats and "
-#| "translations</ulink>."
 msgid ""
 "The document you are now reading, which is the official version of the "
 "Installation Guide for the &releasename; release of &debian;; available in "
@@ -425,16 +397,12 @@ msgid ""
 "translations</ulink>."
 msgstr ""
 "Tài liệu này, phiên bản chính thức của Sổ Tay Cài Đặt bản phát hành "
-"&releasename; của &debian;, được công bố bằng nhiều <ulink url=\"&url-release-"
-"area;/installmanual\">dạng thức và bản dịch</ulink> khác nhau."
+"&releasename; của &debian;, được công bố bằng nhiều <ulink url=\"&url-"
+"release-area;/installmanual\">dạng thức và bản dịch</ulink> khác nhau."
 
+#. Tag: para
 #: preparing.xml:261
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The document you are now reading, which is a development version of the "
-#| "Installation Guide for the next release of Debian; available in <ulink "
-#| "url=\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgid ""
 "The document you are now reading, which is a development version of the "
 "Installation Guide for the next release of &debian;; available in <ulink url="
@@ -444,63 +412,60 @@ msgstr ""
 "kế tiếp, được công bố bằng nhiều <ulink url=\"&url-d-i-alioth-manual;\">dạng "
 "thức và bản dịch</ulink> khác nhau."
 
+#. Tag: title
 #: preparing.xml:273
 #, no-c-format
-#. Tag: title
 msgid "Hardware documentation"
 msgstr "Tài liệu hướng dẫn về phần cứng"
 
+#. Tag: para
 #: preparing.xml:274
 #, no-c-format
-#. Tag: para
 msgid ""
 "Often contains useful information on configuring or using your hardware."
 msgstr "Thường chứa thông tin có ích về cách cấu hình hay sử dụng phần cứng."
 
+#. Tag: ulink
 #: preparing.xml:285
 #, no-c-format
-#. Tag: ulink
 msgid "Linux Hardware Compatibility HOWTO"
 msgstr "Phần Cứng Tương Thích với Linux Thế Nào"
 
+#. Tag: ulink
 #: preparing.xml:291
 #, no-c-format
-#. Tag: ulink
 msgid "Linux for SPARC Processors FAQ"
 msgstr "Hỏi Đáp Linux cho bộ xử lý SPARC"
 
+#. Tag: ulink
 #: preparing.xml:297
 #, no-c-format
-#. Tag: ulink
 msgid "Linux/Mips website"
 msgstr "Nơi Mạng Linux/Mips"
 
+#. Tag: title
 #: preparing.xml:306
 #, no-c-format
-#. Tag: title
 msgid "&arch-title; Hardware References"
 msgstr "Tham Chiếu Phần Cứng &arch-title;"
 
+#. Tag: para
 #: preparing.xml:307
 #, no-c-format
-#. Tag: para
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"Hướng dẫn cài đặt và trình điều khiển thiết bị (DASD, XPRAM, bàn giao tiếp, "
-"băng, mật mã z90, chandev, mạng) khi chạy Linux trên &arch-title; bằng hạt "
-"nhân phiên bản 2.4"
 
-#: preparing.xml:319
-#, no-c-format
 #. Tag: ulink
-msgid "Device Drivers and Installation Commands"
-msgstr "Trình điều khiển thiết bị và lệnh cài đặt"
-
-#: preparing.xml:324
+#: preparing.xml:318
 #, no-c-format
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
+
 #. Tag: para
+#: preparing.xml:323
+#, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
 "&arch-title; hardware."
@@ -508,43 +473,39 @@ msgstr ""
 "Quyển Đỏ (Redbook) IBM diễn tả cách tổ hợp Linux với z/VM trên phần cứng "
 "zSeries và &arch-title;."
 
-#: preparing.xml:334
-#, no-c-format
 #. Tag: ulink
+#: preparing.xml:333
+#, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "Chạy Linux trên &arch-title;"
 
-#: preparing.xml:340
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "IBM Redbook describing the Linux distributions available for the "
-#| "mainframe. It has no chapter about Debian but the basic installation "
-#| "concepts are the same across all &arch-title; distributions."
+#: preparing.xml:339
+#, no-c-format
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
 "It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "Quyển Đỏ (Redbook) IBM diễn tả các bản phát hành Linux sẵn sàng cho máy tính "
-"lớn. Quyển này không có chương riêng về &debian;, nhưng mà những khái niệm cài "
-"đặt cơ bản vẫn thích hợp với mọi bản phát hành &arch-title;."
+"lớn. Quyển này không có chương riêng về &debian;, nhưng mà những khái niệm "
+"cài đặt cơ bản vẫn thích hợp với mọi bản phát hành &arch-title;."
 
-#: preparing.xml:351
-#, no-c-format
 #. Tag: ulink
+#: preparing.xml:350
+#, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Chạy Linux trên IBM eServer zSeries và &arch-title;: bản phát hành"
 
-#: preparing.xml:361
-#, no-c-format
 #. Tag: title
+#: preparing.xml:360
+#, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "Tìm nguồn thông tin về phần cứng"
 
-#: preparing.xml:362
-#, no-c-format
 #. Tag: para
+#: preparing.xml:361
+#, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
 "hardware. But to be prepared, we do recommend familiarizing yourself with "
@@ -554,21 +515,21 @@ msgstr ""
 "cứng riêng của bạn. Để chuẩn bị được, khuyên bạn quen với phần cứng đó trước "
 "khi cài đặt."
 
-#: preparing.xml:368
-#, no-c-format
 #. Tag: para
+#: preparing.xml:367
+#, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "Có thể tập hợp thông tin về phần cứng từ :"
 
-#: preparing.xml:375
-#, no-c-format
 #. Tag: para
+#: preparing.xml:374
+#, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "Sổ tay có sẵn với mỗi phần cứng."
 
-#: preparing.xml:380
-#, no-c-format
 #. Tag: para
+#: preparing.xml:379
+#, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
 "start your computer by pressing a combination of keys. Check your manual for "
@@ -579,22 +540,22 @@ msgstr ""
 "để tìm biết tổ hợp phím này. Thường nó đơn giản là phím <keycap>Delete</"
 "keycap>."
 
-#: preparing.xml:387
-#, no-c-format
 #. Tag: para
+#: preparing.xml:386
+#, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "Hộp của mỗi phần cứng."
 
-#: preparing.xml:393
-#, no-c-format
 #. Tag: para
+#: preparing.xml:392
+#, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr ""
 "Cửa sổ Hệ Thống (System) trong bảng điều khiển (Control Panel) Windows."
 
-#: preparing.xml:399
-#, no-c-format
 #. Tag: para
+#: preparing.xml:398
+#, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
 "displays. This source is especially useful for information about RAM and "
@@ -604,9 +565,9 @@ msgstr ""
 "Nguồn này có ích đặc biệt để tìm thông tin về bộ nhớ RAM và bộ nhớ của phần "
 "cứng."
 
-#: preparing.xml:406
-#, no-c-format
 #. Tag: para
+#: preparing.xml:405
+#, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
 "tell you the settings you need to set up your networking and e-mail."
@@ -615,183 +576,177 @@ msgstr ""
 "thông tin báo bạn biết cách thiết lập khả năng chạy mạng và gởi/nhận thư "
 "điện tử."
 
-#: preparing.xml:418
-#, no-c-format
 #. Tag: title
+#: preparing.xml:417
+#, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "Thông tin về phần cứng cần thiết để cài đặt"
 
-#: preparing.xml:422
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:421
+#, no-c-format
 msgid "Hardware"
 msgstr "Phần cứng"
 
-#: preparing.xml:422
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:421
+#, no-c-format
 msgid "Information You Might Need"
 msgstr "Thông tin có thể cần"
 
-#: preparing.xml:428
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:427
+#, no-c-format
 msgid "Hard Drives"
 msgstr "Phần cứng"
 
-#: preparing.xml:429
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:428
+#, no-c-format
 msgid "How many you have."
 msgstr "Có mấy cái."
 
-#: preparing.xml:431
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:430
+#, no-c-format
 msgid "Their order on the system."
 msgstr "Thứ tự trên hệ thống."
 
-#: preparing.xml:433
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:432
+#, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "Kiểu IDE (cũng biết là PATA), SATA hay SCSI."
 
-#: preparing.xml:435
-#: preparing.xml:487
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:434 preparing.xml:486
+#, no-c-format
 msgid "Available free space."
 msgstr "Sức chứa còn rảnh sẵn sàng."
 
-#: preparing.xml:436
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:435
+#, no-c-format
 msgid "Partitions."
 msgstr "Phân vùng."
 
-#: preparing.xml:438
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:437
+#, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "Phân vùng nơi hệ điều hành khác đã được cài đặt."
 
-#: preparing.xml:442
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:441
+#, no-c-format
 msgid "Monitor"
 msgstr "Bộ trình bày"
 
-#: preparing.xml:443
-#: preparing.xml:463
-#: preparing.xml:469
-#: preparing.xml:475
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
+#, no-c-format
 msgid "Model and manufacturer."
 msgstr "Mẫu và hãng chế tạo."
 
-#: preparing.xml:445
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:444
+#, no-c-format
 msgid "Resolutions supported."
 msgstr "Độ phân giải được hố trợ."
 
-#: preparing.xml:446
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:445
+#, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "Tỷ lệ cập nhật ngang."
 
-#: preparing.xml:447
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:446
+#, no-c-format
 msgid "Vertical refresh rate."
 msgstr "Tỷ lệ cập nhật dọc."
 
-#: preparing.xml:449
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:448
+#, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "Độ sâu màu (số màu sắc) được hỗ trợ."
 
-#: preparing.xml:451
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:450
+#, no-c-format
 msgid "Screen size."
 msgstr "Kích cỡ màn hình."
 
-#: preparing.xml:454
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:453
+#, no-c-format
 msgid "Mouse"
 msgstr "Con chuột"
 
-#: preparing.xml:455
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:454
+#, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "Kiểu : nối tiếp, PS/2 hay USB."
 
-#: preparing.xml:457
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:456
+#, no-c-format
 msgid "Port."
 msgstr "Cổng."
 
-#: preparing.xml:458
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:457
+#, no-c-format
 msgid "Manufacturer."
 msgstr "Hãng chế tạo."
 
-#: preparing.xml:459
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:458
+#, no-c-format
 msgid "Number of buttons."
 msgstr "Số cái nút."
 
-#: preparing.xml:462
-#: preparing.xml:490
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:461 preparing.xml:489
+#, no-c-format
 msgid "Network"
 msgstr "Mạng"
 
-#: preparing.xml:465
-#: preparing.xml:491
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:464 preparing.xml:490
+#, no-c-format
 msgid "Type of adapter."
 msgstr "Kiểu bộ tiếp hợp."
 
-#: preparing.xml:468
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:467
+#, no-c-format
 msgid "Printer"
 msgstr "Máy in"
 
-#: preparing.xml:471
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:470
+#, no-c-format
 msgid "Printing resolutions supported."
 msgstr "Độ phân giải in được hỗ trợ."
 
-#: preparing.xml:474
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:473
+#, no-c-format
 msgid "Video Card"
 msgstr "Thẻ ảnh động"
 
-#: preparing.xml:477
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:476
+#, no-c-format
 msgid "Video RAM available."
 msgstr "Bộ nhớ RAM ảnh động sẵn sàng."
 
-#: preparing.xml:479
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:478
+#, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
 "monitor's capabilities)."
@@ -799,39 +754,39 @@ msgstr ""
 "Độ phân giải và độ sâu màu được hỗ trợ (những giá trị này nên được so sánh "
 "với khả năng của bộ trình bày)."
 
-#: preparing.xml:484
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:483
+#, no-c-format
 msgid "DASD"
 msgstr "Thiết bị cất giữ truy cập trực tiếp"
 
-#: preparing.xml:485
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:484
+#, no-c-format
 msgid "Device number(s)."
 msgstr "(Các) số hiệu thiết bị."
 
-#: preparing.xml:493
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:492
+#, no-c-format
 msgid "Device numbers."
 msgstr "Các số hiệu thiết bị."
 
-#: preparing.xml:494
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:493
+#, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "Số hiệu bộ tiếp hợp tương đối cho thẻ OSA."
 
-#: preparing.xml:502
-#, no-c-format
 #. Tag: title
+#: preparing.xml:501
+#, no-c-format
 msgid "Hardware Compatibility"
 msgstr "Khả năng tương thích của phần cứng"
 
-#: preparing.xml:504
-#, no-c-format
 #. Tag: para
+#: preparing.xml:503
+#, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
 "hardware support in &arch-kernel; is improving daily. However, &arch-kernel; "
@@ -843,9 +798,9 @@ msgstr ""
 "nhiên, &arch-kernel; vẫn còn chạy ít kiểu phần cứng hơn một số hệ điều hành "
 "riêng."
 
-#: preparing.xml:510
-#, no-c-format
 #. Tag: para
+#: preparing.xml:509
+#, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
 "running version of Windows to work."
@@ -853,9 +808,9 @@ msgstr ""
 "Đặc biệt, &arch-kernel; thường không thể chạy phần cứng cần thiết một phiên "
 "bản Windows đang chạy để hoạt động được."
 
-#: preparing.xml:515
-#, no-c-format
 #. Tag: para
+#: preparing.xml:514
+#, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
 "so usually requires extra effort. In addition, Linux drivers for Windows-"
@@ -868,9 +823,9 @@ msgstr ""
 "cũng là đặc trưng cho một hạt nhân Linux riêng. Như thế thì trình này trơ "
 "thành nhanh quá cũ."
 
-#: preparing.xml:522
-#, no-c-format
 #. Tag: para
+#: preparing.xml:521
+#, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
 "printers and other equipment may also be Windows-specific."
@@ -878,21 +833,21 @@ msgstr ""
 "Thiết bị được gọi là « win-modem » là kiểu thường nhất của phần cứng này. "
 "Tuy nhiên, máy in và thiết bị khác cũng có thể là đặc trưng cho Windows."
 
-#: preparing.xml:527
-#, no-c-format
 #. Tag: para
+#: preparing.xml:526
+#, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "Có thể kiểm tra xem khả năng tương thích của phần cứng bằng cách:"
 
-#: preparing.xml:532
-#, no-c-format
 #. Tag: para
+#: preparing.xml:531
+#, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "Kiểm tra xem nơi Mạng của hãng chế tạo có trình điều khiển mới chưa."
 
-#: preparing.xml:537
-#, no-c-format
 #. Tag: para
+#: preparing.xml:536
+#, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
 "known brands can sometimes use the drivers or settings for better-known ones."
@@ -901,9 +856,9 @@ msgstr ""
 "nhãn hiệu ít nổi tiếng hơn có lẽ vẫn còn sử dụng được trình điều khiển hay "
 "thiết lập của điều phổ biến."
 
-#: preparing.xml:544
-#, no-c-format
 #. Tag: para
+#: preparing.xml:543
+#, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
 "dedicated to your architecture."
@@ -911,21 +866,21 @@ msgstr ""
 "Kiểm tra đọc danh sách phần cứng tương thích với &arch-kernel; tại nơi Mạng "
 "dành cho kiến trúc của máy tính của bạn."
 
-#: preparing.xml:550
-#, no-c-format
 #. Tag: para
+#: preparing.xml:549
+#, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "Tìm kiếm qua Mạng kinh nghiệm của các người dùng khác."
 
-#: preparing.xml:561
-#, no-c-format
 #. Tag: title
+#: preparing.xml:560
+#, no-c-format
 msgid "Network Settings"
 msgstr "Thiết lập mạng"
 
-#: preparing.xml:563
-#, no-c-format
 #. Tag: para
+#: preparing.xml:562
+#, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
 "or equivalent connection &mdash; not a PPP connection), you should ask your "
@@ -935,33 +890,33 @@ msgstr ""
 "Ethernet hay tương tự, không phải kiểu PPP), bạn nên yêu cầu quản trị hệ "
 "thống mạng cung cấp thông tin này."
 
-#: preparing.xml:570
-#, no-c-format
 #. Tag: para
+#: preparing.xml:569
+#, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "Tên máy [host name] (có lẽ bạn tự quyết định được)."
 
-#: preparing.xml:575
-#, no-c-format
 #. Tag: para
+#: preparing.xml:574
+#, no-c-format
 msgid "Your domain name."
 msgstr "Tên miền [domain name]."
 
-#: preparing.xml:580
-#, no-c-format
 #. Tag: para
+#: preparing.xml:579
+#, no-c-format
 msgid "Your computer's IP address."
 msgstr "Địa chỉ IP [IP address] của máy tính."
 
-#: preparing.xml:585
-#, no-c-format
 #. Tag: para
+#: preparing.xml:584
+#, no-c-format
 msgid "The netmask to use with your network."
 msgstr "Mặt nạ mạng [netmask] cần dùng với mạng cục bộ."
 
-#: preparing.xml:590
-#, no-c-format
 #. Tag: para
+#: preparing.xml:589
+#, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
 "network <emphasis>has</emphasis> a gateway."
@@ -969,18 +924,18 @@ msgstr ""
 "Địa chỉ IP của hệ thống cổng ra [gateway] mặc định tới đó bạn nên định "
 "tuyến, <emphasis>nếu mạng có</emphasis>."
 
-#: preparing.xml:596
-#, no-c-format
 #. Tag: para
+#: preparing.xml:595
+#, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
 "Service) server."
 msgstr ""
 "Trên mạng, hệ thống cần dùng như là trình phục vụ dịch vụ tên miền (DNS)."
 
-#: preparing.xml:604
-#, no-c-format
 #. Tag: para
+#: preparing.xml:603
+#, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
 "available and is recommended, then you don't need this information because "
@@ -992,33 +947,33 @@ msgstr ""
 "phục vụ DHCP sẽ cung cấp trực tiếp cho máy tính của bạn trong tiến trình cài "
 "đặt."
 
-#: preparing.xml:611
-#, no-c-format
 #. Tag: para
+#: preparing.xml:610
+#, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "Nếu bạn sử dụng mạng vô tuyến, bạn cũng nên tìm biết:"
 
-#: preparing.xml:616
-#, no-c-format
 #. Tag: para
+#: preparing.xml:615
+#, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "ESSID của mạng vô tuyến đó."
 
-#: preparing.xml:621
-#, no-c-format
 #. Tag: para
+#: preparing.xml:620
+#, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "Khoá bảo mật WEP (nếu thích hợp)."
 
-#: preparing.xml:638
-#, no-c-format
 #. Tag: title
+#: preparing.xml:637
+#, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "Thoả tiêu chuẩn phần cứng tối thiểu"
 
-#: preparing.xml:639
-#, no-c-format
 #. Tag: para
+#: preparing.xml:638
+#, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
 "that your hardware will let you do the type of installation that you want to "
@@ -1027,9 +982,9 @@ msgstr ""
 "Một khi bạn đã tập hợp thông tin về các phần cứng của máy tính, hãy kiểm tra "
 "xem phần cứng này sẽ cho phép bạn cài đặt bằng cách đã muốn."
 
-#: preparing.xml:645
-#, no-c-format
 #. Tag: para
+#: preparing.xml:644
+#, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
 "recommended hardware listed in the table below. However, most users risk "
@@ -1039,123 +994,121 @@ msgstr ""
 "những điều được liệt kê trong bảng bên dưới. Tuy nhiên, hậu hết người dùng "
 "sẽ gặp khó khăn nếu họ bỏ qua danh sách phần cứng khuyến khích."
 
-#: preparing.xml:651
-#, no-c-format
 #. Tag: para
+#: preparing.xml:650
+#, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "Khuyên dùng ít nhất máy Pentium 4, 1 GHz, cho máy tính để bàn."
 
-#: preparing.xml:656
-#, no-c-format
 #. Tag: para
+#: preparing.xml:655
+#, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
 "Có thể sử dụng bất kỳ máy PowerPC (kiểu cũ hay kiểu mới cũng được) là hệ "
 "thống để bàn."
 
-#: preparing.xml:663
-#, no-c-format
 #. Tag: title
+#: preparing.xml:662
+#, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "Điều kiện hệ thống tối thiểu khuyến khích"
 
-#: preparing.xml:667
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:666
+#, no-c-format
 msgid "Install Type"
 msgstr "Kiểu cài đặt"
 
-#: preparing.xml:668
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:667
+#, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (tối thiểu)"
 
-#: preparing.xml:669
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:668
+#, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (khuyến khích)"
 
-#: preparing.xml:670
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:669
+#, no-c-format
 msgid "Hard Drive"
 msgstr "Đĩa cứng"
 
-#: preparing.xml:676
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:675
+#, no-c-format
 msgid "No desktop"
 msgstr "Vô GUI"
 
-#: preparing.xml:677
-#: preparing.xml:682
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:676
+#, no-c-format
 msgid "64 megabytes"
 msgstr "64 MB"
 
-#: preparing.xml:678
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:677
+#, no-c-format
 msgid "256 megabytes"
 msgstr "256 MB"
 
-#: preparing.xml:679
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:678
+#, no-c-format
 msgid "1 gigabyte"
 msgstr "1 GB"
 
-#: preparing.xml:681
-#, no-c-format
 #. Tag: entry
+#: preparing.xml:680
+#, no-c-format
 msgid "With Desktop"
 msgstr "Có GUI"
 
-#: preparing.xml:683
-#, no-c-format
 #. Tag: entry
-msgid "512 megabytes"
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
 msgstr "512 MB"
 
-#: preparing.xml:684
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
+msgid "512 megabytes"
+msgstr "512 MB"
+
 #. Tag: entry
+#: preparing.xml:683
+#, no-c-format
 msgid "5 gigabytes"
 msgstr "5 GB"
 
-#: preparing.xml:689
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "The actual minimum memory requirements are a lot less then the numbers "
-#| "listed in this table. Depending on the architecture, it is possible to "
-#| "install Debian with as little as 20MB (for s390) to 60MB (for "
-#| "amd64). The same goes for the disk space requirements, especially if you "
-#| "pick and choose which applications to install; see <xref linkend="
-#| "\"tasksel-size-list\"/> for additional information on disk space "
-#| "requirements."
+#: preparing.xml:688
+#, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 "Vùng nhớ tối thiều cần thiết thực sự rất ít hơn nhưng số lượng được hiển thị "
 "trong bảng này. Phụ thuộc vào kiến trúc, có thể cài đặt &debian; với ngay cả "
-"20 MB (cho s390) đến 60 MB (cho amd64). Cũng vậy với sức chứa còn "
-"rảnh cần thiết, đặc biệt nếu bạn kén những chương trình cần cài đặt. Xem "
-"<xref linkend=\"tasksel-size-list\"/> để tìm thêm thông tin về sức chứa còn "
-"rảnh yêu cầu trên đĩa."
+"20 MB (cho s390) đến 60 MB (cho amd64). Cũng vậy với sức chứa còn rảnh cần "
+"thiết, đặc biệt nếu bạn kén những chương trình cần cài đặt. Xem <xref "
+"linkend=\"tasksel-size-list\"/> để tìm thêm thông tin về sức chứa còn rảnh "
+"yêu cầu trên đĩa."
 
-#: preparing.xml:699
-#, no-c-format
 #. Tag: para
+#: preparing.xml:698
+#, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
 "systems, but in that case it is recommended to install a window manager that "
@@ -1170,9 +1123,9 @@ msgstr ""
 "KDE. Các sự chọn thay thế gồm <classname>xfce4</classname>, "
 "<classname>icewm</classname> và <classname>wmaker</classname>."
 
-#: preparing.xml:708
-#, no-c-format
 #. Tag: para
+#: preparing.xml:707
+#, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
 "requirements for server installations as those very much depend on what the "
@@ -1181,9 +1134,9 @@ msgstr ""
 "Không thể khuyến dự bộ nhớ hay sức chứa trên đĩa cần thiết cho việc cài đặt "
 "vào máy phục vụ, vì số lượng phụ thuộc nhiều vào mục đích của máy phục vụ."
 
-#: preparing.xml:714
-#, no-c-format
 #. Tag: para
+#: preparing.xml:713
+#, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
 "usually to be found, such as user files, mail, and data. It is always best "
@@ -1193,19 +1146,9 @@ msgstr ""
 "thư điện tử và tập tin người dùng kiểu khác nhau. Bạn nên tính rộng lượng "
 "sức chứa cho các tập tin và dữ liệu của mình. "
 
-#: preparing.xml:721
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Disk space required for the smooth operation of the &debian-gnu; system "
-#| "itself is taken into account in these recommended system requirements. "
-#| "Notably, the <filename>/var</filename> partition contains a lot of state "
-#| "information specific to Debian in addition to its regular contents, like "
-#| "logfiles. The <command>dpkg</command> files (with information on all "
-#| "installed packages) can easily consume 40MB. Also, <command>apt-get</"
-#| "command> puts downloaded packages here before they are installed. You "
-#| "should usually allocate at least 200MB for <filename>/var</filename>, and "
-#| "a lot more if you install a graphical desktop environment."
+#: preparing.xml:720
+#, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
 "itself is taken into account in these recommended system requirements. "
@@ -1217,18 +1160,25 @@ msgid ""
 "usually allocate at least 200MB for <filename>/var</filename>, and a lot "
 "more if you install a graphical desktop environment."
 msgstr ""
-"Sức chứa trên đĩa cần thiết để thao tác mịn hệ thống &debian-gnu; chính nó cũng được tính trong những số lượng khuyến dụ này. Chẳng hạn, phân vùng <filename>/var</filename> chứa rất nhiều thông tin về tình trạng đặc trưng cho &debian;, thêm vào nội dung bình thường như các tập tin theo dõi. Các tập tin "
-"<command>dpkg</command> (gồm có thông tin về mọi gói đã cài đặt) có thể chiếm dễ dàng đến 40 MB. Tiến trình <command>apt-get</command> cũng để vào đây các gói vừa mới tải về, trước khi cài đặt chúng. Bạn thường nên cấp phát ít nhất 200 MB cho phân vùng <filename>/var</filename>, và rất nhiều thêm nữa nếu bạn cài đặt môi trường làm việc đồ họa."
+"Sức chứa trên đĩa cần thiết để thao tác mịn hệ thống &debian-gnu; chính nó "
+"cũng được tính trong những số lượng khuyến dụ này. Chẳng hạn, phân vùng "
+"<filename>/var</filename> chứa rất nhiều thông tin về tình trạng đặc trưng "
+"cho &debian;, thêm vào nội dung bình thường như các tập tin theo dõi. Các "
+"tập tin <command>dpkg</command> (gồm có thông tin về mọi gói đã cài đặt) có "
+"thể chiếm dễ dàng đến 40 MB. Tiến trình <command>apt-get</command> cũng để "
+"vào đây các gói vừa mới tải về, trước khi cài đặt chúng. Bạn thường nên cấp "
+"phát ít nhất 200 MB cho phân vùng <filename>/var</filename>, và rất nhiều "
+"thêm nữa nếu bạn cài đặt môi trường làm việc đồ họa."
 
-#: preparing.xml:745
-#, no-c-format
 #. Tag: title
+#: preparing.xml:744
+#, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "Phân vùng sẵn cho hệ thống đa khởi động"
 
-#: preparing.xml:746
-#, no-c-format
 #. Tag: para
+#: preparing.xml:745
+#, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
 "into sections. Each section is then independent of the others. It's roughly "
@@ -1239,9 +1189,9 @@ msgstr ""
 "không phụ thuộc vào nhau. Nó giống như việc xây dựng tường ở trong nhà: khi "
 "bạn thêm đồ đạc vào phòng này, không có tác động trong phòng khác."
 
-#: preparing.xml:753
-#, no-c-format
 #. Tag: para
+#: preparing.xml:752
+#, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
 "this into a DASD or VM minidisk in the &arch-title; world. Also a machine "
@@ -1252,41 +1202,33 @@ msgstr ""
 "máy kiểu &arch-title;. Hơn nữa, <quote>máy</quote> là LPAR (phân vùng hợp "
 "lý) hay máy khách VM trong trường hợp này."
 
-#: preparing.xml:759
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Debian on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Unix systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
+#: preparing.xml:758
+#, no-c-format
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
+msgstr ""
+"Nếu máy tính của bạn đã có một hệ điều hành <phrase arch=\"any-x86\"> "
+"(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
 "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
-msgstr ""
-"Nếu máy tính của bạn đã có một hệ điều hành <phrase arch=\"any-x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> và bạn muốn thêm &debian; vào cùng một đĩa, bạn sẽ cần phải phân vùng lại đĩa đó. &debian; cần thiết một số phân vùng riêng trên đĩa cứng. Không thể cài đặt nó vào phân vùng kiểu Windows hay MacOS. Có thể là nó chia sẻ được phân vùng với kiểu UNIX khác, nhưng trường hợp đó không phải được diễn tả ở đây. Ít nhất bạn sẽ cần thiết một phân vùng riêng dành cho gốc (root) của &debian;."
+"phrase> và bạn muốn thêm &debian; vào cùng một đĩa, bạn sẽ cần phải phân "
+"vùng lại đĩa đó. &debian; cần thiết một số phân vùng riêng trên đĩa cứng. "
+"Không thể cài đặt nó vào phân vùng kiểu Windows hay MacOS. Có thể là nó chia "
+"sẻ được phân vùng với kiểu UNIX khác, nhưng trường hợp đó không phải được "
+"diễn tả ở đây. Ít nhất bạn sẽ cần thiết một phân vùng riêng dành cho gốc "
+"(root) của &debian;."
 
-#: preparing.xml:778
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "You can find information about your current partition setup by using a "
-#| "partitioning tool for your current operating system<phrase arch=\"x86\">, "
-#| "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such "
-#| "as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, "
-#| "such as the VM diskmap</phrase>. Partitioning tools always provide a way "
-#| "to show existing partitions without making changes."
+#: preparing.xml:777
+#, no-c-format
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
@@ -1295,11 +1237,17 @@ msgid ""
 "such as the VM diskmap</phrase>. Partitioning tools always provide a way to "
 "show existing partitions without making changes."
 msgstr ""
-"Bạn có thể tìm thông tin về thiết lập phân vùng hiện thời của máy tính bằng cách sử dụng một công cụ phân vùng cho hệ điều hành đã có<phrase arch=\"any-x86\">, v.d. fdisk hay PartitionMagic</phrase><phrase arch=\"powerpc\">, v.d. Drive Setup, HD Toolkit hay MacTools</phrase><phrase arch=\"s390\">, v.d. sơ VM diskmap (sơ đồ đĩa vùng nhớ ảo)</phrase>. Công cụ phân vùng lúc nào cũng cung cấp một phương pháp hiển thị các phân vùng đã có mà chưa thay đổi gì."
+"Bạn có thể tìm thông tin về thiết lập phân vùng hiện thời của máy tính bằng "
+"cách sử dụng một công cụ phân vùng cho hệ điều hành đã có<phrase arch=\"any-"
+"x86\">, v.d. fdisk hay PartitionMagic</phrase><phrase arch=\"powerpc\">, v."
+"d. Drive Setup, HD Toolkit hay MacTools</phrase><phrase arch=\"s390\">, v.d. "
+"sơ VM diskmap (sơ đồ đĩa vùng nhớ ảo)</phrase>. Công cụ phân vùng lúc nào "
+"cũng cung cấp một phương pháp hiển thị các phân vùng đã có mà chưa thay đổi "
+"gì."
 
-#: preparing.xml:787
-#, no-c-format
 #. Tag: para
+#: preparing.xml:786
+#, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
 "destroy any information there. Thus you should always make backups before "
@@ -1312,31 +1260,29 @@ msgstr ""
 "trong nhà, rất có thể là bạn muốn di chuyển các đồ đạc ra trước khi chuyển "
 "tường, nếu không thì rủi ro hủy nó."
 
-#: preparing.xml:797
-#, no-c-format
 #. Tag: emphasis
+#: preparing.xml:796
+#, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: (chưa ghi đoạn tiếng Anh)"
 
-#: preparing.xml:799
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If your computer has more than one hard disk, you may want to dedicate "
-#| "one of the hard disks completely to Debian. If so, you don't need to "
-#| "partition that disk before booting the installation system; the "
-#| "installer's included partitioning program can handle the job nicely."
+#: preparing.xml:798
+#, no-c-format
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
 "of the hard disks completely to &debian;. If so, you don't need to partition "
 "that disk before booting the installation system; the installer's included "
 "partitioning program can handle the job nicely."
 msgstr ""
-"Nếu máy tính của bạn có nhiều đĩa cứng, có thể là bạn muốn cấp phát một đĩa cứng riêng dành cho &debian;. Có thì bạn không cần phải phân vùng đĩa đó trước khi khởi động hệ thống cài đặt, vì chương trình phân vùng có sẵn trong trình cài đặt sẽ làm việc này."
+"Nếu máy tính của bạn có nhiều đĩa cứng, có thể là bạn muốn cấp phát một đĩa "
+"cứng riêng dành cho &debian;. Có thì bạn không cần phải phân vùng đĩa đó "
+"trước khi khởi động hệ thống cài đặt, vì chương trình phân vùng có sẵn trong "
+"trình cài đặt sẽ làm việc này."
 
-#: preparing.xml:806
-#, no-c-format
 #. Tag: para
+#: preparing.xml:805
+#, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
 "replace the current operating system with &debian-gnu;, you also can wait to "
@@ -1362,16 +1308,9 @@ msgstr ""
 "này, bạn nên có phương tiện xen kẽ nào để phục hồi máy, v.d. băng/đĩa cài "
 "đặt của hệ thống gốc."
 
-#: preparing.xml:821
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If your machine already has multiple partitions, and enough space can be "
-#| "provided by deleting and replacing one or more of them, then you too can "
-#| "wait and use the Debian installer's partitioning program. You should "
-#| "still read through the material below, because there may be special "
-#| "circumstances like the order of the existing partitions within the "
-#| "partition map, that force you to partition before installing anyway."
+#: preparing.xml:820
+#, no-c-format
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
 "provided by deleting and replacing one or more of them, then you too can "
@@ -1383,35 +1322,26 @@ msgstr ""
 "Nếu máy tính của bạn đã có nhiều phân vùng, và bạn có thể giải phóng đủ sức "
 "chứa bằng cách xoá bỏ và thay thế một hay nhiều phân vùng, bạn cũng có thể "
 "hoãn phân vùng đến khi sử dụng chương trình phân vùng có sẵn trong trình cài "
-"đặt &debian;. Trước tiên, bạn nên đọc thông tin bên dưới, để xem nếu có trường "
-"hợp đặc biệt (v.d. thứ tự các phân vùng đã có trên sơ đồ phân vùng) làm cho bạn vẫn còn cần phải phân vùng trước khi cài đặt."
+"đặt &debian;. Trước tiên, bạn nên đọc thông tin bên dưới, để xem nếu có "
+"trường hợp đặc biệt (v.d. thứ tự các phân vùng đã có trên sơ đồ phân vùng) "
+"làm cho bạn vẫn còn cần phải phân vùng trước khi cài đặt."
 
-#: preparing.xml:831
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
-#| "you can wait and use Debian installer's partitioning program to resize "
-#| "the filesystem."
+#: preparing.xml:830
+#, no-c-format
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
 "you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
-"Nếu máy tính của bạn có hệ thống tập tin kiểu FAT hay NTFS, như được dùng bởi DOS và Windows, bạn có thể đợi đến khi sử dụng chương trình phân vùng có sẵn trong trình cài đặt &debian;, để thay đổi kích cỡ của hệ thống tập tin đó."
+"Nếu máy tính của bạn có hệ thống tập tin kiểu FAT hay NTFS, như được dùng "
+"bởi DOS và Windows, bạn có thể đợi đến khi sử dụng chương trình phân vùng có "
+"sẵn trong trình cài đặt &debian;, để thay đổi kích cỡ của hệ thống tập tin "
+"đó."
 
-#: preparing.xml:837
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If none of the above apply, you'll need to partition your hard disk "
-#| "before starting the installation to create partitionable space for "
-#| "Debian. If some of the partitions will be owned by other operating "
-#| "systems, you should create those partitions using native operating system "
-#| "partitioning programs. We recommend that you do <emphasis>not</emphasis> "
-#| "attempt to create partitions for &debian-gnu; using another operating "
-#| "system's tools. Instead, you should just create the native operating "
-#| "system's partitions you will want to retain."
+#: preparing.xml:836
+#, no-c-format
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
 "starting the installation to create partitionable space for &debian;. If "
@@ -1422,17 +1352,17 @@ msgid ""
 "you should just create the native operating system's partitions you will "
 "want to retain."
 msgstr ""
-"Không có trường hợp nào ở trên thì bạn cần phải phân vùng đĩa cứng trước khi khởi chạy tiến trình cài đặt, để tạo sức chứa có khả năng phân vùng dành cho &debian;. Nếu một số phân vùng sẽ bị hệ điều hành khác sở hữu, bạn nên tạo các phân vùng riêng đó bằng chương trình phân vùng sở hữu của HĐH đó. Khuyên bạn <emphasis>đừng</emphasis> cố gắng tạo phân vùng cho &debian-gnu; bằng công cụ của một HĐH khác: chỉ nên tạo những phân vùng cần giữ lại cho HĐH khác đó."
+"Không có trường hợp nào ở trên thì bạn cần phải phân vùng đĩa cứng trước khi "
+"khởi chạy tiến trình cài đặt, để tạo sức chứa có khả năng phân vùng dành cho "
+"&debian;. Nếu một số phân vùng sẽ bị hệ điều hành khác sở hữu, bạn nên tạo "
+"các phân vùng riêng đó bằng chương trình phân vùng sở hữu của HĐH đó. Khuyên "
+"bạn <emphasis>đừng</emphasis> cố gắng tạo phân vùng cho &debian-gnu; bằng "
+"công cụ của một HĐH khác: chỉ nên tạo những phân vùng cần giữ lại cho HĐH "
+"khác đó."
 
-#: preparing.xml:849
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If you are going to install more than one operating system on the same "
-#| "machine, you should install all other system(s) before proceeding with "
-#| "Debian installation. Windows and other OS installations may destroy your "
-#| "ability to start Debian, or encourage you to reformat non-native "
-#| "partitions."
+#: preparing.xml:848
+#, no-c-format
 msgid ""
 "If you are going to install more than one operating system on the same "
 "machine, you should install all other system(s) before proceeding with "
@@ -1440,29 +1370,25 @@ msgid ""
 "ability to start &debian;, or encourage you to reformat non-native "
 "partitions."
 msgstr ""
-"Dự định cài đặt nhiều hệ điều hành vào cùng một máy thì bạn nên cài đặt HĐH khác nào trước khi cài đặt &debian;. Thứ tự cài đặt này ngăn cản HĐH khác hủy khả năng khởi chạy &debian;, cũng tránh xem hướng dẫn bạn định dạng lại phân vùng không sở hữu."
+"Dự định cài đặt nhiều hệ điều hành vào cùng một máy thì bạn nên cài đặt HĐH "
+"khác nào trước khi cài đặt &debian;. Thứ tự cài đặt này ngăn cản HĐH khác "
+"hủy khả năng khởi chạy &debian;, cũng tránh xem hướng dẫn bạn định dạng lại "
+"phân vùng không sở hữu."
 
-#: preparing.xml:857
-#, no-c-format
 #. Tag: para
+#: preparing.xml:856
+#, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
 "system first saves you trouble."
 msgstr ""
-"Cũng có thể tránh những hành động này hoặc phục hồi máy tính về sau, nhưng mà theo thứ tự cài đặt này (cài đặt hệ thống sở hữu về trước) khỏi phiền đến bạn."
+"Cũng có thể tránh những hành động này hoặc phục hồi máy tính về sau, nhưng "
+"mà theo thứ tự cài đặt này (cài đặt hệ thống sở hữu về trước) khỏi phiền đến "
+"bạn."
 
-#: preparing.xml:862
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
-#| "partitions should appear before all other partitions on the disk, "
-#| "especially MacOS boot partitions. This should be kept in mind when pre-"
-#| "partitioning; you should create a Linux placeholder partition to come "
-#| "<emphasis>before</emphasis> the other bootable partitions on the disk. "
-#| "(The small partitions dedicated to Apple disk drivers are not bootable.) "
-#| "You can delete the placeholder with the Linux partition tools later "
-#| "during the actual install, and replace it with Linux partitions."
+#: preparing.xml:861
+#, no-c-format
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
@@ -1473,31 +1399,36 @@ msgid ""
 "can delete the placeholder with the &debian; partition tools later during "
 "the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
-"Để OpenFirmware tự động khởi động &debian-gnu; những phân vùng &arch-parttype; nên nằm phía trước các phân vùng khác trên đĩa, đặc biệt phân vùng khởi động MacOS. Ghi nhớ thứ tự này khi phân vùng sẵn: bạn nên tạo một phân vùng giữ chỗ &arch-parttype; sẽ nằm <emphasis>phía trước</emphasis> các phân vùng khởi động được khác trên đĩa. (Phân vùng nhỏ đặc trưng cho trình điều khiển đĩa Apple thì không có khả năng khởi động.) Bạn có thể sử dụng công cụ phân vùng &debian; để xoá bỏ bộ giữ chỗ này vào một bước sau trong khi cài đặt, và thay thế nó bằng phân vùng kiểu &arch-parttype;."
+"Để OpenFirmware tự động khởi động &debian-gnu; những phân vùng &arch-"
+"parttype; nên nằm phía trước các phân vùng khác trên đĩa, đặc biệt phân vùng "
+"khởi động MacOS. Ghi nhớ thứ tự này khi phân vùng sẵn: bạn nên tạo một phân "
+"vùng giữ chỗ &arch-parttype; sẽ nằm <emphasis>phía trước</emphasis> các phân "
+"vùng khởi động được khác trên đĩa. (Phân vùng nhỏ đặc trưng cho trình điều "
+"khiển đĩa Apple thì không có khả năng khởi động.) Bạn có thể sử dụng công cụ "
+"phân vùng &debian; để xoá bỏ bộ giữ chỗ này vào một bước sau trong khi cài "
+"đặt, và thay thế nó bằng phân vùng kiểu &arch-parttype;."
 
-#: preparing.xml:874
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If you currently have one hard disk with one partition (a common setup "
-#| "for desktop computers), and you want to multi-boot the native operating "
-#| "system and Debian, you will need to:"
+#: preparing.xml:873
+#, no-c-format
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
 "desktop computers), and you want to multi-boot the native operating system "
 "and &debian;, you will need to:"
 msgstr ""
-"Nếu bạn hiện thời có một đĩa cứng riêng lẻ chứa chỉ một phân vùng (một thiết lập thường gặp trên máy tính để bàn), và bạn muốn « đa khởi động » cả hai hệ điều hành gốc và &debian;, bạn cần phải:"
+"Nếu bạn hiện thời có một đĩa cứng riêng lẻ chứa chỉ một phân vùng (một thiết "
+"lập thường gặp trên máy tính để bàn), và bạn muốn « đa khởi động » cả hai hệ "
+"điều hành gốc và &debian;, bạn cần phải:"
 
-#: preparing.xml:881
-#, no-c-format
 #. Tag: para
+#: preparing.xml:880
+#, no-c-format
 msgid "Back up everything on the computer."
 msgstr "Sao lưu tất cả trên máy tính đó."
 
-#: preparing.xml:886
-#, no-c-format
 #. Tag: para
+#: preparing.xml:885
+#, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
 "tapes. <phrase arch=\"powerpc\">When booting from a MacOS CD, hold the "
@@ -1509,9 +1440,9 @@ msgstr ""
 "phím <keycap>c</keycap> trong khi khởi động, để ép buộc đĩa CD đó trở thành "
 "hệ thống MacOS hoạt động.</phrase>"
 
-#: preparing.xml:896
-#, no-c-format
 #. Tag: para
+#: preparing.xml:895
+#, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
 "Leave either a place holder partition or free space for &debian-gnu;."
@@ -1519,64 +1450,51 @@ msgstr ""
 "Dùng công cụ phân vùng của HĐH gốc để tạo các phân vùng dành cho nó. Để lại "
 "hoặc một phân vùng giữ chỗ hoặc sức chứa còn rảnh dành cho Debian."
 
-#: preparing.xml:903
-#, no-c-format
 #. Tag: para
+#: preparing.xml:902
+#, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "Cài đặt hệ điều hành gốc vào phân vùng mới của nó."
 
-#: preparing.xml:908
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Boot back into the native system to verify everything's OK, and to "
-#| "download the Debian installer boot files."
+#: preparing.xml:907
+#, no-c-format
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
 "the &debian; installer boot files."
 msgstr ""
-"Khởi động về HĐH sở hữu để kiểm tra xem mọi thứ là ổn, cũng để tải về các tập tin khởi động của trình cài đặt &debian;."
+"Khởi động về HĐH sở hữu để kiểm tra xem mọi thứ là ổn, cũng để tải về các "
+"tập tin khởi động của trình cài đặt &debian;."
 
-#: preparing.xml:914
-#, no-c-format
 #. Tag: para
-#| msgid "Boot the Debian installer to continue installing Debian."
+#: preparing.xml:913
+#, no-c-format
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "Khởi động trình cài đặt &debian; để tiếp tục lại cài đặt &debian;."
 
-#: preparing.xml:928
-#, no-c-format
 #. Tag: title
+#: preparing.xml:927
+#, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "Phân vùng từ DOS hay Windows"
 
-#: preparing.xml:929
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If you are manipulating existing FAT or NTFS partitions, it is "
-#| "recommended that you either use the scheme below or native Windows or DOS "
-#| "tools. Otherwise, it is not really necessary to partition from DOS or "
-#| "Windows; the Debian partitioning tools will generally do a better job."
+#: preparing.xml:928
+#, no-c-format
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
 "that you either use the scheme below or native Windows or DOS tools. "
 "Otherwise, it is not really necessary to partition from DOS or Windows; the "
 "&debian; partitioning tools will generally do a better job."
 msgstr ""
-"Có thao tác phân vùng FAT hay NTFS đã có thì khuyên bạn hoặc sử dụng lược đồ bên dưới, hoặc sử dụng công cụ sở hữu của Windows hay DOS. Không thì bạn không thật cần phải phân vùng từ DOS hay Windows; nói chung công cụ phân vùng &debian; làm việc tốt hơn."
+"Có thao tác phân vùng FAT hay NTFS đã có thì khuyên bạn hoặc sử dụng lược đồ "
+"bên dưới, hoặc sử dụng công cụ sở hữu của Windows hay DOS. Không thì bạn "
+"không thật cần phải phân vùng từ DOS hay Windows; nói chung công cụ phân "
+"vùng &debian; làm việc tốt hơn."
 
-#: preparing.xml:937
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "But if you have a large IDE disk, and are not using LBA addressing, "
-#| "overlay drivers (sometimes provided by hard disk manufacturers), or a new "
-#| "(post 1998) BIOS that supports large disk access extensions, then you "
-#| "must locate your Debian boot partition carefully. In this case, you will "
-#| "have to put the boot partition into the first 1024 cylinders of your hard "
-#| "disk (usually around 524 megabytes, without BIOS translation). This may "
-#| "require that you move an existing FAT or NTFS partition."
+#: preparing.xml:936
+#, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
 "drivers (sometimes provided by hard disk manufacturers), or a new (post "
@@ -1586,52 +1504,48 @@ msgid ""
 "around 524 megabytes, without BIOS translation). This may require that you "
 "move an existing FAT or NTFS partition."
 msgstr ""
-"Tuy nhiên, nếu bạn có một đĩa IDE lớn, và không sử dụng khả năng đặt địa chỉ LBA, trình điều khiển phủ (đôi khi được cung cấp bởi hãng chế tạo đĩa cứng), hoặc một BIOS mới (sau năm 1998) hỗ trợ các phần mở rộng truy cập đến đĩa lớn, thì bạn cần phải định vị cẩn thận phân vùng khởi động &debian;. Trong trường hợp này, bạn cần phải để phân vùng khởi động vào vùng chứa 1024 hình trụ đầu của đĩa "
-"cứng (bình thường là khoảng 524 MB mà không có dịch BIOS). Việc này có thể yêu cầu bạn dời một phân vùng NAT hay NTFS đã có."
+"Tuy nhiên, nếu bạn có một đĩa IDE lớn, và không sử dụng khả năng đặt địa chỉ "
+"LBA, trình điều khiển phủ (đôi khi được cung cấp bởi hãng chế tạo đĩa cứng), "
+"hoặc một BIOS mới (sau năm 1998) hỗ trợ các phần mở rộng truy cập đến đĩa "
+"lớn, thì bạn cần phải định vị cẩn thận phân vùng khởi động &debian;. Trong "
+"trường hợp này, bạn cần phải để phân vùng khởi động vào vùng chứa 1024 hình "
+"trụ đầu của đĩa cứng (bình thường là khoảng 524 MB mà không có dịch BIOS). "
+"Việc này có thể yêu cầu bạn dời một phân vùng NAT hay NTFS đã có."
 
-#: preparing.xml:951
-#, no-c-format
 #. Tag: title
+#: preparing.xml:950
+#, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "Phân vùng lại không mất gì khi bắt đầu từ DOS, Win-32 hay OS/2"
 
-#: preparing.xml:954
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "One of the most common installations is onto a system that already "
-#| "contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, "
-#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian onto the same "
-#| "disk without destroying the previous system. Note that the installer "
-#| "supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
-#| "Simply start the installer and when you get to the partitioning step, "
-#| "select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </"
-#| "menuchoice> partitioning, select the partition to resize, and specify its "
-#| "new size. So in most cases you should not need to use the method "
-#| "described below."
+#: preparing.xml:953
+#, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
-"Một của những việc cài đặt thường làm nhất là vào một hệ thống đã có DOS (gồm có Windows 3.1), Win32 (v.d. Windows 95, 98, Me, NT, 2000, XP, 2003, Vista, 7), hay OS/2 và người dùng muốn cài đặt &debian; vào cùng một đĩa mà không hủy hệ thống trước. Ghi chú rằng trình cài đặt &debian; hỗ trợ chức năng thay đổi kích cỡ của hệ thống tập tin kiểu FAT và NTFS như được dùng bởi hệ điều hành DOS và Windows. Đơn giản hãy khởi chạy trình cài đặt, và khi bạn tới bước phân vùng, chọn làm phân vùng <menuchoice> <guimenuitem>Bằng tay</guimenuitem> </menuchoice>, chọn phân vùng có kích cỡ cần thay đổi, và xác định kích cỡ mới cho nó. Vì vậy trong phần lớn các trường hợp bạn không cần sử dụng phương pháp được diễn tả bên dưới."
+"Một của những việc cài đặt thường làm nhất là vào một hệ thống đã có DOS "
+"(gồm có Windows 3.1), Win32 (v.d. Windows 95, 98, Me, NT, 2000, XP, 2003, "
+"Vista, 7), hay OS/2 và người dùng muốn cài đặt &debian; vào cùng một đĩa mà "
+"không hủy hệ thống trước. Ghi chú rằng trình cài đặt &debian; hỗ trợ chức "
+"năng thay đổi kích cỡ của hệ thống tập tin kiểu FAT và NTFS như được dùng "
+"bởi hệ điều hành DOS và Windows. Đơn giản hãy khởi chạy trình cài đặt, và "
+"khi bạn tới bước phân vùng, chọn làm phân vùng <menuchoice> "
+"<guimenuitem>Bằng tay</guimenuitem> </menuchoice>, chọn phân vùng có kích cỡ "
+"cần thay đổi, và xác định kích cỡ mới cho nó. Vì vậy trong phần lớn các "
+"trường hợp bạn không cần sử dụng phương pháp được diễn tả bên dưới."
 
-#: preparing.xml:966
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Before going any further, you should have decided how you will be "
-#| "dividing up the disk. The method in this section will only split a "
-#| "partition into two pieces. One will contain the original OS and the other "
-#| "will be used for Debian. During the installation of Debian, you will be "
-#| "given the opportunity to use the Debian portion of the disk as you see "
-#| "fit, i.e., as swap or as a file system."
+#: preparing.xml:965
+#, no-c-format
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
 "up the disk. The method in this section will only split a partition into two "
@@ -1640,11 +1554,15 @@ msgid ""
 "opportunity to use the &debian; portion of the disk as you see fit, i.e., as "
 "swap or as a file system."
 msgstr ""
-"Trước khi tiếp tục, bạn nên đã quyết định nên chia đĩa ra như thế nào. Phương pháp trong tiết đoạn này sẽ chia phân vùng ra chỉ hai phần. Một phần sẽ chứa HĐH gốc, còn phần khác sẽ chứa &debian;. Trong khi cài đặt &debian;, bạn sẽ có dịp sử dụng phần đĩa &debian; bằng cách nào thích hợp, tức là làm vùng trao đổi hoặc làm hệ thống tập tin."
+"Trước khi tiếp tục, bạn nên đã quyết định nên chia đĩa ra như thế nào. "
+"Phương pháp trong tiết đoạn này sẽ chia phân vùng ra chỉ hai phần. Một phần "
+"sẽ chứa HĐH gốc, còn phần khác sẽ chứa &debian;. Trong khi cài đặt &debian;, "
+"bạn sẽ có dịp sử dụng phần đĩa &debian; bằng cách nào thích hợp, tức là làm "
+"vùng trao đổi hoặc làm hệ thống tập tin."
 
-#: preparing.xml:975
-#, no-c-format
 #. Tag: para
+#: preparing.xml:974
+#, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
 "changing the partition information, so that nothing will be lost. It is "
@@ -1658,13 +1576,13 @@ msgstr ""
 "có thể giữa việc chuyển dữ liệu và việc phân vùng lại, để ngăn cản ghi tập "
 "tin gần cuối phân vùng, vì tập tin đó giảm sức chứa sẵn sàng."
 
-#: preparing.xml:984
-#, no-c-format
 #. Tag: para
+#: preparing.xml:983
+#, fuzzy, no-c-format
 #| msgid ""
 #| "The first thing needed is a copy of <command>fips</command> which is "
 #| "available in the <filename>tools/</filename> directory on your nearest "
-#| "Debian mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
 #| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
 #| "filename> to a bootable floppy. A bootable floppy can be created using "
 #| "the command <filename>sys a:</filename> under DOS. <command>fips</"
@@ -1673,23 +1591,30 @@ msgstr ""
 #| "compression driver or a disk manager. Create the disk and read the "
 #| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
-"Trước tiên yêu cầu một bản sao của tiện ích <command>fips</command> mà có sẵn trong thư mục công cụ <filename>tools/</filename> nằm trên máy nhân bản &debian; gần nhất. Giải nén kho này và sao chép những tập tin <filename>RESTORRB.EXE</filename>, <filename>FIPS.EXE</filename> và "
-"<filename>ERRORS.TXT</filename> vào một đĩa mềm có khả năng khởi động. Có thể tạo một đĩa mềm có khả năng khởi động bằng cách sử dụng câu lệnh <filename>sys a:</filename> dưới hệ điều hành DOS. Tiện ích <command>fips</command> có sẵn tài liệu hướng dẫn rất tốt: khuyên bạn đọc nó, đặc biệt nếu bạn sử dụng một trình điều khiển nén đĩa hay một bộ quản lý đĩa. Tạo đĩa này và đọc tài liệu tương ứng <emphasis>trước</emphasis> khi bạn chắp liền đĩa đó."
+"Trước tiên yêu cầu một bản sao của tiện ích <command>fips</command> mà có "
+"sẵn trong thư mục công cụ <filename>tools/</filename> nằm trên máy nhân bản "
+"&debian; gần nhất. Giải nén kho này và sao chép những tập tin "
+"<filename>RESTORRB.EXE</filename>, <filename>FIPS.EXE</filename> và "
+"<filename>ERRORS.TXT</filename> vào một đĩa mềm có khả năng khởi động. Có "
+"thể tạo một đĩa mềm có khả năng khởi động bằng cách sử dụng câu lệnh "
+"<filename>sys a:</filename> dưới hệ điều hành DOS. Tiện ích <command>fips</"
+"command> có sẵn tài liệu hướng dẫn rất tốt: khuyên bạn đọc nó, đặc biệt nếu "
+"bạn sử dụng một trình điều khiển nén đĩa hay một bộ quản lý đĩa. Tạo đĩa này "
+"và đọc tài liệu tương ứng <emphasis>trước</emphasis> khi bạn chắp liền đĩa "
+"đó."
 
-#: preparing.xml:997
-#, no-c-format
 #. Tag: para
+#: preparing.xml:995
+#, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
 "partition. <command>defrag</command>, which comes standard with DOS 6.0 and "
@@ -1707,9 +1632,9 @@ msgstr ""
 "command> từ nó, vì DOS không hiểu được dạng thức VFAT, được dùng để hỗ trợ "
 "khả năng thao tác tên tập tin dài (có sẵn trong HĐH Windows 95 và sau)."
 
-#: preparing.xml:1007
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1005
+#, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
 "reboot with the <command>fips</command> disk you created in the floppy "
@@ -1719,9 +1644,9 @@ msgstr ""
 "lại bằng đĩa <command>fips</command> bạn đã tạo trong ổ đĩa mềm. Đơn giản "
 "hãy gõ <filename>a:\\fips</filename> rồi theo những hướng dẫn."
 
-#: preparing.xml:1013
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1011
+#, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
 "<command>fips</command> doesn't do the trick for you."
@@ -1729,21 +1654,15 @@ msgstr ""
 "Ghi chú rằng có nhiều bộ quản lý phân vùng khác, nếu <command>fips</command> "
 "không phải là thích hợp."
 
-#: preparing.xml:1021
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1019
+#, no-c-format
 msgid "Partitioning for DOS"
 msgstr "Phân vùng cho DOS"
 
-#: preparing.xml:1023
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "If you are partitioning for DOS drives, or changing the size of DOS "
-#| "partitions, using Debian tools, many people experience problems working "
-#| "with the resulting FAT partitions. For instance, some have reported slow "
-#| "performance, consistent problems with <command>scandisk</command>, or "
-#| "other weird errors in DOS or Windows."
+#: preparing.xml:1021
+#, no-c-format
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
 "partitions, using &debian; tools, many people experience problems working "
@@ -1751,47 +1670,42 @@ msgid ""
 "performance, consistent problems with <command>scandisk</command>, or other "
 "weird errors in DOS or Windows."
 msgstr ""
-"Nếu bạn phân vùng cho đĩa DOS (hoặc thay đổi kích cỡ của phân vùng DOS) bằng công cụ &debian;, nhiều người gặp khó khăn sử dụng phân vùng FAT là kết quả. Chẳng hạn, một số người dùng đã thông báo hiệu suất bị giảm, lỗi bền bỉ trong tiến trình <command>scandisk</command> (quét đĩa), và một số lỗi lạ khác trong DOS hay Windows."
+"Nếu bạn phân vùng cho đĩa DOS (hoặc thay đổi kích cỡ của phân vùng DOS) bằng "
+"công cụ &debian;, nhiều người gặp khó khăn sử dụng phân vùng FAT là kết quả. "
+"Chẳng hạn, một số người dùng đã thông báo hiệu suất bị giảm, lỗi bền bỉ "
+"trong tiến trình <command>scandisk</command> (quét đĩa), và một số lỗi lạ "
+"khác trong DOS hay Windows."
 
-#: preparing.xml:1031
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Apparently, whenever you create or resize a partition for DOS use, it's a "
-#| "good idea to fill the first few sectors with zeros. You should do this "
-#| "prior to running DOS's <command>format</command> command by executing the "
-#| "following command from Debian:"
+#: preparing.xml:1029
+#, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
 "good idea to fill the first few sectors with zeros. You should do this prior "
 "to running DOS's <command>format</command> command by executing the "
 "following command from &debian;:"
 msgstr ""
-"Có vẻ là khi nào bạn tạo hoặc thay đổi kích cỡ của một phân vùng cho DOS dùng, một ý kiến tốt là tô đầy vài rãnh ghi đầu tiên bằng số không. Bạn nên làm việc này trước khi chạy lệnh <command>format</command> (định dạng) của DOS, bằng cách chạy câu lệnh này từ &debian;:"
+"Có vẻ là khi nào bạn tạo hoặc thay đổi kích cỡ của một phân vùng cho DOS "
+"dùng, một ý kiến tốt là tô đầy vài rãnh ghi đầu tiên bằng số không. Bạn nên "
+"làm việc này trước khi chạy lệnh <command>format</command> (định dạng) của "
+"DOS, bằng cách chạy câu lệnh này từ &debian;:"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: preparing.xml:1038
-#, no-c-format
 #. Tag: screen
+#: preparing.xml:1036
+#, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
-#: preparing.xml:1049
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1047
+#, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "Phân vùng từ SunOS"
 
-#: preparing.xml:1051
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "It's perfectly fine to partition from SunOS; in fact, if you intend to "
-#| "run both SunOS and Debian on the same machine, it is recommended that you "
-#| "partition using SunOS prior to installing Debian. The Linux kernel "
-#| "understands Sun disk labels, so there are no problems there. SILO "
-#| "supports booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), "
-#| "romfs or iso9660 (CDROM) partitions."
+#: preparing.xml:1049
+#, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
 "both SunOS and &debian; on the same machine, it is recommended that you "
@@ -1800,18 +1714,22 @@ msgid ""
 "booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), romfs or "
 "iso9660 (CDROM) partitions."
 msgstr ""
-"Có thể phân vùng được từ hệ điều hành SunOS. Tức là, nếu bạn dự định chạy cả hai hệ điều hành SunOS và &debian; trên cùng một máy, khuyên bạn phân vùng bằng SunOS trước khi cài đặt &debian;. Hạt nhân Linux hiểu được các nhãn đĩa kiểu SunOS nên không có sao. SILO hỗ trợ chức năng khởi động Linux và SunOS từ phân vùng bất cứ kiểu EXT2 (Linux), UFS (SunOS), romfs hay iso9660 "
+"Có thể phân vùng được từ hệ điều hành SunOS. Tức là, nếu bạn dự định chạy cả "
+"hai hệ điều hành SunOS và &debian; trên cùng một máy, khuyên bạn phân vùng "
+"bằng SunOS trước khi cài đặt &debian;. Hạt nhân Linux hiểu được các nhãn đĩa "
+"kiểu SunOS nên không có sao. SILO hỗ trợ chức năng khởi động Linux và SunOS "
+"từ phân vùng bất cứ kiểu EXT2 (Linux), UFS (SunOS), romfs hay iso9660 "
 "(CDROM) nào."
 
-#: preparing.xml:1063
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1061
+#, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Phân vùng từ Linux hay HĐH khác"
 
-#: preparing.xml:1065
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1063
+#, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
 "<quote>Sun disk label</quote> on your boot disk. This is the only kind of "
@@ -1832,9 +1750,9 @@ msgstr ""
 "định dạng bằng máy PC (hay bằng kiến trúc khác) bạn cần phải tạo một nhãn "
 "đĩa mới, nếu không sẽ gặp khó khăn với dạng hình của đĩa."
 
-#: preparing.xml:1077
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1075
+#, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
 "small program which runs the operating system kernel). <command>SILO</"
@@ -1846,15 +1764,15 @@ msgstr ""
 "cần thiết kích cỡ và vị trí phân vùng đặc biệt: hãy xem <xref linkend="
 "\"partitioning\"/>."
 
-#: preparing.xml:1092
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1090
+#, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "Phân vùng MacOS/MacOSX"
 
-#: preparing.xml:1094
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1092
+#, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
 "the <filename>Utilities</filename> folder on the MacOS CD. It will not "
@@ -1868,9 +1786,9 @@ msgstr ""
 "Ứng dụng <application>Drive Setup</application> cũng không hiển thị những "
 "phân vùng dành cho trình điều khiển đĩa."
 
-#: preparing.xml:1101
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1099
+#, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
 "positioned first in the disk layout. it doesn't matter what type it is, it "
@@ -1880,9 +1798,9 @@ msgstr ""
 "thứ nhất trong bố trí đĩa. Kiểu phân vùng không quan trọng, vì nó sẽ bị xoá "
 "bỏ và thay thế sau này trong tiến trình cài đặt &debian-gnu;."
 
-#: preparing.xml:1107
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1105
+#, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
 "separate partitions for OS 9 and OS X. If they are installed on the same "
@@ -1907,9 +1825,9 @@ msgstr ""
 "thể tác động lên khả năng khởi động GNU/Linux. Bạn sẽ cũng có thể truy cập "
 "mỗi kiểu phân vùng từ hệ điều hành hoặc OS9 hoặc OSX."
 
-#: preparing.xml:1120
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1118
+#, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
 "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
@@ -1926,23 +1844,15 @@ msgstr ""
 "hệ điều hành MacOS và GNU/Linux, hữu ích để tạo một phân vùng trao đổi. Cả "
 "hai HĐH MacOS và GNU/Linux hỗ trợ phân vùng kiểu HFS, HFS+ và MS-DOS FAT."
 
-#: preparing.xml:1140
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1138
+#, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Phần cứng cài đặt sẵn và thiết lập hệ điều hành"
 
-#: preparing.xml:1141
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "This section will walk you through pre-installation hardware setup, if "
-#| "any, that you will need to do prior to installing Debian. Generally, this "
-#| "involves checking and possibly changing firmware settings for your "
-#| "system. The <quote>firmware</quote> is the core software used by the "
-#| "hardware; it is most critically invoked during the bootstrap process "
-#| "(after power-up). Known hardware issues affecting the reliability of "
-#| "&debian-gnu; on your system are also highlighted."
+#: preparing.xml:1139
+#, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
 "that you will need to do prior to installing &debian;. Generally, this "
@@ -1952,24 +1862,23 @@ msgid ""
 "hardware issues affecting the reliability of &debian-gnu; on your system are "
 "also highlighted."
 msgstr ""
-"Tiết đoạn này sẽ hướng dẫn bạn qua tiến trình thiết lập phần cứng nào yêu cầu trước khi cài đặt &debian;. Bình thường, tiến trình này gồm có việc kiểm tra, và có thể thay đổi, thiết lập phần vững cho hệ thống. <quote>Phần vững</quote> (firmware) là phần mềm lõi được dùng bởi phần cứng, đặc biệt trong tiến trình nạp và khởi động hệ điều hành (một khi mở điện). Bên dưới cũng diễn tả một số vấn đề phần cứng đã biết có tác động sự đáng tin cậy của &debian-gnu; trên máy tính của bạn."
+"Tiết đoạn này sẽ hướng dẫn bạn qua tiến trình thiết lập phần cứng nào yêu "
+"cầu trước khi cài đặt &debian;. Bình thường, tiến trình này gồm có việc kiểm "
+"tra, và có thể thay đổi, thiết lập phần vững cho hệ thống. <quote>Phần vững</"
+"quote> (firmware) là phần mềm lõi được dùng bởi phần cứng, đặc biệt trong "
+"tiến trình nạp và khởi động hệ điều hành (một khi mở điện). Bên dưới cũng "
+"diễn tả một số vấn đề phần cứng đã biết có tác động sự đáng tin cậy của "
+"&debian-gnu; trên máy tính của bạn."
 
-#: preparing.xml:1163
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1161
+#, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Gọi trình đơn thiết lập BIOS"
 
-#: preparing.xml:1165
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "BIOS provides the basic functions needed to boot your machine to allow "
-#| "your operating system to access your hardware. Your system probably "
-#| "provides a BIOS setup menu, which is used to configure the BIOS. Before "
-#| "installing, you <emphasis>must</emphasis> ensure that your BIOS is set up "
-#| "correctly; not doing so can lead to intermittent crashes or an inability "
-#| "to install Debian."
+#: preparing.xml:1163
+#, no-c-format
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
 "operating system to access your hardware. Your system probably provides a "
@@ -1978,12 +1887,16 @@ msgid ""
 "doing so can lead to intermittent crashes or an inability to install "
 "&debian;."
 msgstr ""
-"BIOS (hệ thống vào/ra cơ bản) cung cấp các chức năng cơ bản cần thiết để khởi động máy, để cho phép hệ điều hành truy cập đến phần cứng. Hệ điều hành gốc rất có thể cung cấp một trình đơn thiết lập BIOS, được dùng để cấu hình BIOS đó. Trước khi cài đặt &debian;, bạn <emphasis>cần phải</emphasis> kiểm tra xem BIOS có thiết lập đúng: nếu không thì máy sụp đổ lúc có lúc không, hoặc bạn "
-"sẽ không có khả năng cài đặt &debian;."
+"BIOS (hệ thống vào/ra cơ bản) cung cấp các chức năng cơ bản cần thiết để "
+"khởi động máy, để cho phép hệ điều hành truy cập đến phần cứng. Hệ điều hành "
+"gốc rất có thể cung cấp một trình đơn thiết lập BIOS, được dùng để cấu hình "
+"BIOS đó. Trước khi cài đặt &debian;, bạn <emphasis>cần phải</emphasis> kiểm "
+"tra xem BIOS có thiết lập đúng: nếu không thì máy sụp đổ lúc có lúc không, "
+"hoặc bạn sẽ không có khả năng cài đặt &debian;."
 
-#: preparing.xml:1174
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1172
+#, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
 "ulink>, answering the question, <quote>How do I enter the CMOS configuration "
@@ -1995,27 +1908,27 @@ msgstr ""
 "thế nào?</quote>. Cách truy cập trình đơn cấu hình BIOS (hay <quote>CMOS</"
 "quote>) phụ thuộc vào ai đã ghi phần mềm BIOS đó:"
 
-#: preparing.xml:1188
-#, no-c-format
 #. Tag: term
+#: preparing.xml:1186
+#, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
-#: preparing.xml:1189
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1187
+#, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "Phím <keycap>Delete</keycap> trong POST (việc mở điện tự kiểm tra)"
 
-#: preparing.xml:1197
-#, no-c-format
 #. Tag: term
+#: preparing.xml:1195
+#, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
-#: preparing.xml:1198
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1196
+#, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
 "keycombo>, or <keycap>Delete</keycap> key during the POST"
@@ -2023,27 +1936,27 @@ msgstr ""
 "Tổ hợp phím <keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</"
 "keycap> </keycombo>, hay <keycap>Delete</keycap> trong POST"
 
-#: preparing.xml:1207
-#, no-c-format
 #. Tag: term
+#: preparing.xml:1205
+#, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
-#: preparing.xml:1208
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1206
+#, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "Phím <keycap>Esc</keycap> trong POST"
 
-#: preparing.xml:1215
-#, no-c-format
 #. Tag: term
+#: preparing.xml:1213
+#, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
-#: preparing.xml:1216
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1214
+#, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
 "</keycombo> after <keycombo> <keycap>Ctrl</keycap><keycap>Alt</"
@@ -2053,15 +1966,15 @@ msgstr ""
 "keycap><keycap>Insert</keycap> </keycombo> sau <keycombo> <keycap>Ctrl</"
 "keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
 
-#: preparing.xml:1230
-#, no-c-format
 #. Tag: term
+#: preparing.xml:1228
+#, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
-#: preparing.xml:1231
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1229
+#, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
 "keycombo> or <keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>S</"
@@ -2071,9 +1984,9 @@ msgstr ""
 "keycap> </keycombo> hay <keycombo> <keycap>Ctrl</keycap><keycap>Alt</"
 "keycap><keycap>S</keycap> </keycombo> hay <keycap>F1</keycap>"
 
-#: preparing.xml:1247
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1245
+#, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
 "\"&url-invoking-bios-info;\"></ulink>."
@@ -2081,9 +1994,9 @@ msgstr ""
 "Thông tin về cách gọi hàm BIOS khác nằm trong <ulink url=\"&url-invoking-"
 "bios-info;\"></ulink>."
 
-#: preparing.xml:1252
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1250
+#, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
 "They require a software CMOS setup program. If you don't have the "
@@ -2097,25 +2010,15 @@ msgstr ""
 "bạn có thể thử sử dụng một chương trình phần mềm cổ đông/biếu không: v.d. "
 "xem <ulink url=\"&url-simtel;\"></ulink>."
 
-#: preparing.xml:1263
-#: preparing.xml:1581
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1261 preparing.xml:1579
+#, no-c-format
 msgid "Boot Device Selection"
 msgstr "Chọn thiết bị khởi động"
 
-#: preparing.xml:1265
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Many BIOS setup menus allow you to select the devices that will be used "
-#| "to bootstrap the system. Set this to look for a bootable operating system "
-#| "on <filename>A:</filename> (the first floppy disk), then optionally the "
-#| "first CD-ROM device (possibly appearing as <filename>D:</filename> or "
-#| "<filename>E:</filename>), and then from <filename>C:</filename> (the "
-#| "first hard disk). This setting enables you to boot from either a floppy "
-#| "disk or a CD-ROM, which are the two most common boot devices used to "
-#| "install Debian."
+#: preparing.xml:1263
+#, no-c-format
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
 "bootstrap the system. Set this to look for a bootable operating system on "
@@ -2125,11 +2028,18 @@ msgid ""
 "This setting enables you to boot from either a floppy disk or a CD-ROM, "
 "which are the two most common boot devices used to install &debian;."
 msgstr ""
-"Nhiều trình đơn thiết lập BIOS cho phép bạn chọn (những) thiết bị cần dùng để nạp và khởi động hệ điều hành. Lập nó tìm một hệ điều hành có khả năng khởi động và nằm trên <filename>A:</filename> (đĩa mềm thứ nhất), sau đó (tùy chọn) trên thiết bị đĩa CD-ROM thứ nhất (có thể là <filename>D:</filename> hay <filename>E:</filename>), sau đó trên <filename>C:</filename> (đĩa cứng thứ nhất). Thiết lập này cho bạn có khả năng khởi động từ hoặc một đĩa mềm hoặc một đĩa CD-ROM, hai thiết bị khởi động thường dùng nhất để cài đặt &debian;."
+"Nhiều trình đơn thiết lập BIOS cho phép bạn chọn (những) thiết bị cần dùng "
+"để nạp và khởi động hệ điều hành. Lập nó tìm một hệ điều hành có khả năng "
+"khởi động và nằm trên <filename>A:</filename> (đĩa mềm thứ nhất), sau đó "
+"(tùy chọn) trên thiết bị đĩa CD-ROM thứ nhất (có thể là <filename>D:</"
+"filename> hay <filename>E:</filename>), sau đó trên <filename>C:</filename> "
+"(đĩa cứng thứ nhất). Thiết lập này cho bạn có khả năng khởi động từ hoặc một "
+"đĩa mềm hoặc một đĩa CD-ROM, hai thiết bị khởi động thường dùng nhất để cài "
+"đặt &debian;."
 
-#: preparing.xml:1276
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1274
+#, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
 "it, you are usually able to boot from the CD-ROM. All you have to do is "
@@ -2140,9 +2050,9 @@ msgstr ""
 "đơn giản hãy hiệu lực khả năng khởi động từ đĩa CD-ROM trong SCSI-BIOS của "
 "bộ điều khiển này."
 
-#: preparing.xml:1283
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1281
+#, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
 "USB memory stick or USB key). Some BIOSes can boot directly from a USB "
@@ -2157,9 +2067,9 @@ msgstr ""
 "(removable drive) hay ngay cả từ <quote>USB-ZIP</quote> để làm cho nó khởi "
 "động từ thiết bị USB."
 
-#: preparing.xml:1291
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1289
+#, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
 "boot order after &arch-kernel; is installed, so that you restart your "
@@ -2168,15 +2078,15 @@ msgstr ""
 "Đây là vài chi tiết về cách đặt thứ tự khởi động. Hãy nhớ để đặt lại thứ tự "
 "khởi động sau khi cài đặt &arch-kernel;, để khởi động lại máy từ đĩa cứng."
 
-#: preparing.xml:1300
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1298
+#, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "Thay đổi thứ tự khởi động trên máy IDE"
 
-#: preparing.xml:1303
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1301
+#, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
 "is the <keycap>Delete</keycap> key. However, consult the hardware "
@@ -2186,9 +2096,9 @@ msgstr ""
 "phím <keycap>Delete</keycap>. Tùy nhiên, bạn hãy xem tài liệu hướng dẫn sử "
 "dụng phần cứng đó để tìm tổ hợp phím chính xác."
 
-#: preparing.xml:1310
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1308
+#, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
 "BIOS, but you are looking for a field that lists drives."
@@ -2197,21 +2107,21 @@ msgstr ""
 "lập. Vị trí của nó phụ thuộc vào BIOS đó, nhưng bạn cần tìm một trường liệt "
 "kê các ổ đĩa."
 
-#: preparing.xml:1315
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1313
+#, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "Mục nhập thường xem trên máy IDE là : C, A, cdrom hay A, C, cdrom."
 
-#: preparing.xml:1320
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1318
+#, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C là ổ đĩa cứng, còn A là ổ đĩa mềm."
 
-#: preparing.xml:1326
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1324
+#, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
 "Usually, the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> keys "
@@ -2221,9 +2131,9 @@ msgstr ""
 "có vị trí thứ nhất. Bình thường, hai phím <keycap>Page Up</keycap> và "
 "<keycap>Page Down</keycap> cuộn qua các sự chọn có thể."
 
-#: preparing.xml:1334
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1332
+#, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
 "changes on your computer."
@@ -2231,22 +2141,22 @@ msgstr ""
 "Lưu các thay đổi. Những hướng dẫn trên màn hình diễn tả cách lưu các thay "
 "đổi này trên máy đó."
 
-#: preparing.xml:1344
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1342
+#, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "Thay đổi thứ tự khởi động trên máy kiểu SCSI"
 
-#: preparing.xml:1348
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1346
+#, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr "Vào lúc khởi động máy, hãy bấm tổ hợp phím để vào tiện ích SCSI."
 
-#: preparing.xml:1353
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1351
+#, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
 "about how to start the BIOS utility displays when you start your computer."
@@ -2255,9 +2165,9 @@ msgstr ""
 "và thông điệp về cách khởi chạy tiện ích BIOS xuất hiện, khi bạn khởi động "
 "máy đó."
 
-#: preparing.xml:1359
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1357
+#, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
 "<keycombo><keycap>Ctrl</keycap><keycap>F2</keycap></keycombo>. However, "
@@ -2268,24 +2178,24 @@ msgstr ""
 "bạn hãy xem tài liệu hướng dẫn sử dụng phần cứng để tìm tổ hợp phím chính "
 "xác."
 
-#: preparing.xml:1367
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1365
+#, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "Tìm tiện ích thay đổi thứ tự khởi động."
 
-#: preparing.xml:1372
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1370
+#, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
 msgstr ""
 "Đặt tiện ích đó, để hiển thị mã nhận diện SCSI (SCSI ID) của ổ đĩa CD có vị "
 "trí thứ nhất trong danh sách."
 
-#: preparing.xml:1378
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1376
+#, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
 "changes on your computer. Often, you must press <keycap>F10</keycap>."
@@ -2293,21 +2203,21 @@ msgstr ""
 "Lưu các thay đổi. Những hướng dẫn trên màn hình diễn tả cách lưu các thay "
 "đổi này trên máy đó. Thường cần bấm phím <keycap>F10</keycap>."
 
-#: preparing.xml:1392
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1390
+#, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "Thiết lập BIOS lặt vặt"
 
-#: preparing.xml:1394
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1392
+#, no-c-format
 msgid "CD-ROM Settings"
 msgstr "Thiết lập đĩa CD-ROM"
 
-#: preparing.xml:1395
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1393
+#, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
 "speed. You should avoid that, and instead set it to, say, the lowest speed. "
@@ -2319,15 +2229,15 @@ msgstr ""
 "lỗi <userinput>lỗi tìm nơi</userinput> (seek failed), có lẽ máy có tốc độ CD "
 "cao quá."
 
-#: preparing.xml:1405
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1403
+#, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "Bộ nhớ đã kéo dài so với bộ nhớ đã mở rộng"
 
-#: preparing.xml:1406
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1404
+#, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
 "ex<emphasis>pan</emphasis>ded memory, set it so that there is as much "
@@ -2339,15 +2249,15 @@ msgstr ""
 "ít nhất bộ nhớ đã mở rộng có thể. Hệ điều hành &arch-kernel; cần thiết bộ "
 "nhớ đã kéo dài, còn không có khả năng sử dụng bộ nhớ đã mở rộng."
 
-#: preparing.xml:1416
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1414
+#, no-c-format
 msgid "Virus Protection"
 msgstr "Bảo vệ chống vi rút"
 
-#: preparing.xml:1417
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1415
+#, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
 "virus-protection board or other special hardware, make sure it is disabled "
@@ -2371,15 +2281,15 @@ msgstr ""
 "ngăn cản tai ương. Không cần sửa đổi Mục Ghi Khởi Động Chủ (MBR) sau khi "
 "thiết lập bộ quản lý khởi động.</para> </footnote>."
 
-#: preparing.xml:1438
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1436
+#, no-c-format
 msgid "Shadow RAM"
 msgstr "RAM bóng"
 
-#: preparing.xml:1439
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1437
+#, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
 "caching. You may see settings for <quote>Video BIOS Shadow</quote>, "
@@ -2403,15 +2313,15 @@ msgstr ""
 "sử dụng như là bộ nhớ chuẩn. Còn RAM bóng hoạt động có thể ngăn cản &arch-"
 "kernel; truy cập thiết bị phần cứng."
 
-#: preparing.xml:1456
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1454
+#, no-c-format
 msgid "Memory Hole"
 msgstr "Lỗ hổng bộ nhớ"
 
-#: preparing.xml:1457
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1455
+#, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
 "quote>, please disable that. &arch-kernel; expects to find memory there if "
@@ -2421,9 +2331,9 @@ msgstr ""
 "quote> (lỗ hổng bộ nhớ), bạn hãy tắt nó. Hệ điều hành &arch-kernel; ngờ gặp "
 "bộ nhớ tại đó nếu bạn có đủ RAM."
 
-#: preparing.xml:1463
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1461
+#, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
 "option called <quote>LFB</quote> or <quote>Linear Frame Buffer</quote>. This "
@@ -2441,15 +2351,15 @@ msgstr ""
 "viết câu này, chúng tôi chưa hiểu lý do : thiết bị đó đơn giản hoạt động "
 "được với một sự đặt, và không hoạt động được với sự đặt khác."
 
-#: preparing.xml:1479
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1477
+#, no-c-format
 msgid "Advanced Power Management"
 msgstr "Khả năng quản lý nguồn điện cấp cao"
 
-#: preparing.xml:1480
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1478
+#, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
 "so that power management is controlled by APM. Disable the doze, standby, "
@@ -2463,15 +2373,15 @@ msgstr ""
 "cứng. Hệ điều hành &arch-kernel; có thể điều khiển các chế độ này, cũng quản "
 "lý nguồn điện một cách rất tốt hơn BIOS."
 
-#: preparing.xml:1498
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1496
+#, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Gọi OpenFirmware"
 
-#: preparing.xml:1499
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1497
+#, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
 "title; systems. PReP and CHRP are equipped with OpenFirmware, but "
@@ -2484,9 +2394,9 @@ msgstr ""
 "gọi nó thay đổi mỗi hãng chế tạo một khác. Bạn cần phải xem tài liệu hướng "
 "dẫn có sẵn với máy đó."
 
-#: preparing.xml:1507
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1505
+#, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
 "<keycombo><keycap>Command (cloverleaf/Apple)</keycap><keycap>Option</"
@@ -2502,9 +2412,9 @@ msgstr ""
 "động, nhưng mà cách tính thời gian chính xác biên đổi mỗi mẫu một khác. Xem "
 "Hỏi Đáp <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> để tìm mẹo thêm."
 
-#: preparing.xml:1515
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1513
+#, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
 "ok\n"
@@ -2527,9 +2437,9 @@ msgstr ""
 "máy tính khác, được kết nối đến cổng bộ điều giải, để tương tác với "
 "OpenFirmware."
 
-#: preparing.xml:1528
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1526
+#, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
 "is broken. These machines will most likely not be able to boot from the hard "
@@ -2549,15 +2459,15 @@ msgstr ""
 "tiện ích này dưới MacOS, và khởi chạy nó, hãy bấm cái nút <guibutton>Save</"
 "guibutton> (Lưu) để cài đặt các đắp vá phần vững vào bộ nhớ nvram."
 
-#: preparing.xml:1548
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1546
+#, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Gọi OpenBoot"
 
-#: preparing.xml:1550
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1548
+#, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
 "architecture. This is rather similar in function to the BIOS in the x86 "
@@ -2571,9 +2481,9 @@ msgstr ""
 "thông dịch « forth » cho bạn một số khả năng có ích, v.d. chẩn đoán và chạy "
 "tập lệnh đơn giản."
 
-#: preparing.xml:1558
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1556
+#, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
 "key (on older type 4 keyboards, use the <keycap>L1</keycap> key, if you have "
@@ -2591,9 +2501,9 @@ msgstr ""
 "<userinput>ok</userinput> là tốt hơn, vậy nếu bạn xem dấu nhắc kiểu cũ, bấm "
 "phím <keycap>n</keycap> để hiển thị dấu nhắc kiểu mới."
 
-#: preparing.xml:1570
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1568
+#, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
 "Minicom, use <keycap>Ctrl-A F</keycap>, with cu, hit <keycap>Enter</keycap>, "
@@ -2606,9 +2516,9 @@ msgstr ""
 "userinput>. Xem tài liệu hướng dẫn sử dụng phần mềm mô phỏng thiết bị cuối "
 "nếu bạn chạy chương trình khác."
 
-#: preparing.xml:1583
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1581
+#, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
 "default boot device. However, you need to know some details about how "
@@ -2626,9 +2536,9 @@ msgstr ""
 "dùng. Thông tin thêm về OpenBoot nằm trong Tham Chiếu OpenBoot của Sun "
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
-#: preparing.xml:1593
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1591
+#, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
 "<quote>floppy</quote>, <quote>cdrom</quote>, <quote>net</quote>, "
@@ -2669,9 +2579,9 @@ msgstr ""
 "bản sửa đổi, xem Tham Chiếu OpenBoot của Sun <ulink url=\"&url-openboot;"
 "\">Sun OpenBoot Reference</ulink>."
 
-#: preparing.xml:1616
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1614
+#, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
 "<replaceable>device</replaceable></userinput>. You can set this behavior as "
@@ -2702,21 +2612,21 @@ msgstr ""
 "</screen></informalexample> còn dưới Solaris:"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: preparing.xml:1635
-#, no-c-format
 #. Tag: screen
+#: preparing.xml:1633
+#, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
-#: preparing.xml:1645
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1643
+#, no-c-format
 msgid "BIOS Setup"
 msgstr "Thiết lập BIOS"
 
-#: preparing.xml:1646
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1644
+#, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
 "have first boot a kernel into the system. The boot mechanism of this "
@@ -2736,9 +2646,9 @@ msgstr ""
 "khách, v.d. telnet hay trình duyệt Mạng. Các sự khác này do kiến trúc hệ "
 "thống đặc biệt: bàn điều khiển 3215/3270 dựa vào dòng, không phải vào ký tự."
 
-#: preparing.xml:1658
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1656
+#, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
 "called LPAR (Logical Partition) or in a virtual machine supplied by the VM "
@@ -2756,20 +2666,9 @@ msgstr ""
 "giao tiếp quản lý phần cứng) của một LPAR nếu cả HMC lẫn tùy chọn này đều "
 "sẵn sàng."
 
-#: preparing.xml:1668
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Before you actually perform an installation, you have to go over some "
-#| "design and preparation steps. IBM has made documentation available about "
-#| "the whole process, e.g. how to prepare an installation medium and how "
-#| "actually to boot from that medium. Duplicating that information here is "
-#| "neither possible nor necessary. However, we will describe here which kind "
-#| "of Debian-specific data is needed and where to find it. Using both "
-#| "sources of information, you have to prepare your machine and the "
-#| "installation medium before you can perform a boot from it. When you see "
-#| "the welcome message in your client session, return to this document to go "
-#| "through the Debian-specific installation steps."
+#: preparing.xml:1666
+#, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
 "and preparation steps. IBM has made documentation available about the whole "
@@ -2782,17 +2681,25 @@ msgid ""
 "session, return to this document to go through the &debian;-specific "
 "installation steps."
 msgstr ""
-"Trước khi thật thực hiện tiến trình cài đặt, bạn cần phải theo vài bước thiết kế và chuẩn bị. Công ty IBM đã cung cấp tài liệu hướng dẫn về toàn bộ tiến trình này, v.d. phương pháp chuẩn bị vật chứa cài đặt và khởi động từ nó. Không cần (và không thể) nhân đôi thông tin đó vào đây. Tuy nhiên, ở đây chúng tôi sẽ diễn tả kiểu dữ liệu đặc trưng cho &debian; nào cần thiết, và có thể tìm nó ở đâu. Dựa vào cả hai nguồn thông tin này, bạn cần phải chuẩn bị máy và vật chứa cài đặt, để có khả năng thực hiện việc khởi động từ nó. Khi bạn xem thông điệp chào mừng trong buổi hợp của ứng dụng khách, hãy trở về tài liệu này để theo những bước cài đặt đặc trưng cho &debian;."
+"Trước khi thật thực hiện tiến trình cài đặt, bạn cần phải theo vài bước "
+"thiết kế và chuẩn bị. Công ty IBM đã cung cấp tài liệu hướng dẫn về toàn bộ "
+"tiến trình này, v.d. phương pháp chuẩn bị vật chứa cài đặt và khởi động từ "
+"nó. Không cần (và không thể) nhân đôi thông tin đó vào đây. Tuy nhiên, ở đây "
+"chúng tôi sẽ diễn tả kiểu dữ liệu đặc trưng cho &debian; nào cần thiết, và "
+"có thể tìm nó ở đâu. Dựa vào cả hai nguồn thông tin này, bạn cần phải chuẩn "
+"bị máy và vật chứa cài đặt, để có khả năng thực hiện việc khởi động từ nó. "
+"Khi bạn xem thông điệp chào mừng trong buổi hợp của ứng dụng khách, hãy trở "
+"về tài liệu này để theo những bước cài đặt đặc trưng cho &debian;."
 
-#: preparing.xml:1685
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1683
+#, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Sự cài đặt kiểu sở hữu và LPAR"
 
-#: preparing.xml:1686
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1684
+#, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
 "pubs/pdfs/redbooks/sg244987.pdf\"> Linux for &arch-title;</ulink> Redbook "
@@ -2806,15 +2713,15 @@ msgstr ""
 "sg246264.pdf\"> Linux for IBM eServer zSeries and &arch-title;: "
 "distributions</ulink> để tìm thông tin về cách thiết lập LPAR dành cho Linux."
 
-#: preparing.xml:1700
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1698
+#, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Cài đặt như là khách VM"
 
-#: preparing.xml:1702
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1700
+#, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
 "pubs/pdfs/redbooks/sg244987.pdf\"> Linux for &arch-title;</ulink> Redbook "
@@ -2829,29 +2736,37 @@ msgstr ""
 "distributions</ulink> để tìm thông tin về cách thiết lập một ứng dụng khách "
 "VM để chạy Linux."
 
-#: preparing.xml:1712
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "Bạn cần phải sao chép mọi tập tin nằm trong thư mục con <filename>generic</"
 "filename> sang đĩa CMS của bạn. Quan trọng là bạn truyền tập tin "
 "<filename>kernel.debian</filename> và <filename>initrd.debian</filename> "
 "trong chế độ nhị phân (binary mode) với độ dài cố định là 80 ký tự."
 
-#: preparing.xml:1724
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1726
+#, no-c-format
 msgid "Setting up an installation server"
 msgstr "Thiết lập máy phục vụ cài đặt"
 
-#: preparing.xml:1726
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1728
+#, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
 "proxy) you need to create a local installation server that can be accessed "
@@ -2863,9 +2778,9 @@ msgstr ""
 "truy cập từ S/390 của bạn. Máy phục vụ này giữ các gói bạn muốn cài đặt, và "
 "phải cung cấp chúng bằng giao thức NFS, HTTP hay FTP."
 
-#: preparing.xml:1734
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1736
+#, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
 "&debian-gnu; mirror, but only the s390 and architecture-independent files "
@@ -2877,27 +2792,27 @@ msgstr ""
 "tin không phụ thuộc vào kiến trúc. Bạn cũng có khả năng sao chép nội dung "
 "của các đĩa CD cài đặt vào cây thư mục như vậy."
 
-#: preparing.xml:1743
-#, no-c-format
 #. Tag: emphasis
+#: preparing.xml:1745
+#, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: (chưa ghi đoạn tiếng Anh)"
 
-#: preparing.xml:1750
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1752
+#, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Vấn đề phần cứng cần theo dõi"
 
-#: preparing.xml:1753
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1755
+#, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Hỗ trợ BIOS và bàn phím kiểu USB"
 
-#: preparing.xml:1754
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1756
+#, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
 "enable legacy AT keyboard emulation in your BIOS setup. Only do this if the "
@@ -2916,15 +2831,15 @@ msgstr ""
 "chọn <quote>Legacy keyboard emulation</quote> (mô phỏng bàn phím kiểu cũ) "
 "hay <quote>USB keyboard support</quote> (khả năng hỗ trợ bàn phím USB)."
 
-#: preparing.xml:1768
-#, no-c-format
 #. Tag: title
+#: preparing.xml:1770
+#, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Tầm nhìn bộ trình bày của PowerMac kiểu cũ"
 
-#: preparing.xml:1770
-#, no-c-format
 #. Tag: para
+#: preparing.xml:1772
+#, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
 "display driver, may not reliably produce a colormap under Linux when the "
@@ -2944,3 +2859,14 @@ msgstr ""
 "thay vào hiển thị giao diện người dùng, hãy thử thay đổi thiết lập trình bày "
 "dưới hệ điều hành MacOS thành 256 màu sắc thay cho <quote>thousands</quote> "
 "(mấy nghìn) hay <quote>millions</quote> (mấy tỷ) màu sắc."
+
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "Hướng dẫn cài đặt và trình điều khiển thiết bị (DASD, XPRAM, bàn giao "
+#~ "tiếp, băng, mật mã z90, chandev, mạng) khi chạy Linux trên &arch-title; "
+#~ "bằng hạt nhân phiên bản 2.4"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "Trình điều khiển thiết bị và lệnh cài đặt"
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index b60975e1d..c99469b05 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-23 18:15+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: preseed.xml:16
 #, no-c-format
-#. Tag: title
 msgid "Automating the installation using preseeding"
 msgstr "Tự động hoá việc cài đặt bằng chèn sẵn"
 
+#. Tag: para
 #: preseed.xml:18
 #, no-c-format
-#. Tag: para
 msgid ""
 "This appendix explains how to preseed answers to questions in &d-i; to "
 "automate your installation."
@@ -33,10 +33,9 @@ msgstr ""
 "Phụ lục này giải thích phương pháp chèn sẵn thông tin trả lời các câu hỏi "
 "trong &d-i; để tự động hoá tiến trình cài đặt."
 
-#: preseed.xml:23
-#: preseed.xml:676
-#, no-c-format
 #. Tag: para
+#: preseed.xml:23 preseed.xml:676
+#, no-c-format
 msgid ""
 "The configuration fragments used in this appendix are also available as an "
 "example preconfiguration file from &urlset-example-preseed;."
@@ -44,15 +43,15 @@ msgstr ""
 "Những đoạn cấu hình được dùng trong phụ lục này cũng sẵn sàng dạng tập tin "
 "định cấu hình sẵn ví dụ tại &urlset-example-preseed;."
 
+#. Tag: title
 #: preseed.xml:31
 #, no-c-format
-#. Tag: title
 msgid "Introduction"
 msgstr "Giới thiệu"
 
+#. Tag: para
 #: preseed.xml:32
 #, no-c-format
-#. Tag: para
 msgid ""
 "Preseeding provides a way to set answers to questions asked during the "
 "installation process, without having to manually enter the answers while the "
@@ -65,9 +64,9 @@ msgstr ""
 "thì có khả năng tự động hoá hoàn toàn phần lớn kiểu việc cài đặt, ngay cả "
 "cung cấp một số tính năng không sẵn sàng trong tiến trình cài đặt chuẩn."
 
+#. Tag: para
 #: preseed.xml:40
 #, no-c-format
-#. Tag: para
 msgid ""
 "Preseeding is not required. If you use an empty preseed file, the installer "
 "will behave just the same way as in a normal manual installation. Each "
@@ -79,15 +78,15 @@ msgstr ""
 "Mỗi câu hỏi bạn chèn sẵn sẽ (nếu bạn đã đặt dữ liệu đúng) sửa đổi bản cài "
 "đặt bằng cách nào so với đường cơ sở đó."
 
+#. Tag: title
 #: preseed.xml:50
 #, no-c-format
-#. Tag: title
 msgid "Preseeding methods"
 msgstr "Phương pháp chèn sẵn"
 
+#. Tag: para
 #: preseed.xml:51
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are three methods that can be used for preseeding: <firstterm>initrd</"
 "firstterm>, <firstterm>file</firstterm> and <firstterm>network</firstterm>. "
@@ -102,9 +101,9 @@ msgstr ""
 "Tiến trình chèn sẵn kiểu tập tin và mạng có thể được dùng với phương pháp "
 "cài đặt khác nhau."
 
+#. Tag: para
 #: preseed.xml:60
 #, no-c-format
-#. Tag: para
 msgid ""
 "The following table shows which preseeding methods can be used with which "
 "installation methods."
@@ -112,61 +111,49 @@ msgstr ""
 "Theo đây có bảng hiển thị phương pháp chèn sẵn nào dùng được với phương pháp "
 "cài đặt nào."
 
+#. Tag: entry
 #: preseed.xml:69
 #, no-c-format
-#. Tag: entry
 msgid "Installation method"
 msgstr "Phương pháp cài đặt"
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: entry
 #: preseed.xml:69
 #, no-c-format
-#. Tag: entry
 msgid "initrd"
 msgstr "initrd"
 
-#: preseed.xml:70
-#: preseed.xml:523
-#, no-c-format
 #. Tag: entry
+#: preseed.xml:70 preseed.xml:523
+#, no-c-format
 msgid "file"
 msgstr "tập tin"
 
+#. Tag: entry
 #: preseed.xml:70
 #, no-c-format
-#. Tag: entry
 msgid "network"
 msgstr "mạng"
 
+#. Tag: entry
 #: preseed.xml:76
 #, no-c-format
-#. Tag: entry
 msgid "CD/DVD"
 msgstr "CD/DVD"
 
-#: preseed.xml:77
-#: preseed.xml:78
-#: preseed.xml:79
-#: preseed.xml:89
-#: preseed.xml:91
-#: preseed.xml:94
-#: preseed.xml:95
-#: preseed.xml:96
-#: preseed.xml:99
-#: preseed.xml:100
-#: preseed.xml:101
-#: preseed.xml:104
-#: preseed.xml:106
-#: preseed.xml:109
+#. Tag: entry
+#: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91
+#: preseed.xml:94 preseed.xml:95 preseed.xml:96 preseed.xml:99 preseed.xml:100
+#: preseed.xml:101 preseed.xml:104 preseed.xml:106 preseed.xml:109
 #: preseed.xml:111
 #, no-c-format
-#. Tag: entry
 msgid "<entry>yes</entry>"
 msgstr "<entry>có</entry>"
 
+#. Tag: para
 #: preseed.xml:81
 #, no-c-format
-#. Tag: para
 msgid ""
 "but only if you have network access, and set <literal>preseed/url</literal> "
 "appropriately"
@@ -174,49 +161,47 @@ msgstr ""
 "nhưng chỉ nếu bạn có khả năng truy cập mạng, và đặt giá trị <literal>preseed/"
 "url</literal> thích hợp"
 
+#. Tag: entry
 #: preseed.xml:88
 #, no-c-format
-#. Tag: entry
 msgid "netboot"
 msgstr "khởi động qua mạng"
 
-#: preseed.xml:90
-#: preseed.xml:105
-#: preseed.xml:110
-#, no-c-format
 #. Tag: entry
+#: preseed.xml:90 preseed.xml:105 preseed.xml:110
+#, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>không</entry>"
 
+#. Tag: entry
 #: preseed.xml:93
 #, no-c-format
-#. Tag: entry
 msgid ""
 "hd-media <phrase condition=\"bootable-usb\">(including usb-stick)</phrase>"
 msgstr ""
 "kiểu đĩa cứng <phrase condition=\"bootable-usb\">(gồm thanh USB)</phrase>"
 
+#. Tag: entry
 #: preseed.xml:98
 #, no-c-format
-#. Tag: entry
 msgid "floppy based (cd-drivers)"
 msgstr "dựa vào đĩa mềm (trình điều khiển đĩa CD)"
 
+#. Tag: entry
 #: preseed.xml:103
 #, no-c-format
-#. Tag: entry
 msgid "floppy based (net-drivers)"
 msgstr "dựa vào đĩa mềm (trình điều khiển mạng)"
 
+#. Tag: entry
 #: preseed.xml:108
 #, no-c-format
-#. Tag: entry
 msgid "generic/tape"
 msgstr "giống loài / băng"
 
+#. Tag: para
 #: preseed.xml:117
 #, no-c-format
-#. Tag: para
 msgid ""
 "An important difference between the preseeding methods is the point at which "
 "the preconfiguration file is loaded and processed. For initrd preseeding "
@@ -232,9 +217,9 @@ msgstr ""
 "tải. Còn đối với sự chèn sẵn kiểu mạng, nó nằm chỉ sau khi mạng đã được cấu "
 "hình."
 
+#. Tag: para
 #: preseed.xml:126
 #, no-c-format
-#. Tag: para
 msgid ""
 "Obviously, any questions that have been processed before the "
 "preconfiguration file is loaded cannot be preseeded (this will include "
@@ -247,9 +232,9 @@ msgstr ""
 "như việc chạy phát hiện phần cứng đầu tiên). Phần <xref linkend=\"preseed-"
 "bootparms\"/> cung cấp phương pháp tránh hỏi những câu sớm này."
 
+#. Tag: para
 #: preseed.xml:134
 #, no-c-format
-#. Tag: para
 msgid ""
 "In order to avoid the questions that would normally appear before the "
 "preseeding occurs, you can start the installer in <quote>auto</quote> mode. "
@@ -267,15 +252,15 @@ msgstr ""
 "cài đặt ở chế độ tới hạn, mà tránh nhiều câu hỏi không quan trọng. Xem thêm "
 "<xref linkend=\"preseed-auto\"/>."
 
+#. Tag: title
 #: preseed.xml:148
 #, no-c-format
-#. Tag: title
 msgid "Limitations"
 msgstr "Hạn chế"
 
+#. Tag: para
 #: preseed.xml:149
 #, no-c-format
-#. Tag: para
 msgid ""
 "Although most questions used by &d-i; can be preseeded using this method, "
 "there are some notable exceptions. You must (re)partition an entire disk or "
@@ -287,15 +272,15 @@ msgstr ""
 "đĩa hoặc sử dụng sức chứa còn rảnh trên đĩa; không thể sử dụng phân vùng đã "
 "có."
 
+#. Tag: title
 #: preseed.xml:223
 #, no-c-format
-#. Tag: title
 msgid "Using preseeding"
 msgstr "Dùng khả năng chèn sẵn"
 
+#. Tag: para
 #: preseed.xml:224
 #, no-c-format
-#. Tag: para
 msgid ""
 "You will first need to create a preconfiguration file and place it in the "
 "location from where you want to use it. Creating the preconfiguration file "
@@ -315,9 +300,9 @@ msgstr ""
 "sẵn nằm ở ngoại phạm vị của tài liệu này: xem tài liệu hướng dẫn của nhà "
 "phát triển về &d-i;."
 
+#. Tag: para
 #: preseed.xml:235
 #, no-c-format
-#. Tag: para
 msgid ""
 "An example preconfiguration file that you can use as basis for your own "
 "preconfiguration file is available from &urlset-example-preseed;. This file "
@@ -327,15 +312,15 @@ msgstr ""
 "mẫu sẵn sàng tại &urlset-example-preseed;. Tập tin mẫu này lần lượt dựa vào "
 "những đoạn cấu hình nằm trong phụ lục này."
 
+#. Tag: title
 #: preseed.xml:244
 #, no-c-format
-#. Tag: title
 msgid "Loading the preconfiguration file"
 msgstr "Tải tập tin định cấu hình sẵn"
 
+#. Tag: para
 #: preseed.xml:245
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are using initrd preseeding, you only have to make sure a file named "
 "<filename>preseed.cfg</filename> is included in the root directory of the "
@@ -347,15 +332,9 @@ msgstr ""
 "initrd đó. Trình cài đặt sẽ kiểm tra tự động nếu có tập tin này không, cũng "
 "sẽ tải nó."
 
+#. Tag: para
 #: preseed.xml:252
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For the other preseeding methods you need to tell the installer what file "
-#| "to use when you boot it. This is normally done by passing the kernel a "
-#| "boot parameter, either manually at boot time or by editing the bootloader "
-#| "configuration file (e.g. <filename>syslinux.cfg</filename>) and adding "
-#| "the parameter to the end of the append line(s) for the kernel."
 msgid ""
 "For the other preseeding methods you need to tell the installer what file to "
 "use when you boot it. This is normally done by passing the kernel a boot "
@@ -368,17 +347,20 @@ msgid ""
 "filename>) and adding the parameter to the end of the <filename>gnumach.gz</"
 "filename> line.</phrase>"
 msgstr ""
-"Đối với các phương pháp chèn sẵn khác, bạn cần phải báo cho trình cài đặt nên sử dụng tập tin nào khi khởi động. Bình thường làm như thế bằng cách gửi cho hạt nhân một tham số khởi động, hoặc bằng tay vào lúc khởi động hoặc bằng cách chỉnh sửa tập tin cấu hình bộ nạp khởi động <phrase arch=\"linux-any\">(v.d. <filename>syslinux.cfg</filename>) và thêm tham số vào kết thúc của (những) dòng phụ thêm cho hạt nhân.</phrase><phrase arch=\"kfreebsd-any\">(v.d. <filename>grub.cfg</filename>) và thêm tham số dưới dạng một dòng <literal>set</literal> mới cho hạt nhân.</phrase><phrase arch=\"hurd-any\">(v.d. <filename>grub.cfg</filename>) và phụ thêm tham số vào dòng <filename>gnumach.gz</"
-"filename>.</phrase>"
+"Đối với các phương pháp chèn sẵn khác, bạn cần phải báo cho trình cài đặt "
+"nên sử dụng tập tin nào khi khởi động. Bình thường làm như thế bằng cách gửi "
+"cho hạt nhân một tham số khởi động, hoặc bằng tay vào lúc khởi động hoặc "
+"bằng cách chỉnh sửa tập tin cấu hình bộ nạp khởi động <phrase arch=\"linux-"
+"any\">(v.d. <filename>syslinux.cfg</filename>) và thêm tham số vào kết thúc "
+"của (những) dòng phụ thêm cho hạt nhân.</phrase><phrase arch=\"kfreebsd-any"
+"\">(v.d. <filename>grub.cfg</filename>) và thêm tham số dưới dạng một dòng "
+"<literal>set</literal> mới cho hạt nhân.</phrase><phrase arch=\"hurd-any\">"
+"(v.d. <filename>grub.cfg</filename>) và phụ thêm tham số vào dòng "
+"<filename>gnumach.gz</filename>.</phrase>"
 
+#. Tag: para
 #: preseed.xml:265
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you do specify the preconfiguration file in the bootloader "
-#| "configuration, you might change the configuration so you don't need to "
-#| "hit enter to boot the installer. For syslinux this means setting the "
-#| "timeout to <literal>1</literal> in <filename>syslinux.cfg</filename>."
 msgid ""
 "If you do specify the preconfiguration file in the bootloader configuration, "
 "you might change the configuration so you don't need to hit enter to boot "
@@ -387,11 +369,17 @@ msgid ""
 "phrase><phrase arch=\"kfrebsd-any;hurd-any\">For grub this means setting the "
 "timeout to <literal>0</literal> in <filename>grub.cfg</filename>.</phrase>"
 msgstr ""
-"Nếu bạn có phải xác định tập tin cấu hình sẵn trong cấu hình bộ nạp khởi động, thì cũng có thể sửa đổi cấu hình để tránh yêu cầu bấm phím &enter; để khởi động trình cài đặt. <phrase arch=\"linux-any\">Đối với syslinux có nghĩa là lập thời hạn (timeout) thành <literal>1</literal> trong tập tin <filename>syslinux.cfg</filename>.</phrase><phrase arch=\"kfrebsd-any;hurd-any\">Đối với grub có nghĩa là lập thời hạn (timeout) thành <literal>0</literal> trong tập tin <filename>grub.cfg</filename>.</phrase>"
+"Nếu bạn có phải xác định tập tin cấu hình sẵn trong cấu hình bộ nạp khởi "
+"động, thì cũng có thể sửa đổi cấu hình để tránh yêu cầu bấm phím &enter; để "
+"khởi động trình cài đặt. <phrase arch=\"linux-any\">Đối với syslinux có "
+"nghĩa là lập thời hạn (timeout) thành <literal>1</literal> trong tập tin "
+"<filename>syslinux.cfg</filename>.</phrase><phrase arch=\"kfrebsd-any;hurd-"
+"any\">Đối với grub có nghĩa là lập thời hạn (timeout) thành <literal>0</"
+"literal> trong tập tin <filename>grub.cfg</filename>.</phrase>"
 
+#. Tag: para
 #: preseed.xml:274
 #, no-c-format
-#. Tag: para
 msgid ""
 "To make sure the installer gets the right preconfiguration file, you can "
 "optionally specify a checksum for the file. Currently this needs to be a "
@@ -403,9 +391,9 @@ msgstr ""
 "md5sum, và nếu được xác định, nó phải khớp với tập tin cấu hình sẵn, nếu "
 "không thì trình cài đặt sẽ từ chối dùng nó."
 
+#. Tag: screen
 #: preseed.xml:283
 #, no-c-format
-#. Tag: screen
 msgid ""
 "Boot parameters to specify:\n"
 "- if you're netbooting:\n"
@@ -435,9 +423,9 @@ msgstr ""
 "  preseed/file=/hd-media/preseed.cfg\n"
 "  preseed/file/checksum=5da499872becccfeda2c4872f9171c3d"
 
+#. Tag: para
 #: preseed.xml:285
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that <filename>preseed/url</filename> can be shortened to just "
 "<filename>url</filename> and <filename>preseed/file</filename> to just "
@@ -448,15 +436,15 @@ msgstr ""
 "<filename>preseed/file</filename> dạng ngắn là chỉ<filename>file</filename>, "
 "khi địa chỉ kiểu này là tham số khởi động."
 
+#. Tag: title
 #: preseed.xml:295
 #, no-c-format
-#. Tag: title
 msgid "Using boot parameters to preseed questions"
 msgstr "Dùng tham số khởi động để chèn sẵn câu hỏi"
 
+#. Tag: para
 #: preseed.xml:296
 #, no-c-format
-#. Tag: para
 msgid ""
 "If a preconfiguration file cannot be used to preseed some steps, the install "
 "can still be fully automated, since you can pass preseed values on the "
@@ -467,9 +455,9 @@ msgstr ""
 "khả năng gửi các giá trị chèn sẵn cho hạt nhân trên dòng lệnh khi khởi động "
 "trình cài đặt."
 
+#. Tag: para
 #: preseed.xml:302
 #, no-c-format
-#. Tag: para
 msgid ""
 "Boot parameters can also be used if you do not really want to use "
 "preseeding, but just want to provide an answer for a specific question. Some "
@@ -479,9 +467,9 @@ msgstr ""
 "khả năng chèn sẵn, nhưng chỉ muốn cung cấp trả lời cho một câu hỏi riêng. "
 "Một số mẫu có ích về trường hợp này nằm trong phần khác của tài liệu này."
 
+#. Tag: para
 #: preseed.xml:308
 #, no-c-format
-#. Tag: para
 msgid ""
 "To set a value to be used inside &d-i;, just pass "
 "<userinput><replaceable>path/to/variable</replaceable>=<replaceable>value</"
@@ -517,9 +505,9 @@ msgstr ""
 "liệu debconf trong hệ thống đích nên vô ích trong tiến trình cấu hình gói "
 "liên quan."
 
+#. Tag: para
 #: preseed.xml:331
 #, no-c-format
-#. Tag: para
 msgid ""
 "Normally, preseeding a question in this way will mean that the question will "
 "not be asked. To set a specific default value for a question, but still have "
@@ -532,9 +520,9 @@ msgstr ""
 "quote> thaycho <quote>=</quote>. Xem thêm <xref linkend=\"preseed-seenflag\"/"
 ">."
 
+#. Tag: para
 #: preseed.xml:338
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that some variables that are frequently set at the boot prompt have a "
 "shorter alias. If an alias is available, it is used in the examples in this "
@@ -549,9 +537,9 @@ msgstr ""
 "literal> có biệt hiệu <literal>url</literal>, và biệt hiệu <literal>tasks</"
 "literal> đại diện <literal>tasksel:tasksel/first</literal>."
 
+#. Tag: para
 #: preseed.xml:347
 #, no-c-format
-#. Tag: para
 msgid ""
 "A <quote>--</quote> in the boot options has special meaning. Kernel "
 "parameters that appear after the last <quote>--</quote> may be copied into "
@@ -565,9 +553,9 @@ msgstr ""
 "(nếu hỗ trợ bởi bộ cài đặt cho bộ nạp khởi động đó). Bộ cài đặt sẽ tự động "
 "lọc ra bất cứ tùy chọn nào nó nhận ra."
 
+#. Tag: para
 #: preseed.xml:356
 #, no-c-format
-#. Tag: para
 msgid ""
 "Current linux kernels (2.6.9 and later) accept a maximum of 32 command line "
 "options and 32 environment options, including any options added by default "
@@ -579,9 +567,9 @@ msgstr ""
 "mặc định cho bộ cài đặt. Vược quá số này thì hạt nhân không thể phục hồi "
 "(sụp đổ). (Đối với hạt nhân sớm hơn thì số tối đa là nhỏ hơn.) "
 
+#. Tag: para
 #: preseed.xml:364
 #, no-c-format
-#. Tag: para
 msgid ""
 "For most installations some of the default options in your bootloader "
 "configuration file, like <literal>vga=normal</literal>, may be safely "
@@ -592,9 +580,9 @@ msgstr ""
 "literal>, có thể được gỡ bỏ an toàn, mà có thể cho bạn có khả năng thêm tùy "
 "chọn nữa để chèn sẵn."
 
+#. Tag: para
 #: preseed.xml:371
 #, no-c-format
-#. Tag: para
 msgid ""
 "It may not always be possible to specify values with spaces for boot "
 "parameters, even if you delimit them with quotes."
@@ -602,29 +590,15 @@ msgstr ""
 "Có lẽ không phải luôn luôn có khả năng xác định giá trị chứa dấu cách cho "
 "tham số khởi động, thậm chí nếu bạn định giới chúng bằng dấu trích dẫn."
 
+#. Tag: title
 #: preseed.xml:380
 #, no-c-format
-#. Tag: title
 msgid "Auto mode"
 msgstr "Chế độ tự động"
 
+#. Tag: para
 #: preseed.xml:381
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "There are several features of Debian Installer that combine to allow "
-#| "fairly simple command lines at the boot prompt to result in arbitrarily "
-#| "complex customized automatic installs. To illustrate this, here are some "
-#| "examples that can be used at the boot prompt: <informalexample><screen>\n"
-#| "auto url=autoserver\n"
-#| "</screen></informalexample> This relies on there being a DHCP server that "
-#| "will get the machine to the point where <literal>autoserver</literal> can "
-#| "be resolved by DNS, perhaps after adding the local domain if that was "
-#| "provided by DHCP. If this was done at a site where the domain is "
-#| "<literal>example.com</literal>, and they have a reasonably sane DHCP "
-#| "setup, it would result in the preseed file being retrieved from "
-#| "<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
-#| "literal>."
 msgid ""
 "There are several features of &debian; Installer that combine to allow "
 "fairly simple command lines at the boot prompt to result in arbitrarily "
@@ -654,9 +628,9 @@ msgstr ""
 "literal> có thiết lập DHCP chuẩn, kết quả là tập tin chèn sẵn được lấy từ "
 "<literal>http://autoserver.mẫu.com/d-i/&releasename;/./preseed.cfg</literal>."
 
+#. Tag: para
 #: preseed.xml:398
 #, no-c-format
-#. Tag: para
 msgid ""
 "The last part of that url (<literal>d-i/&releasename;/./preseed.cfg</"
 "literal>) is taken from <literal>auto-install/defaultroot</literal>. By "
@@ -692,9 +666,9 @@ msgstr ""
 "scripts/late_command.sh</literal> thì tập tin sẽ được lấy từ <literal>http://"
 "autoserver.example.com/d-i/&releasename;/./scripts/late_command.sh</literal>."
 
+#. Tag: para
 #: preseed.xml:418
 #, no-c-format
-#. Tag: para
 msgid ""
 "If there is no local DHCP or DNS infrastructure, or if you do not want to "
 "use the default path to <filename>preseed.cfg</filename>, you can still use "
@@ -717,24 +691,24 @@ msgstr ""
 "của_tôi</replaceable>\n"
 "</screen></informalexample> Nó hoạt động như thế:"
 
+#. Tag: para
 #: preseed.xml:431
 #, no-c-format
-#. Tag: para
 msgid "if the URL is missing a protocol, http is assumed,"
 msgstr "địa chỉ Mạng thiếu giao thức thì <literal>http</literal> được giả sử,"
 
+#. Tag: para
 #: preseed.xml:434
 #, no-c-format
-#. Tag: para
 msgid ""
 "if the hostname section contains no periods, it has the domain derived from "
 "DHCP appended to it, and"
 msgstr ""
 "phần tên máy không chứa dấu chấm thì miền bắt nguồn từ DHCP được phụ thêm, và"
 
+#. Tag: para
 #: preseed.xml:438
 #, no-c-format
-#. Tag: para
 msgid ""
 "if there's no <literal>/</literal>'s after the hostname, then the default "
 "path is added."
@@ -742,9 +716,9 @@ msgstr ""
 "không có dấu xuyệc <literal>/</literal> nằm sau tên miền thì đường dẫn mặc "
 "định được thêm."
 
+#. Tag: para
 #: preseed.xml:444
 #, no-c-format
-#. Tag: para
 msgid ""
 "In addition to specifying the url, you can also specify settings that do not "
 "directly affect the behavior of &d-i; itself, but can be passed through to "
@@ -768,9 +742,9 @@ msgstr ""
 "</screen></informalexample> Những hạng này có thể, chẳng hạn, ngụ ý kiểu hệ "
 "thống cần cài đặt hay bản địa hoá cần dùng."
 
+#. Tag: para
 #: preseed.xml:458
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is of course possible to extend this concept, and if you do, it is "
 "reasonable to use the auto-install namespace for this. So one might have "
@@ -787,9 +761,9 @@ msgstr ""
 "debian.org</email>, để chúng ta tránh sự xung đột giữa các tên miền, và có "
 "thể thêm biệt hiệu cho tham số đó để giúp đỡ bạn."
 
+#. Tag: para
 #: preseed.xml:468
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <literal>auto</literal> boot label is not yet defined everywhere. The "
 "same effect may be achieved by simply adding the two parameters "
@@ -812,9 +786,9 @@ msgstr ""
 "<literal>debconf/priority</literal> và việc đặt nó thành <literal>critical</"
 "literal> (tới hạn) thì ngăn cản hỏi câu nào có mức ưu tiên nhỏ hơn."
 
+#. Tag: para
 #: preseed.xml:482
 #, no-c-format
-#. Tag: para
 msgid ""
 "Additional options that may be of interest while attempting to automate an "
 "install while using DHCP are: <literal>interface=auto netcfg/"
@@ -827,9 +801,9 @@ msgstr ""
 "thứ nhất sẵn sàng và đợi nhiều thời gian hơn để nhận trả lời cho truy vấn "
 "DHCP của nó."
 
+#. Tag: para
 #: preseed.xml:491
 #, no-c-format
-#. Tag: para
 msgid ""
 "An extensive example of how to use this framework, including example scripts "
 "and classes, can be found on the <ulink url=\"http://hands.com/d-i/"
@@ -842,15 +816,15 @@ msgstr ""
 "phát triển</ulink>. Các mẫu ở đó cũng minh họa nhiều hiệu ứng đẹp có thể "
 "được làm khi dùng chức năng chèn sẵn một cách sáng tạo."
 
+#. Tag: title
 #: preseed.xml:502
 #, no-c-format
-#. Tag: title
 msgid "Aliases useful with preseeding"
 msgstr "Biệt hiệu có ích khi chèn sẵn"
 
+#. Tag: para
 #: preseed.xml:503
 #, no-c-format
-#. Tag: para
 msgid ""
 "The following aliases can be useful when using (auto mode) preseeding. Note "
 "that these are simply short aliases for question names, and you always need "
@@ -862,185 +836,177 @@ msgstr ""
 "lúc nào cũng cần ghi rõ một giá trị: v.d. <literal>auto=true</literal> or "
 "<literal>interface=eth0</literal>."
 
+#. Tag: entry
 #: preseed.xml:516
 #, no-c-format
-#. Tag: entry
 msgid "auto"
 msgstr "auto"
 
+#. Tag: entry
 #: preseed.xml:516
 #, no-c-format
-#. Tag: entry
 msgid "auto-install/enable"
 msgstr "auto-install/enable"
 
+#. Tag: entry
 #: preseed.xml:517
 #, no-c-format
-#. Tag: entry
 msgid "classes"
 msgstr "classes"
 
+#. Tag: entry
 #: preseed.xml:517
 #, no-c-format
-#. Tag: entry
 msgid "auto-install/classes"
 msgstr "auto-install/classes"
 
+#. Tag: entry
 #: preseed.xml:518
 #, no-c-format
-#. Tag: entry
 msgid "<entry>fb</entry>"
 msgstr "<entry>fb</entry>"
 
+#. Tag: entry
 #: preseed.xml:518
 #, no-c-format
-#. Tag: entry
 msgid "debian-installer/framebuffer"
 msgstr "debian-installer/framebuffer"
 
+#. Tag: entry
 #: preseed.xml:519
 #, no-c-format
-#. Tag: entry
 msgid "language"
 msgstr "language"
 
+#. Tag: entry
 #: preseed.xml:519
 #, no-c-format
-#. Tag: entry
 msgid "debian-installer/language"
 msgstr "debian-installer/language"
 
+#. Tag: entry
 #: preseed.xml:520
 #, no-c-format
-#. Tag: entry
 msgid "country"
 msgstr "country"
 
+#. Tag: entry
 #: preseed.xml:520
 #, no-c-format
-#. Tag: entry
 msgid "debian-installer/country"
 msgstr "debian-installer/country"
 
+#. Tag: entry
 #: preseed.xml:521
 #, no-c-format
-#. Tag: entry
 msgid "locale"
 msgstr "locale"
 
+#. Tag: entry
 #: preseed.xml:521
 #, no-c-format
-#. Tag: entry
 msgid "debian-installer/locale"
 msgstr "debian-installer/locale"
 
+#. Tag: entry
 #: preseed.xml:522
 #, no-c-format
-#. Tag: entry
 msgid "priority"
 msgstr "priority"
 
+#. Tag: entry
 #: preseed.xml:522
 #, no-c-format
-#. Tag: entry
 msgid "debconf/priority"
 msgstr "debconf/priority"
 
+#. Tag: entry
 #: preseed.xml:523
 #, no-c-format
-#. Tag: entry
 msgid "preseed/file"
 msgstr "preseed/file"
 
+#. Tag: entry
 #: preseed.xml:524
 #, no-c-format
-#. Tag: entry
 msgid "<entry>url</entry>"
 msgstr "<entry>url</entry>"
 
+#. Tag: entry
 #: preseed.xml:524
 #, no-c-format
-#. Tag: entry
 msgid "preseed/url"
 msgstr "preseed/url"
 
+#. Tag: entry
 #: preseed.xml:525
 #, no-c-format
-#. Tag: entry
 msgid "interface"
 msgstr "interface"
 
+#. Tag: entry
 #: preseed.xml:525
 #, no-c-format
-#. Tag: entry
 msgid "netcfg/choose_interface"
 msgstr "netcfg/choose_interface"
 
+#. Tag: entry
 #: preseed.xml:526
 #, no-c-format
-#. Tag: entry
 msgid "hostname&nbsp;&nbsp;&nbsp;"
 msgstr "hostname&nbsp;&nbsp;&nbsp;"
 
+#. Tag: entry
 #: preseed.xml:526
 #, no-c-format
-#. Tag: entry
 msgid "netcfg/get_hostname"
 msgstr "netcfg/get_hostname"
 
+#. Tag: entry
 #: preseed.xml:527
 #, no-c-format
-#. Tag: entry
 msgid "domain"
 msgstr "domain"
 
+#. Tag: entry
 #: preseed.xml:527
 #, no-c-format
-#. Tag: entry
 msgid "netcfg/get_domain"
 msgstr "netcfg/get_domain"
 
+#. Tag: entry
 #: preseed.xml:528
 #, no-c-format
-#. Tag: entry
 msgid "protocol"
 msgstr "protocol"
 
+#. Tag: entry
 #: preseed.xml:528
 #, no-c-format
-#. Tag: entry
 msgid "mirror/protocol"
 msgstr "mirror/protocol"
 
+#. Tag: entry
 #: preseed.xml:529
 #, no-c-format
-#. Tag: entry
 msgid "suite"
 msgstr "suite"
 
+#. Tag: entry
 #: preseed.xml:529
 #, no-c-format
-#. Tag: entry
 msgid "mirror/suite"
 msgstr "mirror/suite"
 
+#. Tag: title
 #: preseed.xml:536
 #, no-c-format
-#. Tag: title
 msgid "Using a DHCP server to specify preconfiguration files"
 msgstr "Dùng máy phục vụ DHCP để xác định tập tin định cấu hình sẵn"
 
+#. Tag: para
 #: preseed.xml:537
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "It's also possible to use DHCP to specify a preconfiguration file to "
-#| "download from the network. DHCP allows specifying a filename. Normally "
-#| "this is a file to netboot, but if it appears to be an URL then "
-#| "installation media that support network preseeding will download the file "
-#| "from the URL and use it as a preconfiguration file. Here is an example of "
-#| "how to set it up in the dhcpd.conf for version 3 of the ISC DHCP server "
-#| "(the dhcp3-server Debian package)."
 msgid ""
 "It's also possible to use DHCP to specify a preconfiguration file to "
 "download from the network. DHCP allows specifying a filename. Normally this "
@@ -1050,12 +1016,18 @@ msgid ""
 "dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
-"Cũng có thể sử dụng dịch vụ DHCP để xác định tập tin cấu hình sẵn cần tải xuống mạng. Giao thức DHCP cho phép xác định tên tập tin. Bình thường, nó là một tập tin cần khởi động qua mạng, nhưng nếu nó có vẻ là một địa chỉ URL thì vật chứa cài đặt cũng hỗ trợ chèn sẵn qua mạng sẽ tải tập tin đó xuống địa chỉ URL được cung cấp và dùng nó làm một tập tin cấu hình sẵn. Đây là một mẫu thiết lập nó trong tập tin cấu hình « dhcpd.conf » cho phiên bản 3 của trình phục vụ DHCP ISC (gói &debian; « dhcp3-server »)."
+"Cũng có thể sử dụng dịch vụ DHCP để xác định tập tin cấu hình sẵn cần tải "
+"xuống mạng. Giao thức DHCP cho phép xác định tên tập tin. Bình thường, nó là "
+"một tập tin cần khởi động qua mạng, nhưng nếu nó có vẻ là một địa chỉ URL "
+"thì vật chứa cài đặt cũng hỗ trợ chèn sẵn qua mạng sẽ tải tập tin đó xuống "
+"địa chỉ URL được cung cấp và dùng nó làm một tập tin cấu hình sẵn. Đây là "
+"một mẫu thiết lập nó trong tập tin cấu hình « dhcpd.conf » cho phiên bản 3 "
+"của trình phục vụ DHCP ISC (gói &debian; « dhcp3-server »)."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
+#. Tag: screen
 #: preseed.xml:548
 #, no-c-format
-#. Tag: screen
 msgid ""
 "if substring (option vendor-class-identifier, 0, 3) = \"d-i\" {\n"
 "    filename \"http://host/preseed.cfg\";\n"
@@ -1065,9 +1037,9 @@ msgstr ""
 "    filename \"http://máy/preseed.cfg\";\n"
 "}"
 
+#. Tag: para
 #: preseed.xml:550
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that the above example limits this filename to DHCP clients that "
 "identify themselves as \"d-i\", so it will not affect regular DHCP clients, "
@@ -1079,15 +1051,9 @@ msgstr ""
 "chuẩn, chỉ trình cài đặt. Bạn cũng có khả năng định dạng đoạn đó là đoạn "
 "dòng cho chỉ một máy riêng, để tránh chèn sẵn mọi việc cài đặt trên mạng đó."
 
+#. Tag: para
 #: preseed.xml:557
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "A good way to use the DHCP preseeding is to only preseed values specific "
-#| "to your network, such as the Debian mirror to use. This way installs on "
-#| "your network will automatically get a good mirror selected, but the rest "
-#| "of the installation can be performed interactively. Using DHCP preseeding "
-#| "to fully automate Debian installs should only be done with care."
 msgid ""
 "A good way to use the DHCP preseeding is to only preseed values specific to "
 "your network, such as the &debian; mirror to use. This way installs on your "
@@ -1095,18 +1061,22 @@ msgid ""
 "installation can be performed interactively. Using DHCP preseeding to fully "
 "automate &debian; installs should only be done with care."
 msgstr ""
-"Một phương pháp tốt để dùng chức năng chèn sẵn DHCP là chèn sẵn chỉ những giá trị đặc trưng cho mạng đó, v.d. máy nhân bản &debian; cần dùng. Bằng cách này, việc cài đặt trên mạng đó sẽ tự động chọn một máy nhân bản hữu ích, còn phần còn lại của tiến trình cài đặt có thể được thực hiện tương tác. Bạn nên rất cẩn thận khi dùng chức năng chèn sẵn DHCP để tự động hoá hoàn toàn tiến trình "
-"cài đặt &debian;."
+"Một phương pháp tốt để dùng chức năng chèn sẵn DHCP là chèn sẵn chỉ những "
+"giá trị đặc trưng cho mạng đó, v.d. máy nhân bản &debian; cần dùng. Bằng "
+"cách này, việc cài đặt trên mạng đó sẽ tự động chọn một máy nhân bản hữu "
+"ích, còn phần còn lại của tiến trình cài đặt có thể được thực hiện tương "
+"tác. Bạn nên rất cẩn thận khi dùng chức năng chèn sẵn DHCP để tự động hoá "
+"hoàn toàn tiến trình cài đặt &debian;."
 
+#. Tag: title
 #: preseed.xml:571
 #, no-c-format
-#. Tag: title
 msgid "Creating a preconfiguration file"
 msgstr "Tạo tập tin định cấu hình sẵn"
 
+#. Tag: para
 #: preseed.xml:572
 #, no-c-format
-#. Tag: para
 msgid ""
 "The preconfiguration file is in the format used by the <command>debconf-set-"
 "selections</command> command. The general format of a line in a "
@@ -1116,23 +1086,23 @@ msgstr ""
 "selections</command>. Dạng thức chung của dòng nào nằm trong tập tin cấu "
 "hình sẵn là:"
 
+#. Tag: screen
 #: preseed.xml:578
 #, no-c-format
-#. Tag: screen
 msgid "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
 msgstr ""
 "&lt;sở hữu&gt; &lt;tên câu hỏi&gt; &lt;kiểu câu hỏi&gt; &lt;giá trị&gt;"
 
+#. Tag: para
 #: preseed.xml:580
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are a few rules to keep in mind when writing a preconfiguration file."
 msgstr "Ghi nhớ vài quy tắc khi tạo tập tin cấu hình sẵn."
 
+#. Tag: para
 #: preseed.xml:587
 #, no-c-format
-#. Tag: para
 msgid ""
 "Put only a single space or tab between type and value: any additional "
 "whitespace will be interpreted as belonging to the value."
@@ -1140,9 +1110,9 @@ msgstr ""
 "Chèn chỉ một dấu cách riêng lẻ giữa « kiểu » và « giá trị »: dấu cách thêm "
 "nào sẽ được xử lý là phần của giá trị đó."
 
+#. Tag: para
 #: preseed.xml:591
 #, no-c-format
-#. Tag: para
 msgid ""
 "A line can be split into multiple lines by appending a backslash "
 "(<quote><literal>\\</literal></quote>) as the line continuation character. A "
@@ -1157,9 +1127,9 @@ msgstr ""
 "lại thành một dòng riêng lẻ có tất cả các khoảng trắng theo sau được co lại "
 "thành một dấu cách riêng lẻ."
 
+#. Tag: para
 #: preseed.xml:598
 #, no-c-format
-#. Tag: para
 msgid ""
 "For debconf variables (templates) used in the installer itself, the owner "
 "should be set to <quote>d-i</quote>; to preseed variables used in the "
@@ -1174,9 +1144,9 @@ msgstr ""
 "ứng. Chỉ những biến có chủ sở hữu khác với <quote>d-i</quote> sẽ được lan "
 "truyền cho cài đặt debconf cho hệ thống đã cài đặt."
 
+#. Tag: para
 #: preseed.xml:606
 #, no-c-format
-#. Tag: para
 msgid ""
 "Most questions need to be preseeded using the values valid in English and "
 "not the translated values. However, there are some questions (for example in "
@@ -1186,9 +1156,9 @@ msgstr ""
 "giá trị đã dịch. Tuy nhiên, có một số câu hỏi riêng (v.d. trong "
 "<classname>partman</classname>) trong đó cần phải dùng giá trị đã dịch."
 
+#. Tag: para
 #: preseed.xml:612
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some questions take a code as value instead of the English text that is "
 "shown during installation."
@@ -1196,9 +1166,9 @@ msgstr ""
 "Một số câu hỏi riêng chấp nhận mã là giá trị, thay cho đoạn tiếng Anh được "
 "hiển thị trong khi cài đặt."
 
+#. Tag: para
 #: preseed.xml:618
 #, no-c-format
-#. Tag: para
 msgid ""
 "The easiest way to create a preconfiguration file is to use the example file "
 "linked in <xref linkend=\"preseed-contents\"/> as basis and work from there."
@@ -1207,9 +1177,9 @@ msgstr ""
 "liên kết trong <xref linkend=\"preseed-contents\"/> như là cơ bản, rồi thêm "
 "từ từ vào nó."
 
+#. Tag: para
 #: preseed.xml:623
 #, no-c-format
-#. Tag: para
 msgid ""
 "An alternative method is to do a manual installation and then, after "
 "rebooting, use the <command>debconf-get-selections</command> from the "
@@ -1221,9 +1191,9 @@ msgstr ""
 "tiện ích <classname>debconf-utils</classname> để đổ cả cơ sở dữ liệu debconf "
 "lẫn cơ sở dữ liệu cdebconf của trình cài đặt đều vào cùng một tập tin:"
 
+#. Tag: screen
 #: preseed.xml:630
 #, no-c-format
-#. Tag: screen
 msgid ""
 "$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
 "$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
@@ -1232,9 +1202,9 @@ msgstr ""
 "replaceable>\n"
 "$ debconf-get-selections &gt;&gt; <replaceable>tập tin</replaceable>"
 
+#. Tag: para
 #: preseed.xml:632
 #, no-c-format
-#. Tag: para
 msgid ""
 "However, a file generated in this manner will have some items that should "
 "not be preseeded, and the example file is a better starting place for most "
@@ -1244,9 +1214,9 @@ msgstr ""
 "nên được chèn sẵn; tập tin mẫu cũng là nơi bắt đầu thích hợp hơn với trường "
 "hợp của phần lớn người dùng."
 
+#. Tag: para
 #: preseed.xml:640
 #, no-c-format
-#. Tag: para
 msgid ""
 "This method relies on the fact that, at the end of the installation, the "
 "installer's cdebconf database is saved to the installed system in <filename>/"
@@ -1260,9 +1230,9 @@ msgstr ""
 "vì cơ sở dữ liệu đó có thể chứa thông tin nhạy cảm, theo mặc định các tập "
 "tin đó chỉ cho phép người chủ đọc thôi."
 
+#. Tag: para
 #: preseed.xml:648
 #, no-c-format
-#. Tag: para
 msgid ""
 "The directory <filename>/var/log/installer</filename> and all files in it "
 "will be deleted from your system if you purge the package "
@@ -1272,9 +1242,9 @@ msgstr ""
 "trong nó sẽ bị xoá bỏ ra hệ thống của bạn nếu bạn tẩy gói thông báo cài đặt "
 "<classname>installation-report</classname>."
 
+#. Tag: para
 #: preseed.xml:656
 #, no-c-format
-#. Tag: para
 msgid ""
 "To check possible values for questions, you can use <command>nano</command> "
 "to examine the files in <filename>/var/lib/cdebconf</filename> while an "
@@ -1289,9 +1259,9 @@ msgstr ""
 "<filename>questions.dat</filename> để tìm những giá trị hiện thời và các giá "
 "trị được gán cho biến."
 
+#. Tag: para
 #: preseed.xml:664
 #, no-c-format
-#. Tag: para
 msgid ""
 "To check if the format of your preconfiguration file is valid before "
 "performing an install, you can use the command <command>debconf-set-"
@@ -1301,15 +1271,15 @@ msgstr ""
 "chưa, bạn có thể chạy lệnh <command>debconf-set-selections -c "
 "<replaceable>preseed.cfg</replaceable></command>."
 
+#. Tag: title
 #: preseed.xml:675
 #, no-c-format
-#. Tag: title
 msgid "Contents of the preconfiguration file (for &releasename;)"
 msgstr "Nội dung của tập tin định cấu hình sẵn (cho &releasename;)"
 
+#. Tag: para
 #: preseed.xml:681
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that this example is based on an installation for the Intel x86 "
 "architecture. If you are installing a different architecture, some of the "
@@ -1323,15 +1293,15 @@ msgstr ""
 "thích hợp, cũng sẽ cần phải được thay thế bằng thiết lập debconf thích hợp "
 "với kiến trúc đó."
 
+#. Tag: title
 #: preseed.xml:692
 #, no-c-format
-#. Tag: title
 msgid "Localization"
 msgstr "Địa phương hoá"
 
+#. Tag: para
 #: preseed.xml:693
 #, no-c-format
-#. Tag: para
 msgid ""
 "Setting localization values will only work if you are using initrd "
 "preseeding. With all other methods the preconfiguration file will only be "
@@ -1341,9 +1311,9 @@ msgstr ""
 "chèn sẵn kiểu initrd. Đối với các phương pháp khác, tập tin cấu hình sẵn sẽ "
 "được tải chỉ sau khi hỏi các câu này."
 
+#. Tag: para
 #: preseed.xml:699
 #, no-c-format
-#. Tag: para
 msgid ""
 "The locale can be used to specify both language and country and can be any "
 "combination of a language supported by &d-i; and a recognized country. If "
@@ -1359,9 +1329,9 @@ msgstr ""
 "đã chọn. Để chỉ định miền địa phương dưới dạng một tham số khởi động, hãy "
 "dùng <userinput>locale=<replaceable>vi</replaceable></userinput>."
 
+#. Tag: para
 #: preseed.xml:708
 #, no-c-format
-#. Tag: para
 msgid ""
 "Although this method is very easy to use, it does not allow preseeding of "
 "all possible combinations of language, country and locale<footnote> <para> "
@@ -1381,9 +1351,9 @@ msgstr ""
 "footnote>. Cũng có thể ghi rõ từng giá trị. Hoặc có thể ghi rõ ngôn ngữ và "
 "quốc gia dưới dạng tham số khởi động."
 
+#. Tag: screen
 #: preseed.xml:723
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# Preseeding only locale sets language, country and locale.\n"
 "d-i debian-installer/locale string en_US\n"
@@ -1405,9 +1375,9 @@ msgstr ""
 "# Tuỳ chọn có thể ghi rõ thêm miền địa phương.\n"
 "#d-i localechooser/supported-locales en_AU.UTF-8, fr_FR.UTF-8"
 
+#. Tag: para
 #: preseed.xml:725
 #, no-c-format
-#. Tag: para
 msgid ""
 "Keyboard configuration consists of selecting a keyboard architecture and a "
 "keymap. In most cases the correct keyboard architecture is selected by "
@@ -1420,9 +1390,9 @@ msgstr ""
 "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."
 
+#. Tag: screen
 #: preseed.xml:732
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
@@ -1436,9 +1406,9 @@ msgstr ""
 "# Thí dụ cho kiến trúc bàn phím khác\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
+#. Tag: para
 #: preseed.xml:734
 #, no-c-format
-#. Tag: para
 msgid ""
 "To skip keyboard configuration, preseed <classname>console-tools/archs</"
 "classname> with <userinput>skip-config</userinput>. This will result in the "
@@ -1448,9 +1418,9 @@ msgstr ""
 "archs</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:743
 #, no-c-format
-#. Tag: para
 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</"
@@ -1460,15 +1430,15 @@ msgstr ""
 "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:753
 #, no-c-format
-#. Tag: title
 msgid "Network configuration"
 msgstr "Cấu hình mạng"
 
+#. Tag: para
 #: preseed.xml:754
 #, no-c-format
-#. Tag: para
 msgid ""
 "Of course, preseeding the network configuration won't work if you're loading "
 "your preconfiguration file from the network. But it's great when you're "
@@ -1481,9 +1451,9 @@ msgstr ""
 "đĩa CD hay thanh USB. Nếu bạn tải tập tin cấu hình sẵn qua mạng, bạn có khả "
 "năng gởi tham số cấu hình mạng bằng cách sử dụng tham số khởi động hạt nhân."
 
+#. Tag: para
 #: preseed.xml:762
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you need to pick a particular interface when netbooting before loading a "
 "preconfiguration file from the network, use a boot parameter such as "
@@ -1493,9 +1463,9 @@ msgstr ""
 "tải tập tin cấu hình sẵn qua mạng, hãy nhập tham số khởi động như "
 "<userinput>interface=<replaceable>eth1</replaceable></userinput>."
 
+#. Tag: para
 #: preseed.xml:768
 #, no-c-format
-#. Tag: para
 msgid ""
 "Although preseeding the network configuration is normally not possible when "
 "using network preseeding (using <quote>preseed/url</quote>), you can use the "
@@ -1512,21 +1482,21 @@ msgstr ""
 "buộc cấu hình mạng chạy lại sau khi nạp tập tin chèn sẵn, bằng cách tạo văn "
 "lệnh <quote>preseed/run</quote> chứa những câu lệnh này:"
 
+#. Tag: screen
 #: preseed.xml:778
 #, no-c-format
-#. Tag: screen
 msgid "killall.sh; netcfg"
 msgstr "killall.sh; netcfg"
 
+#. Tag: para
 #: preseed.xml:780
 #, no-c-format
-#. Tag: para
 msgid "The following debconf variables are relevant for network configuration."
 msgstr "Theo đây có những biến debconf thích hợp với cấu hình mạng."
 
+#. Tag: screen
 #: preseed.xml:786
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# Disable network configuration entirely. This is useful for cdrom\n"
 "# installations on non-networked devices where the network questions,\n"
@@ -1629,9 +1599,9 @@ msgstr ""
 "# Hoặc thay đổi đối số thành false (sai) để tắt chức năng hỏi.\n"
 "#d-i hw-detect/load_firmware boolean true"
 
+#. Tag: para
 #: preseed.xml:788
 #, no-c-format
-#. Tag: para
 msgid ""
 "Please note that <command>netcfg</command> will automatically determine the "
 "netmask if <classname>netcfg/get_netmask</classname> is not preseeded. In "
@@ -1650,15 +1620,15 @@ msgstr ""
 "<classname>netcfg/get_gateway</classname> thành <quote>none</quote> (không "
 "có) để chỉ định không nên dùng cổng ra nào."
 
+#. Tag: title
 #: preseed.xml:804
 #, no-c-format
-#. Tag: title
 msgid "Network console"
 msgstr "Bàn giao tiếp mạng"
 
+#. Tag: screen
 #: preseed.xml:806
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# Use the following settings if you wish to make use of the network-console\n"
 "# component for remote installation over SSH. This only makes sense if you\n"
@@ -1675,15 +1645,15 @@ msgstr ""
 "#d-i network-console/password password r00tme\n"
 "#d-i network-console/password-again password r00tme"
 
+#. Tag: title
 #: preseed.xml:811
 #, no-c-format
-#. Tag: title
 msgid "Mirror settings"
 msgstr "Thiết lập máy nhân bản"
 
+#. Tag: para
 #: preseed.xml:812
 #, no-c-format
-#. Tag: para
 msgid ""
 "Depending on the installation method you use, a mirror may be used to "
 "download additional components of the installer, to install the base system, "
@@ -1695,9 +1665,9 @@ msgstr ""
 "danh sách các nguồn <filename>/etc/apt/sources.list</filename> cho hệ thống "
 "đã cài đặt."
 
+#. Tag: para
 #: preseed.xml:819
 #, no-c-format
-#. Tag: para
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
 "the installed system."
@@ -1705,9 +1675,9 @@ msgstr ""
 "Tham số <classname>mirror/suite</classname> xác định bộ phần mềm đối với hệ "
 "thống đã cài đặt."
 
+#. Tag: para
 #: preseed.xml:824
 #, no-c-format
-#. Tag: para
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
 "for additional components for the installer. It is only useful to set this "
@@ -1722,9 +1692,9 @@ msgstr ""
 "để xây dựng initrd cho phương pháp cài đặt được dùng. Bình thường, trình cài "
 "đặt tự động sử dụng giá trị đúng thì không nên lập tham số này."
 
+#. Tag: screen
 #: preseed.xml:835
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
 "#d-i mirror/protocol string ftp\n"
@@ -1750,15 +1720,15 @@ msgstr ""
 "# Bộ phần mềm cần dùng để nạp các thành phần cài đặt (tùy chọn).\n"
 "#d-i mirror/udeb/suite string testing"
 
+#. Tag: title
 #: preseed.xml:840
 #, no-c-format
-#. Tag: title
 msgid "Clock and time zone setup"
 msgstr "Thiết lập đồng hồ và múi giờ"
 
+#. Tag: screen
 #: preseed.xml:842
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
 "d-i clock-setup/utc boolean true\n"
@@ -1786,15 +1756,15 @@ msgstr ""
 "# Máy phục vụ NTP cần dùng. Giá trị mặc định gần lúc nào cũng đúng.\n"
 "#d-i clock-setup/ntp-server string ntp.example.com"
 
+#. Tag: title
 #: preseed.xml:847
 #, no-c-format
-#. Tag: title
 msgid "Partitioning"
 msgstr "Phân vùng"
 
+#. Tag: para
 #: preseed.xml:848
 #, no-c-format
-#. Tag: para
 msgid ""
 "Using preseeding to partition the harddisk is limited to what is supported "
 "by <classname>partman-auto</classname>. You can choose to partition either "
@@ -1809,9 +1779,9 @@ msgstr ""
 "công thức riêng từ một tập tin công thức, hay một công thức nằm trong tập "
 "tin cấu hình sẵn."
 
+#. Tag: para
 #: preseed.xml:856
 #, no-c-format
-#. Tag: para
 msgid ""
 "Preseeding of advanced partition setups using RAID, LVM and encryption is "
 "supported, but not with the full flexibility possible when partitioning "
@@ -1821,9 +1791,9 @@ msgstr ""
 "được hỗ trợ, còn không phải với tính linh hoạt đầy đủ có thể làm khi phân "
 "vùng trong một tiến trình cài đặt không chèn sẵn."
 
+#. Tag: para
 #: preseed.xml:862
 #, no-c-format
-#. Tag: para
 msgid ""
 "The examples below only provide basic information on the use of recipes. For "
 "detailed information see the files <filename>partman-auto-recipe.txt</"
@@ -1841,9 +1811,9 @@ msgstr ""
 "\">kho nguồn &d-i;</ulink>. Ghi chú rằng chức năng được hỗ trợ vẫn có thể "
 "thay đổi giữa hai lần phát hành."
 
+#. Tag: para
 #: preseed.xml:876
 #, no-c-format
-#. Tag: para
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
 "are loaded. If there are multiple disks in the system, make very sure the "
@@ -1853,15 +1823,15 @@ msgstr ""
 "nhiều đĩa trong hệ thống, hãy chắc là đĩa đúng sẽ được chọn, trước khi dùng "
 "khả năng chèn sẵn."
 
+#. Tag: title
 #: preseed.xml:885
 #, no-c-format
-#. Tag: title
 msgid "Partitioning example"
 msgstr "Mẫu phân vùng"
 
+#. Tag: screen
 #: preseed.xml:887
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -2012,21 +1982,25 @@ msgstr ""
 "d-i partman/confirm boolean true\n"
 "d-i partman/confirm_nooverwrite boolean true"
 
+#. Tag: title
 #: preseed.xml:891
 #, no-c-format
-#. Tag: title
 msgid "Partitioning using RAID"
 msgstr "Phân vùng bằng RAID"
 
-#: preseed.xml:892
-#, no-c-format
 #. Tag: para
+#: preseed.xml:892
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
 msgstr ""
 "Bạn cũng có thể sử dụng khả năng chèn sẵn để thiết lập phân vùng trên mảng "
 "RAID phần mềm. Có hỗ trợ RAID lớp 0, 1, 5, 6 và 10, thì tạo mảng bị suy biến "
@@ -2034,9 +2008,28 @@ msgstr ""
 "bộ tải khởi động grub để cài đặt vào mọi thiết bị được dùng trong mảng đó ; "
 "xem <xref linkend=\"preseed-bootloader\"/>."
 
-#: preseed.xml:902
-#, no-c-format
 #. Tag: para
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
+msgstr ""
+"Bạn cũng có thể sử dụng khả năng chèn sẵn để thiết lập phân vùng trên mảng "
+"RAID phần mềm. Có hỗ trợ RAID lớp 0, 1, 5, 6 và 10, thì tạo mảng bị suy biến "
+"và xác định thiết bị thêm. Nếu bạn sử dụng RAID 1, bạn có khả năng chèn sẵn "
+"bộ tải khởi động grub để cài đặt vào mọi thiết bị được dùng trong mảng đó ; "
+"xem <xref linkend=\"preseed-bootloader\"/>."
+
+#. Tag: para
+#: preseed.xml:905
+#, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
 "functionality that receives relatively little testing from the developers of "
@@ -2049,9 +2042,9 @@ msgstr ""
 "công thức khác nhau (để hữu ích và không xung đột với nhau) được người dùng "
 "chịu. Xem <filename>/var/log/syslog</filename> nếu bạn gặp vấn đề."
 
-#: preseed.xml:912
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:915
+#, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -2155,15 +2148,15 @@ msgstr ""
 "d-i partman/confirm boolean true\n"
 "d-i partman/confirm_nooverwrite boolean true"
 
-#: preseed.xml:917
-#, no-c-format
 #. Tag: title
+#: preseed.xml:920
+#, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Điều khiển cách gắn kết phân vùng"
 
-#: preseed.xml:918
-#, no-c-format
 #. Tag: para
+#: preseed.xml:921
+#, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
 "(UUID) as a key; this allows them to be mounted properly even if their "
@@ -2180,9 +2173,9 @@ msgstr ""
 "đặt gắn kết theo nhãn thì hệ thống tập tin nào không có nhãn sẽ được gắn kết "
 "dùng một mã UUID."
 
-#: preseed.xml:927
-#, no-c-format
 #. Tag: para
+#: preseed.xml:930
+#, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
 "their traditional names rather than UUIDs."
@@ -2190,9 +2183,9 @@ msgstr ""
 "Thiết bị nào có tên ổn định, v.d. khối tin hợp lý LVM, thì cứ sử dụng tên "
 "truyền thống thay cho mã UUID."
 
-#: preseed.xml:934
-#, no-c-format
 #. Tag: para
+#: preseed.xml:937
+#, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
 "discovers devices at boot, which may cause the wrong filesystem to be "
@@ -2206,9 +2199,9 @@ msgstr ""
 "xung đột với nhau nếu bạn cằm vào một đĩa mới hay ổ đĩa USB: có xảy ra thì "
 "hệ thống sẽ khởi chạy một cách ngẫu nhiên."
 
-#: preseed.xml:944
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:947
+#, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
 "to\n"
@@ -2222,15 +2215,15 @@ msgstr ""
 "# để thử sử dụng nhãn hệ thống tập tin trước khi phục hồi mã UUID.\n"
 "#d-i partman/mount_style select uuid"
 
-#: preseed.xml:950
-#, no-c-format
 #. Tag: title
+#: preseed.xml:953
+#, no-c-format
 msgid "Base system installation"
 msgstr "Cài đặt hệ thống cơ bản"
 
-#: preseed.xml:951
-#, no-c-format
 #. Tag: para
+#: preseed.xml:954
+#, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
 "installation. The only questions asked concern the installation of the "
@@ -2239,9 +2232,9 @@ msgstr ""
 "Thật sự không thể chèn sẵn nhiều vào giai đoạn cài đặt này. Chỉ hỏi câu về "
 "cách cài đặt hạt nhân."
 
-#: preseed.xml:958
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:961
+#, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
 "# option can result in an incomplete system and should only be used by very\n"
@@ -2269,15 +2262,15 @@ msgstr ""
 "# nếu không cài đặt hạt nhân.\n"
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
-#: preseed.xml:963
-#, no-c-format
 #. Tag: title
+#: preseed.xml:966
+#, no-c-format
 msgid "Account setup"
 msgstr "Thiết lập tài khoản"
 
-#: preseed.xml:964
-#, no-c-format
 #. Tag: para
+#: preseed.xml:967
+#, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
 "user's account can be preseeded. For the passwords you can use either clear "
@@ -2287,9 +2280,9 @@ msgstr ""
 "cho tài khoản của người dùng chuẩn thứ nhất. Đối với mật khẩu, bạn có thể "
 "dùng giá trị nhập thô (không mật mã) hay <emphasis>băm</emphasis> kiểu MD5."
 
-#: preseed.xml:971
-#, no-c-format
 #. Tag: para
+#: preseed.xml:974
+#, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
 "access to the preconfiguration file will have the knowledge of these "
@@ -2303,9 +2296,9 @@ msgstr ""
 "khoản của bảo mật, nhưng nó cũng có thể cung cấp ý thức bảo mật giả, vì cách "
 "truy cập băm MD5 cho phép người khác tấn công bằng sức mạnh vũ phu."
 
-#: preseed.xml:981
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:984
+#, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
 "# use sudo).\n"
@@ -2361,9 +2354,9 @@ msgstr ""
 "# Để ghi đè thiết lập này, dùng chuỗi này:\n"
 "#d-i passwd/user-default-groups string audio cdrom video"
 
-#: preseed.xml:983
-#, no-c-format
 #. Tag: para
+#: preseed.xml:986
+#, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
 "<classname>passwd/user-password-crypted</classname> variables can also be "
@@ -2381,30 +2374,30 @@ msgstr ""
 "nhập người chủ (thí dụ bằng cách dùng khả năng xác thức khoá SSH hay "
 "<command>sudo</command>)."
 
-#: preseed.xml:993
-#, no-c-format
 #. Tag: para
+#: preseed.xml:996
+#, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr ""
 "Theo đây có câu lệnh có thể dùng để tạo mẫu duy nhất MD5 cho một mật khẩu :"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: preseed.xml:997
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1000
+#, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
-#: preseed.xml:1003
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1006
+#, no-c-format
 msgid "Apt setup"
 msgstr "Thiết lập apt"
 
-#: preseed.xml:1004
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1007
+#, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
 "configuration options is fully automated based on your installation method "
@@ -2416,9 +2409,9 @@ msgstr ""
 "dựa vào phương pháp cài đặt và trả lời câu hỏi trước. Tùy chọn bạn có khả "
 "năng thêm kho phần mềm (cục bộ) khác."
 
-#: preseed.xml:1012
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1015
+#, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
@@ -2477,15 +2470,15 @@ msgstr ""
 "# Cảnh báo : không bảo mật thì không khuyến khích.\n"
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
-#: preseed.xml:1017
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1020
+#, no-c-format
 msgid "Package selection"
 msgstr "Chọn gói phần mềm"
 
-#: preseed.xml:1018
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1021
+#, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
 "Available tasks as of this writing include:"
@@ -2493,75 +2486,75 @@ msgstr ""
 "Bạn có khả năng chọn cài đặt bất cứ sự phối hợp công việc nào sẵn sàng. Vào "
 "lúc viết câu này, các công việc sẵn sàng gồm:"
 
-#: preseed.xml:1027
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1030
+#, no-c-format
 msgid "standard"
 msgstr "chuẩn"
 
-#: preseed.xml:1030
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1033
+#, no-c-format
 msgid "desktop"
 msgstr "môi trường làm việc"
 
-#: preseed.xml:1033
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1036
+#, no-c-format
 msgid "gnome-desktop"
 msgstr "môi trường làm việc Gnome"
 
-#: preseed.xml:1036
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1039
+#, no-c-format
 msgid "kde-desktop"
 msgstr "môi trường làm việc KDE"
 
-#: preseed.xml:1039
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1042
+#, no-c-format
 msgid "web-server"
 msgstr "trình phục vụ Mạng"
 
-#: preseed.xml:1042
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1045
+#, no-c-format
 msgid "print-server"
 msgstr "trình phục vụ in"
 
-#: preseed.xml:1045
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1048
+#, no-c-format
 msgid "dns-server"
 msgstr "trình phục vụ DNS"
 
-#: preseed.xml:1048
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1051
+#, no-c-format
 msgid "file-server"
 msgstr "trình phục vụ tập tin"
 
-#: preseed.xml:1051
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1054
+#, no-c-format
 msgid "mail-server"
 msgstr "trình phục vụ thư tín"
 
-#: preseed.xml:1054
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1057
+#, no-c-format
 msgid "sql-database"
 msgstr "cơ sở dữ liệu SQL"
 
-#: preseed.xml:1057
-#, no-c-format
 #. Tag: userinput
+#: preseed.xml:1060
+#, no-c-format
 msgid "laptop"
 msgstr "máy tính xách tay"
 
-#: preseed.xml:1061
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1064
+#, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
 "of packages in some other way. We recommend always including the "
@@ -2571,9 +2564,9 @@ msgstr ""
 "bộ gói bằng cách khác. Khuyên bạn luôn luôn gồm ít nhất công việc "
 "<userinput>chuẩn</userinput>."
 
-#: preseed.xml:1067
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1070
+#, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
 "installed by tasks, you can use the parameter <classname>pkgsel/include</"
@@ -2586,9 +2579,9 @@ msgstr ""
 "classname>. Giá trị của tham số này có thể là danh sách các gói được định "
 "giới bằng hoặc dấu phẩy hoặc dấu cách, cũng dễ dàng dùng trên dòng lệnh."
 
-#: preseed.xml:1077
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1080
+#, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
 "# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2628,23 +2621,27 @@ msgstr ""
 "# thì ghi nó vào đĩa CD.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 
-#: preseed.xml:1082
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1085
+#, no-c-format
 msgid "Boot loader installation"
 msgstr "Cài đặt bộ nạp khởi động"
 
-#: preseed.xml:1084
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1087
+#, fuzzy, no-c-format
 #| msgid ""
-#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
 #| "# instead, uncomment this:\n"
 #| "#d-i grub-installer/skip boolean true\n"
 #| "# To also skip installing lilo, and install no bootloader, uncomment "
 #| "this\n"
 #| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
 #| "\n"
 #| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
 #| "the\n"
@@ -2715,6 +2712,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2733,7 +2732,8 @@ msgstr ""
 "# Để bỏ qua bước cài đặt lilo, thì không cài đặt\n"
 "# bộ nạp khởi động, cũng bỏ ghi chú dòng này:\n"
 "#d-i lilo-installer/skip boolean true</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># Để không cài đặt bộ nạp khởi động nào,\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># Để không cài đặt bộ nạp khởi động "
+"nào,\n"
 "# bỏ ghi chú dòng này\n"
 "#d-i grub-installer/skip boolean true</phrase>\n"
 "\n"
@@ -2775,9 +2775,9 @@ msgstr ""
 "# thì được tự động thêm.\n"
 "#d-i debian-installer/add-kernel-opts string nousb"
 
-#: preseed.xml:1086
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1089
+#, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
 "using <command>grub-md5-crypt</command>, or using the command from the "
@@ -2787,15 +2787,15 @@ msgstr ""
 "<command>grub-md5-crypt</command>, hoặc dùng câu lệnh từ mẫu thí dụ trong "
 "<xref linkend=\"preseed-account\"/>."
 
-#: preseed.xml:1096
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1099
+#, no-c-format
 msgid "Finishing up the installation"
 msgstr "Làm xong tiến trình cài đặt"
 
-#: preseed.xml:1098
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1101
+#, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
 "# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next\n"
@@ -2835,15 +2835,15 @@ msgstr ""
 "# Cái này sẽ tắt máy thay vào chỉ dừng chạy nó.\n"
 "#d-i debian-installer/exit/poweroff boolean true"
 
-#: preseed.xml:1103
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1106
+#, no-c-format
 msgid "Preseeding other packages"
 msgstr "Chèn trước gói khác"
 
-#: preseed.xml:1105
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1108
+#, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
 "# during the installation process, it's possible that other questions may\n"
@@ -2860,21 +2860,21 @@ msgstr ""
 "#   debconf-get-selections --installer > file\n"
 "#   debconf-get-selections >> file"
 
-#: preseed.xml:1112
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1115
+#, no-c-format
 msgid "Advanced options"
 msgstr "Tùy chọn cấp cao"
 
-#: preseed.xml:1115
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1118
+#, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Chạy lệnh riêng trong khi cài đặt"
 
-#: preseed.xml:1116
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1119
+#, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
 "the ability to run commands or scripts at certain points in the installation."
@@ -2882,9 +2882,9 @@ msgstr ""
 "Những công cụ chèn sẵn cũng cung cấp một tùy chọn rất mạnh và dẻo : khả năng "
 "chạy lệnh hay văn lệnh tại một số điểm thời riêng trong tiến trình cài đặt."
 
-#: preseed.xml:1124
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1127
+#, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
 "# for attempts at buffer overflows or other exploits of the values of a\n"
@@ -2935,15 +2935,15 @@ msgstr ""
 "đích.\n"
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
-#: preseed.xml:1129
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1132
+#, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "Dùng khả năng chèn sẵn để thay đổi giá trị mặc định"
 
-#: preseed.xml:1130
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1133
+#, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
 "question, but still have the question asked. To do this the <firstterm>seen</"
@@ -2967,9 +2967,9 @@ msgstr ""
 "interactive=true</classname> tại dấu nhắc khởi động. Cũng có thể hữu ích để "
 "thử hay gỡ lỗi tập tin cấu hình sẵn."
 
-#: preseed.xml:1144
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1147
+#, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
 "used in the installer itself. For variables belonging to packages installed "
@@ -2981,9 +2981,9 @@ msgstr ""
 "vào hệ thống đích, bạn nên sử dụng tên của gói để thay thế. Xem cước chú về "
 "<xref linkend=\"preseed-bootparms\"/>."
 
-#: preseed.xml:1151
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1154
+#, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
 "the corresponding question by using the <quote>?=</quote> operator, i.e. "
@@ -3004,15 +3004,15 @@ msgstr ""
 "động đối với tham số tương ứng với câu hỏi thật được hiển thị trong khi cài "
 "đặt, không phải đối với tham số <quote>nội bộ</quote>."
 
-#: preseed.xml:1165
-#, no-c-format
 #. Tag: title
+#: preseed.xml:1168
+#, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "Tải dây chuyền tập tin định cấu hình sẵn"
 
-#: preseed.xml:1166
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1169
+#, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
 "preconfiguration file. Any settings in those files will override pre-"
@@ -3026,9 +3026,9 @@ msgstr ""
 "năng, lấy thí dụ, để thiết lập mạng chung cho chỗ bạn trong tập tin này, còn "
 "để thiết lập chi tiết hơn cho một số cấu hình riêng trong các tập tin khác."
 
-#: preseed.xml:1176
-#, no-c-format
 #. Tag: screen
+#: preseed.xml:1179
+#, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
 "# loaded. The included files can have preseed/include directives of their\n"
@@ -3079,9 +3079,9 @@ msgstr ""
 "# cùng một thư mục với tập tin cấu hình sẵn mà chứa tập tin đó.\n"
 "#d-i preseed/run string foo.sh"
 
-#: preseed.xml:1178
-#, no-c-format
 #. Tag: para
+#: preseed.xml:1181
+#, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
 "into network preseeding by setting preseed/url in the earlier files. This "
diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po
index c4a1edd60..a833b3203 100644
--- a/po/vi/random-bits.po
+++ b/po/vi/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-23 17:59+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,21 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: random-bits.xml:4
 #, no-c-format
-#. Tag: title
 msgid "Random Bits"
 msgstr "Thông Tin Linh Tinh"
 
+#. Tag: title
 #: random-bits.xml:11
 #, no-c-format
-#. Tag: title
 msgid "Linux Devices"
 msgstr "Thiết bị Linux"
 
+#. Tag: para
 #: random-bits.xml:12
 #, no-c-format
-#. Tag: para
 msgid ""
 "In Linux various special files can be found under the directory <filename>/"
 "dev</filename>. These files are called device files and behave unlike "
@@ -50,291 +50,291 @@ msgstr ""
 "firstterm> (ống dẫn). Những tập tin thiết bị quan trọng nhất được liệt kê "
 "trong các bảng bên dưới."
 
+#. Tag: filename
 #: random-bits.xml:27
 #, no-c-format
-#. Tag: filename
 msgid "<filename>fd0</filename>"
 msgstr "<filename>fd0</filename>"
 
+#. Tag: entry
 #: random-bits.xml:28
 #, no-c-format
-#. Tag: entry
 msgid "First Floppy Drive"
 msgstr "Ổ đĩa mềm thứ nhất"
 
+#. Tag: filename
 #: random-bits.xml:30
 #, no-c-format
-#. Tag: filename
 msgid "<filename>fd1</filename>"
 msgstr "<filename>fd1</filename>"
 
+#. Tag: entry
 #: random-bits.xml:31
 #, no-c-format
-#. Tag: entry
 msgid "Second Floppy Drive"
 msgstr "Ổ đĩa mềm thứ hai"
 
+#. Tag: filename
 #: random-bits.xml:37
 #, no-c-format
-#. Tag: filename
 msgid "<filename>hda</filename>"
 msgstr "<filename>hda</filename>"
 
+#. Tag: entry
 #: random-bits.xml:38
 #, no-c-format
-#. Tag: entry
 msgid "IDE Hard disk / CD-ROM on the first IDE port (Master)"
 msgstr "Đĩa cứng/CD-ROM kiểu IDE nằm trên cổng IDE thứ nhất (chính)"
 
+#. Tag: filename
 #: random-bits.xml:40
 #, no-c-format
-#. Tag: filename
 msgid "<filename>hdb</filename>"
 msgstr "<filename>hdb</filename>"
 
+#. Tag: entry
 #: random-bits.xml:41
 #, no-c-format
-#. Tag: entry
 msgid "IDE Hard disk / CD-ROM on the first IDE port (Slave)"
 msgstr "Đĩa cứng/CD-ROM kiểu IDE nằm trên cổng IDE thứ nhất (phụ)"
 
+#. Tag: filename
 #: random-bits.xml:43
 #, no-c-format
-#. Tag: filename
 msgid "<filename>hdc</filename>"
 msgstr "<filename>hdc</filename>"
 
+#. Tag: entry
 #: random-bits.xml:44
 #, no-c-format
-#. Tag: entry
 msgid "IDE Hard disk / CD-ROM on the second IDE port (Master)"
 msgstr "Đĩa cứng/CD-ROM kiểu IDE nằm trên cổng IDE thứ hai (chính)"
 
+#. Tag: filename
 #: random-bits.xml:46
 #, no-c-format
-#. Tag: filename
 msgid "<filename>hdd</filename>"
 msgstr "<filename>hdd</filename>"
 
+#. Tag: entry
 #: random-bits.xml:47
 #, no-c-format
-#. Tag: entry
 msgid "IDE Hard disk / CD-ROM on the second IDE port (Slave)"
 msgstr "Đĩa cứng/CD-ROM kiểu IDE nằm trên cổng IDE thứ hai (phụ)"
 
+#. Tag: filename
 #: random-bits.xml:49
 #, no-c-format
-#. Tag: filename
 msgid "hda1"
 msgstr "hda1"
 
+#. Tag: entry
 #: random-bits.xml:50
 #, no-c-format
-#. Tag: entry
 msgid "First partition of the first IDE hard disk"
 msgstr "Phân vùng thứ nhất nằm trên đĩa cứng KDE thứ nhất"
 
+#. Tag: filename
 #: random-bits.xml:52
 #, no-c-format
-#. Tag: filename
 msgid "hdd15"
 msgstr "hdd15"
 
+#. Tag: entry
 #: random-bits.xml:53
 #, no-c-format
-#. Tag: entry
 msgid "Fifteenth partition of the fourth IDE hard disk"
 msgstr "Phân vùng thứ mười năm nằm trên đĩa cứng KDE thứ tư"
 
+#. Tag: filename
 #: random-bits.xml:59
 #, no-c-format
-#. Tag: filename
 msgid "<filename>sda</filename>"
 msgstr "<filename>sda</filename>"
 
+#. Tag: entry
 #: random-bits.xml:60
 #, no-c-format
-#. Tag: entry
 msgid "SCSI Hard disk with lowest SCSI ID (e.g. 0)"
 msgstr "Đĩa cứng kiểu SCSI với mã nhận diện ID SCSI thấp nhất (v.d. 0)"
 
+#. Tag: filename
 #: random-bits.xml:62
 #, no-c-format
-#. Tag: filename
 msgid "<filename>sdb</filename>"
 msgstr "<filename>sdb</filename>"
 
+#. Tag: entry
 #: random-bits.xml:63
 #, no-c-format
-#. Tag: entry
 msgid "SCSI Hard disk with next higher SCSI ID (e.g. 1)"
 msgstr "Đĩa cứng SCSI với ID SCSI cao hơn kế tiếp (v.d. 1)"
 
+#. Tag: filename
 #: random-bits.xml:65
 #, no-c-format
-#. Tag: filename
 msgid "<filename>sdc</filename>"
 msgstr "<filename>sdc</filename>"
 
+#. Tag: entry
 #: random-bits.xml:66
 #, no-c-format
-#. Tag: entry
 msgid "SCSI Hard disk with next higher SCSI ID (e.g. 2)"
 msgstr "Đĩa cứng SCSI với ID SCSI cao hơn kế tiếp (v.d. 2)"
 
+#. Tag: filename
 #: random-bits.xml:68
 #, no-c-format
-#. Tag: filename
 msgid "sda1"
 msgstr "sda1"
 
+#. Tag: entry
 #: random-bits.xml:69
 #, no-c-format
-#. Tag: entry
 msgid "First partition of the first SCSI hard disk"
 msgstr "Phân vùng thứ nhất nằm trên đĩa cứng kiểu SCSI thứ nhất"
 
+#. Tag: filename
 #: random-bits.xml:71
 #, no-c-format
-#. Tag: filename
 msgid "sdd10"
 msgstr "sdd10"
 
+#. Tag: entry
 #: random-bits.xml:72
 #, no-c-format
-#. Tag: entry
 msgid "Tenth partition of the fourth SCSI hard disk"
 msgstr "Phân vùng thứ mười nằm trên đĩa cứng SCSI thứ tư"
 
+#. Tag: filename
 #: random-bits.xml:78
 #, no-c-format
-#. Tag: filename
 msgid "<filename>sr0</filename>"
 msgstr "<filename>sr0</filename>"
 
+#. Tag: entry
 #: random-bits.xml:79
 #, no-c-format
-#. Tag: entry
 msgid "SCSI CD-ROM with the lowest SCSI ID"
 msgstr "Đĩa CD-ROM kiểu SCSI với ID SCSI thấp nhất"
 
+#. Tag: filename
 #: random-bits.xml:81
 #, no-c-format
-#. Tag: filename
 msgid "<filename>sr1</filename>"
 msgstr "<filename>sr1</filename>"
 
+#. Tag: entry
 #: random-bits.xml:82
 #, no-c-format
-#. Tag: entry
 msgid "SCSI CD-ROM with the next higher SCSI ID"
 msgstr "Đĩa CD-ROM SCSI với ID SCSI cao hơn kế tiếp"
 
+#. Tag: filename
 #: random-bits.xml:88
 #, no-c-format
-#. Tag: filename
 msgid "ttyS0"
 msgstr "ttyS0"
 
+#. Tag: entry
 #: random-bits.xml:89
 #, no-c-format
-#. Tag: entry
 msgid "Serial port 0, COM1 under MS-DOS"
 msgstr "Cổng nối tiếp 0, COM1 dưới MS-DOS"
 
+#. Tag: filename
 #: random-bits.xml:91
 #, no-c-format
-#. Tag: filename
 msgid "ttyS1"
 msgstr "ttyS1"
 
+#. Tag: entry
 #: random-bits.xml:92
 #, no-c-format
-#. Tag: entry
 msgid "Serial port 1, COM2 under MS-DOS"
 msgstr "Cổng nối tiếp 1, COM2 dưới MS-DOS"
 
+#. Tag: filename
 #: random-bits.xml:94
 #, no-c-format
-#. Tag: filename
 msgid "psaux"
 msgstr "psaux"
 
+#. Tag: entry
 #: random-bits.xml:95
 #, no-c-format
-#. Tag: entry
 msgid "PS/2 mouse device"
 msgstr "Thiết bị con chuột PS/2"
 
+#. Tag: filename
 #: random-bits.xml:97
 #, no-c-format
-#. Tag: filename
 msgid "gpmdata"
 msgstr "gpmdata"
 
+#. Tag: entry
 #: random-bits.xml:98
 #, no-c-format
-#. Tag: entry
 msgid "Pseudo device, repeater data from GPM (mouse) daemon"
 msgstr "Thiết bị giả, dữ liệu lặp lại từ trình nền GPM (con chuột)"
 
+#. Tag: filename
 #: random-bits.xml:104
 #, no-c-format
-#. Tag: filename
 msgid "cdrom"
 msgstr "cdrom"
 
+#. Tag: entry
 #: random-bits.xml:105
 #, no-c-format
-#. Tag: entry
 msgid "Symbolic link to the CD-ROM drive"
 msgstr "Liên kết tượng trưng đến ổ đĩa CD-ROM"
 
+#. Tag: filename
 #: random-bits.xml:107
 #, no-c-format
-#. Tag: filename
 msgid "mouse"
 msgstr "mouse"
 
+#. Tag: entry
 #: random-bits.xml:108
 #, no-c-format
-#. Tag: entry
 msgid "Symbolic link to the mouse device file"
 msgstr "Liên kết tượng trưng đến tập tin thiết bị con chuột"
 
+#. Tag: filename
 #: random-bits.xml:114
 #, no-c-format
-#. Tag: filename
 msgid "null"
 msgstr "null"
 
+#. Tag: entry
 #: random-bits.xml:115
 #, no-c-format
-#. Tag: entry
 msgid "Anything written to this device will disappear"
 msgstr "Mọi gì được ghi vào thiết bị này sẽ biến mất"
 
+#. Tag: filename
 #: random-bits.xml:117
 #, no-c-format
-#. Tag: filename
 msgid "zero"
 msgstr "zero"
 
+#. Tag: entry
 #: random-bits.xml:118
 #, no-c-format
-#. Tag: entry
 msgid "One can endlessly read zeros out of this device"
 msgstr "Có thể đọc vô hạn số không ra thiết bị này"
 
+#. Tag: title
 #: random-bits.xml:125
 #, no-c-format
-#. Tag: title
 msgid "Setting Up Your Mouse"
 msgstr "Thiết lập con chuột"
 
+#. Tag: para
 #: random-bits.xml:126
 #, no-c-format
-#. Tag: para
 msgid ""
 "The mouse can be used in both the Linux console (with gpm) and the X window "
 "environment. Normally, this is a simple matter of installing <filename>gpm</"
@@ -353,9 +353,9 @@ msgstr ""
 "userinput> trong X. Tập tin cấu hình riêng từng cái là <filename>/etc/gpm."
 "conf</filename> và <filename>/etc/X11/xorg.conf</filename>."
 
+#. Tag: para
 #: random-bits.xml:137
 #, no-c-format
-#. Tag: para
 msgid ""
 "Certain kernel modules must be loaded in order for your mouse to work. In "
 "most cases the correct modules are autodetected, but not always for old-"
@@ -397,9 +397,9 @@ msgstr ""
 "command> (từ gói cùng tên) và tìm trong phân loại <userinput>kernel/drivers/"
 "input/mouse</userinput>."
 
+#. Tag: para
 #: random-bits.xml:184
 #, no-c-format
-#. Tag: para
 msgid ""
 "Modern kernels give you the capability to emulate a three-button mouse when "
 "your mouse only has one button. Just add the following lines to <filename>/"
@@ -409,9 +409,9 @@ msgstr ""
 "chuột vật lý có chỉ một nút riêng lẻ. Đơn giản hãy thêm những dòng theo đây "
 "vào tập tin cấu hình <filename>/etc/sysctl.conf</filename>."
 
+#. Tag: screen
 #: random-bits.xml:191
 #, no-c-format
-#. Tag: screen
 msgid ""
 "# 3-button mouse emulation\n"
 "# turn on emulation\n"
@@ -431,15 +431,15 @@ msgstr ""
 "/dev/mac_hid/mouse_button3_keycode = 88\n"
 "# Đối với phím khác, dùng công cụ showkey để báo bạn biết mã thích hợp."
 
+#. Tag: title
 #: random-bits.xml:198
 #, no-c-format
-#. Tag: title
 msgid "Disk Space Needed for Tasks"
 msgstr "Sức chứa trên đĩa cần thiết cho công việc"
 
+#. Tag: para
 #: random-bits.xml:199
 #, no-c-format
-#. Tag: para
 msgid ""
 "A standard installation for the i386 architecture, including all standard "
 "packages and using the default 2.6 kernel, takes up &std-system-size;MB of "
@@ -451,9 +451,9 @@ msgstr ""
 "một bản cài đặt tối thiểu, không có công việc  <quote>Hệ thống chuẩn</quote> "
 "được chọn, chiếm &base-system-size; MB."
 
+#. Tag: para
 #: random-bits.xml:207
 #, no-c-format
-#. Tag: para
 msgid ""
 "In both cases this is the actual disk space used <emphasis>after</emphasis> "
 "the installation is finished and any temporary files deleted. It also does "
@@ -467,9 +467,9 @@ msgstr ""
 "chẳng hạn cho các tập tin nhật ký. Có nghĩa là cần thiết sức chứa nhiều hơn, "
 "cả <emphasis>trong khi</emphasis> cài đặt lẫn khi sử dụng hệ thống hàng ngày."
 
+#. Tag: para
 #: random-bits.xml:216
 #, no-c-format
-#. Tag: para
 msgid ""
 "The following table lists sizes reported by aptitude for the tasks listed in "
 "tasksel. Note that some tasks have overlapping constituents, so the total "
@@ -481,9 +481,9 @@ msgstr ""
 "số công việc riêng có nội dung chung, vì vậy tổng số kích cỡ đã cài đặt của "
 "hai công việc với nhau có thể là nhỏ hơn tổng hai số đó."
 
+#. Tag: para
 #: random-bits.xml:223
 #, no-c-format
-#. Tag: para
 msgid ""
 "By default the installer will install the GNOME desktop environment, but "
 "alternative desktop environments can be selected either by using one of the "
@@ -495,9 +495,9 @@ msgstr ""
 "những ảnh đĩa CD đặc biệt, hoặc bằng cách ghi rõ môi trường làm việc đã muốn "
 "khi trình cài đặt khởi động (xem <xref linkend=\"pkgsel\"/>)."
 
+#. Tag: para
 #: random-bits.xml:230
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that you will need to add the sizes listed in the table to the size of "
 "the standard installation when determining the size of partitions. Most of "
@@ -513,149 +513,147 @@ msgstr ""
 "trong cột <quote>Kích cỡ tải về</quote> cần thiết (tạm thời) trong thư mục "
 "<filename>/var</filename>."
 
+#. Tag: entry
 #: random-bits.xml:244
 #, no-c-format
-#. Tag: entry
 msgid "Task"
 msgstr "Công việc"
 
+#. Tag: entry
 #: random-bits.xml:245
 #, no-c-format
-#. Tag: entry
 msgid "Installed size (MB)"
 msgstr "Kích cỡ đã cài đặt (MB)"
 
+#. Tag: entry
 #: random-bits.xml:246
 #, no-c-format
-#. Tag: entry
 msgid "Download size (MB)"
 msgstr "Kích cỡ tải về (MB)"
 
+#. Tag: entry
 #: random-bits.xml:247
 #, no-c-format
-#. Tag: entry
 msgid "Space needed to install (MB)"
 msgstr "Sức chứa cần thiết để cài đặt (MB)"
 
+#. Tag: entry
 #: random-bits.xml:253
 #, no-c-format
-#. Tag: entry
 msgid "Desktop environment"
 msgstr "Môi trường làm việc"
 
-#: random-bits.xml:254
-#: random-bits.xml:255
-#: random-bits.xml:256
-#, no-c-format
 #. Tag: entry
+#: random-bits.xml:254 random-bits.xml:255 random-bits.xml:256
+#, no-c-format
 msgid "&nbsp;"
 msgstr "&nbsp;"
 
+#. Tag: entry
 #: random-bits.xml:259
 #, no-c-format
-#. Tag: entry
 msgid "&nbsp;&nbsp;&bull;&nbsp;GNOME (default)"
 msgstr "&nbsp;&nbsp;&bull;&nbsp;GNOME (mặc định)"
 
+#. Tag: entry
 #: random-bits.xml:260
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-gnome-inst;"
 msgstr "&task-desktop-gnome-inst;"
 
+#. Tag: entry
 #: random-bits.xml:261
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-gnome-dl;"
 msgstr "&task-desktop-gnome-dl;"
 
+#. Tag: entry
 #: random-bits.xml:262
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-gnome-tot;"
 msgstr "&task-desktop-gnome-tot;"
 
+#. Tag: entry
 #: random-bits.xml:265
 #, no-c-format
-#. Tag: entry
 msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
 msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
 
+#. Tag: entry
 #: random-bits.xml:266
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-kde-inst;"
 msgstr "&task-desktop-kde-inst;"
 
+#. Tag: entry
 #: random-bits.xml:267
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-kde-dl;"
 msgstr "&task-desktop-kde-dl;"
 
+#. Tag: entry
 #: random-bits.xml:268
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-kde-tot;"
 msgstr "&task-desktop-kde-tot;"
 
+#. Tag: entry
 #: random-bits.xml:271
 #, no-c-format
-#. Tag: entry
 msgid "&nbsp;&nbsp;&bull;&nbsp;Xfce"
 msgstr "&nbsp;&nbsp;&bull;&nbsp;Xfce"
 
+#. Tag: entry
 #: random-bits.xml:272
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-xfce-inst;"
 msgstr "&task-desktop-xfce-inst;"
 
+#. Tag: entry
 #: random-bits.xml:273
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-xfce-dl;"
 msgstr "&task-desktop-xfce-dl;"
 
+#. Tag: entry
 #: random-bits.xml:274
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-xfce-tot;"
 msgstr "&task-desktop-xfce-tot;"
 
+#. Tag: entry
 #: random-bits.xml:277
 #, no-c-format
-#. Tag: entry
 msgid "&nbsp;&nbsp;&bull;&nbsp;LXDE"
 msgstr "&nbsp;&nbsp;&bull;&nbsp;LXDE"
 
+#. Tag: entry
 #: random-bits.xml:278
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-lxde-inst;"
 msgstr "&task-desktop-lxde-inst;"
 
+#. Tag: entry
 #: random-bits.xml:279
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-lxde-dl;"
 msgstr "&task-desktop-lxde-dl;"
 
+#. Tag: entry
 #: random-bits.xml:280
 #, no-c-format
-#. Tag: entry
 msgid "&task-desktop-lxde-tot;"
 msgstr "&task-desktop-lxde-tot;"
 
+#. Tag: entry
 #: random-bits.xml:284
 #, no-c-format
-#. Tag: entry
 msgid "Laptop"
 msgstr "Máy tính xách tay"
 
+#. Tag: para
 #: random-bits.xml:286
 #, no-c-format
-#. Tag: para
 msgid ""
 "There is some overlap of the Laptop task with the Desktop environment task. "
 "If you install both, the Laptop task will only require a few MB additional "
@@ -665,171 +663,199 @@ msgstr ""
 "Cài đặt cả hai thì tác vụ Máy tính xách tay sẽ chiếm chỉ vài MB thêm sức "
 "chứa trên đĩa."
 
+#. Tag: entry
 #: random-bits.xml:293
 #, no-c-format
-#. Tag: entry
 msgid "&task-laptop-inst;"
 msgstr "&task-laptop-inst;"
 
+#. Tag: entry
 #: random-bits.xml:294
 #, no-c-format
-#. Tag: entry
 msgid "&task-laptop-dl;"
 msgstr "&task-laptop-dl;"
 
+#. Tag: entry
 #: random-bits.xml:295
 #, no-c-format
-#. Tag: entry
 msgid "&task-laptop-tot;"
 msgstr "&task-laptop-tot;"
 
+#. Tag: entry
 #: random-bits.xml:299
 #, no-c-format
-#. Tag: entry
 msgid "Web server"
 msgstr "Trình phục vụ Web"
 
+#. Tag: entry
 #: random-bits.xml:300
 #, no-c-format
-#. Tag: entry
 msgid "&task-web-inst;"
 msgstr "&task-web-inst;"
 
+#. Tag: entry
 #: random-bits.xml:301
 #, no-c-format
-#. Tag: entry
 msgid "&task-web-dl;"
 msgstr "&task-web-dl;"
 
+#. Tag: entry
 #: random-bits.xml:302
 #, no-c-format
-#. Tag: entry
 msgid "&task-web-tot;"
 msgstr "&task-web-tot;"
 
+#. Tag: entry
 #: random-bits.xml:306
 #, no-c-format
-#. Tag: entry
 msgid "Print server"
 msgstr "Trình phục vụ in"
 
+#. Tag: entry
 #: random-bits.xml:307
 #, no-c-format
-#. Tag: entry
 msgid "&task-print-inst;"
 msgstr "&task-print-inst;"
 
+#. Tag: entry
 #: random-bits.xml:308
 #, no-c-format
-#. Tag: entry
 msgid "&task-print-dl;"
 msgstr "&task-print-dl;"
 
+#. Tag: entry
 #: random-bits.xml:309
 #, no-c-format
-#. Tag: entry
 msgid "&task-print-tot;"
 msgstr "&task-print-tot;"
 
+#. Tag: entry
 #: random-bits.xml:313
 #, no-c-format
-#. Tag: entry
 msgid "DNS server"
 msgstr "Trình phục vụ DNS"
 
+#. Tag: entry
 #: random-bits.xml:314
 #, no-c-format
-#. Tag: entry
 msgid "&task-dns-inst;"
 msgstr "&task-dns-inst;"
 
+#. Tag: entry
 #: random-bits.xml:315
 #, no-c-format
-#. Tag: entry
 msgid "&task-dns-dl;"
 msgstr "&task-dns-dl;"
 
+#. Tag: entry
 #: random-bits.xml:316
 #, no-c-format
-#. Tag: entry
 msgid "&task-dns-tot;"
 msgstr "&task-dns-tot;"
 
+#. Tag: entry
 #: random-bits.xml:320
 #, no-c-format
-#. Tag: entry
 msgid "File server"
 msgstr "Trình phục vụ tập tin"
 
+#. Tag: entry
 #: random-bits.xml:321
 #, no-c-format
-#. Tag: entry
 msgid "&task-file-inst;"
 msgstr "&task-file-inst;"
 
+#. Tag: entry
 #: random-bits.xml:322
 #, no-c-format
-#. Tag: entry
 msgid "&task-file-dl;"
 msgstr "&task-file-dl;"
 
+#. Tag: entry
 #: random-bits.xml:323
 #, no-c-format
-#. Tag: entry
 msgid "&task-file-tot;"
 msgstr "&task-file-tot;"
 
+#. Tag: entry
 #: random-bits.xml:327
 #, no-c-format
-#. Tag: entry
 msgid "Mail server"
 msgstr "Trình phục vụ thư"
 
+#. Tag: entry
 #: random-bits.xml:328
 #, no-c-format
-#. Tag: entry
 msgid "&task-mail-inst;"
 msgstr "&task-mail-inst;"
 
+#. Tag: entry
 #: random-bits.xml:329
 #, no-c-format
-#. Tag: entry
 msgid "&task-mail-dl;"
 msgstr "&task-mail-dl;"
 
+#. Tag: entry
 #: random-bits.xml:330
 #, no-c-format
-#. Tag: entry
 msgid "&task-mail-tot;"
 msgstr "&task-mail-tot;"
 
+#. Tag: entry
 #: random-bits.xml:334
 #, no-c-format
-#. Tag: entry
 msgid "SQL database"
 msgstr "Cơ sở dữ liệu SQL"
 
+#. Tag: entry
 #: random-bits.xml:335
 #, no-c-format
-#. Tag: entry
 msgid "&task-sql-inst;"
 msgstr "&task-sql-inst;"
 
+#. Tag: entry
 #: random-bits.xml:336
 #, no-c-format
-#. Tag: entry
 msgid "&task-sql-dl;"
 msgstr "&task-sql-dl;"
 
+#. Tag: entry
 #: random-bits.xml:337
 #, no-c-format
-#. Tag: entry
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "Trình phục vụ DNS"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
 #. Tag: para
+#: random-bits.xml:350
+#, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
 "may automatically install a <firstterm>localization task</firstterm>, if one "
@@ -842,24 +868,15 @@ msgstr ""
 "cần thiết khác biệt giữa những ngôn ngữ khác nhau; bạn nên tính đến tổng là "
 "350 MB để tải về và cài đặt công việc này."
 
-#: random-bits.xml:358
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:365
+#, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Cài đặt &debian-gnu; từ hệ thống UNIX/Linux"
 
-#: random-bits.xml:360
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "This section explains how to install &debian-gnu; from an existing Unix "
-#| "or Linux system, without using the menu-driven installer as explained in "
-#| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
-#| "SUSE. In this section some familiarity with entering *nix commands and "
-#| "navigating the file system is assumed. In this section, <prompt>$</"
-#| "prompt> symbolizes a command to be entered in the user's current system, "
-#| "while <prompt>#</prompt> refers to a command entered in the Debian chroot."
+#: random-bits.xml:367
+#, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
@@ -879,15 +896,9 @@ msgstr ""
 "prompt> đại diện lệnh cần nhập vào hệ thống hiện thời của người dùng, còn "
 "dấu băm <prompt>#</prompt> đại diện lệnh được nhập vào chroot của &debian;."
 
-#: random-bits.xml:372
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Once you've got the new Debian system configured to your preference, you "
-#| "can migrate your existing user data (if any) to it, and keep on rolling. "
-#| "This is therefore a <quote>zero downtime</quote> &debian-gnu; install. "
-#| "It's also a clever way for dealing with hardware that otherwise doesn't "
-#| "play friendly with various boot or installation media."
+#: random-bits.xml:379
+#, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
 "can migrate your existing user data (if any) to it, and keep on rolling. "
@@ -895,23 +906,15 @@ msgid ""
 "also a clever way for dealing with hardware that otherwise doesn't play "
 "friendly with various boot or installation media."
 msgstr ""
-"Một khi cấu hình hệ thống &debian; mới một cách thích hợp, bạn có thể nâng cấp lên nó dữ liệu người dùng tồn tại nào, sau đó tiếp tục làm việc như bình thường. Vì vậy, tiến trình cài đặt &debian-gnu; này "
-"<quote>không có thời gian chết</quote>. Nó cũng là một phương pháp thông minh để "
-"quản lý phần cứng thường không hợp tác với vật chứa khác nhau kiểu khởi động "
-"hay cài đặt."
+"Một khi cấu hình hệ thống &debian; mới một cách thích hợp, bạn có thể nâng "
+"cấp lên nó dữ liệu người dùng tồn tại nào, sau đó tiếp tục làm việc như bình "
+"thường. Vì vậy, tiến trình cài đặt &debian-gnu; này <quote>không có thời "
+"gian chết</quote>. Nó cũng là một phương pháp thông minh để quản lý phần "
+"cứng thường không hợp tác với vật chứa khác nhau kiểu khởi động hay cài đặt."
 
-#: random-bits.xml:383
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "As this is a mostly manual procedure, you should bear in mind that you "
-#| "will need to do a lot of basic configuration of the system yourself, "
-#| "which will also require more knowledge of Debian and of &arch-kernel; in "
-#| "general than performing a regular installation. You cannot expect this "
-#| "procedure to result in a system that is identical to a system from a "
-#| "regular installation. You should also keep in mind that this procedure "
-#| "only gives the basic steps to set up a system. Additional installation "
-#| "and/or configuration steps may be needed."
+#: random-bits.xml:390
+#, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
 "need to do a lot of basic configuration of the system yourself, which will "
@@ -922,18 +925,22 @@ msgid ""
 "the basic steps to set up a system. Additional installation and/or "
 "configuration steps may be needed."
 msgstr ""
-"Vì đây phần lớn là một thủ tục làm bằng tay, ghi nhớ rằng bạn sẽ cần phải tự làm nhiều cấu hình cơ bản, mà yêu cầu bạn quen nhiều với &debian; và &arch-kernel; hơn khi cài đặt bình thường. Thủ tục này sẽ "
-"không làm kết quả là hệ thống trùng với kết quả của tiến trình cài đặt bình thường. Thủ tục này chỉ diễn tả những bước cơ bản khi thiết lập hệ thống. Có thể là cần thiết thêm bước cài đặt hay/và cấu hình."
+"Vì đây phần lớn là một thủ tục làm bằng tay, ghi nhớ rằng bạn sẽ cần phải tự "
+"làm nhiều cấu hình cơ bản, mà yêu cầu bạn quen nhiều với &debian; và &arch-"
+"kernel; hơn khi cài đặt bình thường. Thủ tục này sẽ không làm kết quả là hệ "
+"thống trùng với kết quả của tiến trình cài đặt bình thường. Thủ tục này chỉ "
+"diễn tả những bước cơ bản khi thiết lập hệ thống. Có thể là cần thiết thêm "
+"bước cài đặt hay/và cấu hình."
 
-#: random-bits.xml:397
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:404
+#, no-c-format
 msgid "Getting Started"
 msgstr "Bắt đầu"
 
-#: random-bits.xml:398
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:405
+#, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
 "needed, creating at least one filesystem plus swap. You need around 350MB of "
@@ -947,9 +954,9 @@ msgstr ""
 "giao tiếp, hay khoảng 1 GB nếu bạn định cài đặt hệ thống cửa sổ X (còn nhiều "
 "hơn nếu bạn định cài đặt môi trường làm việc như GNOME hay KDE)."
 
-#: random-bits.xml:406
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:413
+#, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
 "file system on partition <filename>/dev/hda6</filename> (that's our example "
@@ -965,19 +972,9 @@ msgstr ""
 "</screen></informalexample> Còn để tạo hệ thống tập tin kiểu ext2, chỉ cần "
 "bỏ đoạn <userinput>-j</userinput> đi."
 
-#: random-bits.xml:416
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Initialize and activate swap (substitute the partition number for your "
-#| "intended Debian swap partition): <informalexample><screen>\n"
-#| "# mkswap /dev/<replaceable>hda5</replaceable>\n"
-#| "# sync; sync; sync\n"
-#| "# swapon /dev/<replaceable>hda5</replaceable>\n"
-#| "</screen></informalexample> Mount one partition as <filename>/mnt/"
-#| "debinst</filename> (the installation point, to be the root (<filename>/</"
-#| "filename>) filesystem on your new system). The mount point name is "
-#| "strictly arbitrary, it is referenced later below."
+#: random-bits.xml:423
+#, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
 "intended &debian; swap partition): <informalexample><screen>\n"
@@ -989,20 +986,20 @@ msgid ""
 "filesystem on your new system). The mount point name is strictly arbitrary, "
 "it is referenced later below."
 msgstr ""
-"Sơ khởi và kích hoạt vùng trao đổi (thay thế số thứ tự phân vùng của phân vùng "
-"trao đổi &debian; dự định): <informalexample><screen>\n"
+"Sơ khởi và kích hoạt vùng trao đổi (thay thế số thứ tự phân vùng của phân "
+"vùng trao đổi &debian; dự định): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
-"</screen></informalexample> Lắp một phân vùng như là <filename>/mnt/"
-"debinst</filename> (điểm cài đặt, để làm hệ thống tập tin gốc (<filename>/</"
+"</screen></informalexample> Lắp một phân vùng như là <filename>/mnt/debinst</"
+"filename> (điểm cài đặt, để làm hệ thống tập tin gốc (<filename>/</"
 "filename>) trên hệ thống mới). Tên của điểm lắp là tùy ý chặt chẽ: nó được "
 "tham chiếu về sau bên dưới."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: random-bits.xml:428
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:435
+#, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
@@ -1010,9 +1007,9 @@ msgstr ""
 "# mkdir /mnt/debinst\n"
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
-#: random-bits.xml:431
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:438
+#, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
 "partitions, you will need to create and mount these directories manually "
@@ -1022,26 +1019,15 @@ msgstr ""
 "filename>) được gắn kết vào phân vùng riêng, bạn cần phải tự tạo và gắn kết "
 "những thư mục này trước khi tiếp tục tới giao đoạn kế tiếp."
 
-#: random-bits.xml:441
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:448
+#, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Cài đặt <command>debootstrap</command>"
 
-#: random-bits.xml:442
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "The utility used by the Debian installer, and recognized as the official "
-#| "way to install a Debian base system, is <command>debootstrap</command>. "
-#| "It uses <command>wget</command> and <command>ar</command>, but otherwise "
-#| "depends only on <classname>/bin/sh</classname> and basic Unix/Linux "
-#| "tools<footnote> <para> These include the GNU core utilities and commands "
-#| "like <command>sed</command>, <command>grep</command>, <command>tar</"
-#| "command> and <command>gzip</command>. </para> </footnote>. Install "
-#| "<command>wget</command> and <command>ar</command> if they aren't already "
-#| "on your current system, then download and install <command>debootstrap</"
-#| "command>."
+#: random-bits.xml:449
+#, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
 "way to install a &debian; base system, is <command>debootstrap</command>. It "
@@ -1053,27 +1039,20 @@ msgid ""
 "command> and <command>ar</command> if they aren't already on your current "
 "system, then download and install <command>debootstrap</command>."
 msgstr ""
-"Tiện ích được dùng bởi trình cài đặt &debian;, cũng được thấy là phương pháp chính thức để cài đặt hệ thống cơ bản &debian;, là <command>debootstrap</command>. Nó dùng hai chương trình <command>wget</command> và <command>ar</command>, nhưng về mặt khác thì phụ thuộc chỉ vào "
-"<classname>/bin/sh</classname> và các công cụ UNIX/Linux cơ bản<footnote> <para> "
-"Những công cụ này gồm có các tiện ích lõi của GNU và lệnh như <command>sed</"
-"command>, <command>grep</command>, <command>tar</command> và <command>gzip</"
-"command>. </para> </footnote>. Chưa có thì cài đặt hai gói <command>wget</command> "
-"và <command>ar</command>, sau đó tải về và cài đặt gói <command>debootstrap</command>."
+"Tiện ích được dùng bởi trình cài đặt &debian;, cũng được thấy là phương pháp "
+"chính thức để cài đặt hệ thống cơ bản &debian;, là <command>debootstrap</"
+"command>. Nó dùng hai chương trình <command>wget</command> và <command>ar</"
+"command>, nhưng về mặt khác thì phụ thuộc chỉ vào <classname>/bin/sh</"
+"classname> và các công cụ UNIX/Linux cơ bản<footnote> <para> Những công cụ "
+"này gồm có các tiện ích lõi của GNU và lệnh như <command>sed</command>, "
+"<command>grep</command>, <command>tar</command> và <command>gzip</command>. "
+"</para> </footnote>. Chưa có thì cài đặt hai gói <command>wget</command> và "
+"<command>ar</command>, sau đó tải về và cài đặt gói <command>debootstrap</"
+"command>."
 
-#: random-bits.xml:472
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Or, you can use the following procedure to install it manually. Make a "
-#| "work folder for extracting the .deb into: <informalexample><screen>\n"
-#| "# mkdir work\n"
-#| "# cd work\n"
-#| "</screen></informalexample> The <command>debootstrap</command> binary is "
-#| "located in the Debian archive (be sure to select the proper file for your "
-#| "architecture). Download the <command>debootstrap</command> .deb from the "
-#| "<ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> "
-#| "pool</ulink>, copy the package to the work folder, and extract the files "
-#| "from it. You will need to have root privileges to install the files."
+#: random-bits.xml:479
+#, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
 "folder for extracting the .deb into: <informalexample><screen>\n"
@@ -1091,13 +1070,18 @@ msgstr ""
 "<informalexample><screen>\n"
 "# mkdir work\n"
 "# cd work\n"
-"</screen></informalexample> Tập tin nhị phân <command>debootstrap</command> nằm trong kho &debian; (hãy chắc là bạn chọn tập tin thích hợp với kiến trúc của mình). Tải tập tin dạng .deb <command>debootstrap</command> xuống <ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> vùng gộp</ulink>, sao chép gói đó vào thư mục <filename>work</filename>, sau đó giải nén các tập tin nhị phân ra nó. Bạn cần phải có quyền người chủ để cài đặt các tập "
-"tin nhị phân này."
+"</screen></informalexample> Tập tin nhị phân <command>debootstrap</command> "
+"nằm trong kho &debian; (hãy chắc là bạn chọn tập tin thích hợp với kiến trúc "
+"của mình). Tải tập tin dạng .deb <command>debootstrap</command> xuống <ulink "
+"url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> vùng gộp</"
+"ulink>, sao chép gói đó vào thư mục <filename>work</filename>, sau đó giải "
+"nén các tập tin nhị phân ra nó. Bạn cần phải có quyền người chủ để cài đặt "
+"các tập tin nhị phân này."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: random-bits.xml:487
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:494
+#, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
 "# cd /\n"
@@ -1107,21 +1091,15 @@ msgstr ""
 "# cd /\n"
 "# zcat /đường_dẫn_đầy_đủ_đến_work/work/data.tar.gz | tar xv"
 
-#: random-bits.xml:493
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:500
+#, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Chạy <command>debootstrap</command>"
 
-#: random-bits.xml:494
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "<command>debootstrap</command> can download the needed files directly "
-#| "from the archive when you run it. You can substitute any Debian archive "
-#| "mirror for <userinput>&archive-mirror;/debian</userinput> in the command "
-#| "example below, preferably a mirror close to you network-wise. Mirrors are "
-#| "listed at <ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
+#: random-bits.xml:501
+#, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
 "the archive when you run it. You can substitute any &debian; archive mirror "
@@ -1129,13 +1107,16 @@ msgid ""
 "below, preferably a mirror close to you network-wise. Mirrors are listed at "
 "<ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
 msgstr ""
-"Chạy chương trình <command>debootstrap</command> thì có thể tải các tập tin cần thiết một "
-"cách trực tiếp xuống kho lưu. Có thể thay thế chuỗi <userinput>&archive-mirror;/debian</userinput> (trong mẫu bên dưới) bằng bất cứ máy nhân bản kho lưu &debian; nào, tốt hơn là một máy nhân bản ở gần chỗ bạn trên mạng. Các máy nhân bản được liệt kê ở địa chỉ <ulink url=\"http://www.debian."
-"org/mirror/list\"></ulink>."
+"Chạy chương trình <command>debootstrap</command> thì có thể tải các tập tin "
+"cần thiết một cách trực tiếp xuống kho lưu. Có thể thay thế chuỗi "
+"<userinput>&archive-mirror;/debian</userinput> (trong mẫu bên dưới) bằng bất "
+"cứ máy nhân bản kho lưu &debian; nào, tốt hơn là một máy nhân bản ở gần chỗ "
+"bạn trên mạng. Các máy nhân bản được liệt kê ở địa chỉ <ulink url=\"http://"
+"www.debian.org/mirror/list\"></ulink>."
 
-#: random-bits.xml:503
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:510
+#, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
 "filename>, you could substitute a file URL instead of the http URL: "
@@ -1145,9 +1126,9 @@ msgstr ""
 "cdrom</filename>, bạn có khả năng thay thế địa chỉ URL kiểu HTTP bằng địa "
 "chỉ kiểu tập tin: <userinput>file:/cdrom/debian/</userinput>"
 
-#: random-bits.xml:509
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:516
+#, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
 "<command>debootstrap</command> command: <userinput>alpha</userinput>, "
@@ -1166,9 +1147,9 @@ msgstr ""
 "<userinput>s390</userinput>, <userinput>sparc</userinput>."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: random-bits.xml:528
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:535
+#, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
 "     /mnt/debinst http://ftp.us.debian.org/debian"
@@ -1176,22 +1157,15 @@ msgstr ""
 "# /usr/sbin/debootstrap --arch KIẾN_TRÚC &releasename; \\\n"
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
-#: random-bits.xml:534
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:541
+#, no-c-format
 msgid "Configure The Base System"
 msgstr "Cấu hình hệ thống cơ bản"
 
-#: random-bits.xml:535
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Now you've got a real Debian system, though rather lean, on disk. "
-#| "<command>chroot</command> into it: <informalexample><screen>\n"
-#| "# LANG=C chroot /mnt/debinst /bin/bash\n"
-#| "</screen></informalexample> After chrooting you may need to set the "
-#| "terminal definition to be compatible with the Debian base system, for "
-#| "example:"
+#: random-bits.xml:542
+#, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
 "<command>chroot</command> into it: <informalexample><screen>\n"
@@ -1202,25 +1176,25 @@ msgstr ""
 "Lúc bây giờ bạn có một hệ thống &debian; thật, dù hơi gầy, trên đĩa. Hãy "
 "<command>chroot</command> vào nó : <informalexample><screen>\n"
 "# LANG=C chroot /mnt/debinst /bin/bash\n"
-"</screen></informalexample>Sau khi chroot, bạn có thể cần phải lập một lời định "
-"nghĩa thiết bị cuối tương thích với hệ thống cơ bản &debian;, chẳng hạn:"
+"</screen></informalexample>Sau khi chroot, bạn có thể cần phải lập một lời "
+"định nghĩa thiết bị cuối tương thích với hệ thống cơ bản &debian;, chẳng hạn:"
 
 # Literal: don't translate; Nghĩa chữ : dừng dịch
-#: random-bits.xml:545
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:552
+#, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
-#: random-bits.xml:550
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:557
+#, no-c-format
 msgid "Create device files"
 msgstr "Tạo tập tin thiết bị"
 
-#: random-bits.xml:551
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:558
+#, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
 "files. For the next steps of the installation additional device files may be "
@@ -1238,22 +1212,22 @@ msgstr ""
 "định dùng tập tin thiết bị kiểu động (v.d. dùng <classname>udev</classname>) "
 "hay tĩnh."
 
-#: random-bits.xml:561
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:568
+#, no-c-format
 msgid "A few of the available options are:"
 msgstr "Vài tùy chọn sẵn sàng:"
 
-#: random-bits.xml:566
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:573
+#, no-c-format
 msgid "create a default set of static device files using"
 msgstr "tạo một tập hợp tập tin thiết bị tĩnh mặc định dùng"
 
 # Literal: don't translate/Nghĩa chữ : đừng dịch
-#: random-bits.xml:569
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:576
+#, no-c-format
 msgid ""
 "# cd /dev\n"
 "# MAKEDEV generic"
@@ -1261,18 +1235,18 @@ msgstr ""
 "# cd /dev\n"
 "# MAKEDEV generic"
 
-#: random-bits.xml:572
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:579
+#, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr ""
 "tạo bằng tay chỉ một số tập tin thiết bị dứt khoát dùng <command>MAKEDEV</"
 "command>"
 
-#: random-bits.xml:577
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:584
+#, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
 "note that the postinst scripts of some packages may try to create device "
@@ -1282,56 +1256,15 @@ msgstr ""
 "rằng những văn lệnh sau khi cài đặt của một số gói có thể thử tạo tập tin "
 "thiết bị, vì vậy bạn nên dùng tùy chọn này chỉ một cách cẩn thận."
 
-#: random-bits.xml:590
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:597
+#, no-c-format
 msgid "Mount Partitions"
 msgstr "Gắn kết phân vùng"
 
-#: random-bits.xml:591
-#, no-c-format
-#. Tag: para
-#| msgid ""
-#| "You need to create <filename>/etc/fstab</filename>. "
-#| "<informalexample><screen>\n"
-#| "# editor /etc/fstab\n"
-#| "</screen></informalexample> Here is a sample you can modify to suit: "
-#| "<informalexample><screen>\n"
-#| "# /etc/fstab: static file system information.\n"
-#| "#\n"
-#| "# file system    mount point   type    options                  dump "
-#| "pass\n"
-#| "/dev/XXX         /             ext3    defaults                 0    1\n"
-#| "/dev/XXX         /boot         ext3    ro,nosuid,nodev          0    2\n"
-#| "\n"
-#| "/dev/XXX         none          swap    sw                       0    0\n"
-#| "proc             /proc         proc    defaults                 0    0\n"
-#| "\n"
-#| "/dev/fd0         /media/floppy auto    noauto,rw,sync,user,exec 0    0\n"
-#| "/dev/cdrom       /media/cdrom  iso9660 noauto,ro,user,exec      0    0\n"
-#| "\n"
-#| "/dev/XXX         /tmp          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /var          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /usr          ext3    rw,nodev                 0    2\n"
-#| "/dev/XXX         /home         ext3    rw,nosuid,nodev          0    2\n"
-#| "</screen></informalexample> Use <userinput>mount -a</userinput> to mount "
-#| "all the file systems you have specified in your <filename>/etc/fstab</"
-#| "filename>, or, to mount file systems individually, use: "
-#| "<informalexample><screen>\n"
-#| "# mount /path   # e.g.: mount /usr\n"
-#| "</screen></informalexample> Current Debian systems have mountpoints for "
-#| "removable media under <filename>/media</filename>, but keep compatibility "
-#| "symlinks in <filename>/</filename>. Create these as as needed, for "
-#| "example: <informalexample><screen>\n"
-#| "# cd /media\n"
-#| "# mkdir cdrom0\n"
-#| "# ln -s cdrom0 cdrom\n"
-#| "# cd /\n"
-#| "# ln -s media/cdrom\n"
-#| "</screen></informalexample> You can mount the proc file system multiple "
-#| "times and to arbitrary locations, though <filename>/proc</filename> is "
-#| "customary. If you didn't use <userinput>mount -a</userinput>, be sure to "
-#| "mount proc before continuing:"
+#. Tag: para
+#: random-bits.xml:598
+#, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1398,8 +1331,8 @@ msgstr ""
 "filename>, hoặc để lắp mỗi hệ thống tập tin riêng, dùng: "
 "<informalexample><screen>\n"
 "# mount /đường_dẫn   # v.d.: mount /usr\n"
-"</screen></informalexample>  Các hệ thống &debian; hiện thời có những điểm lắp "
-"cho vật chứa rời dưới <filename>/media</filename>, còn giữ các liên kết "
+"</screen></informalexample>  Các hệ thống &debian; hiện thời có những điểm "
+"lắp cho vật chứa rời dưới <filename>/media</filename>, còn giữ các liên kết "
 "tương trưng để tương thích trong <filename>/</filename>. Hãy tạo chúng như "
 "yêu cầu, chẳng hạn: <informalexample><screen>\n"
 "# cd /media\n"
@@ -1413,15 +1346,15 @@ msgstr ""
 "trước khi tiếp tục."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: random-bits.xml:617
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:624
+#, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
-#: random-bits.xml:619
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:626
+#, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
 "directory. Should this fail, you may be able to mount proc from outside the "
@@ -1432,21 +1365,21 @@ msgstr ""
 "filename> từ bên ngoài chroot đó."
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: random-bits.xml:625
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:632
+#, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
-#: random-bits.xml:631
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:638
+#, no-c-format
 msgid "Setting Timezone"
 msgstr "Đặt múi giờ"
 
-#: random-bits.xml:632
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:639
+#, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
 "whether the system will interpret the hardware clock as being set to UTC or "
@@ -1457,9 +1390,9 @@ msgstr ""
 "hệ thống sẽ giải thích đồng hồ phần cứng như là giờ thế giới (UTC) hay giờ "
 "địa phương. Lệnh sau cho bạn có khả năng đặt nó và chọn múi giờ riêng."
 
-#: random-bits.xml:639
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:646
+#, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
 "# dpkg-reconfigure tzdata"
@@ -1467,15 +1400,15 @@ msgstr ""
 "# editor /etc/default/rcS\n"
 "# dpkg-reconfigure tzdata"
 
-#: random-bits.xml:645
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:652
+#, no-c-format
 msgid "Configure Networking"
 msgstr "Cấu hình khả năng chạy mạng"
 
-#: random-bits.xml:646
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:653
+#, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
 "<filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> "
@@ -1599,15 +1532,15 @@ msgstr ""
 "modules</filename>. Sau đó thì trong khi khởi động, mỗi thẻ sẽ được lắp với "
 "tên giao diện (eth0, eth1, v.v.) mong đợi."
 
-#: random-bits.xml:687
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:694
+#, no-c-format
 msgid "Configure Apt"
 msgstr "Cấu hình Apt"
 
-#: random-bits.xml:688
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:695
+#, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1631,15 +1564,15 @@ msgstr ""
 "</screen></informalexample> Đảm bảo bạn chạy <userinput>aptitude update</"
 "userinput> sau khi thay đổi danh sách các nguồn."
 
-#: random-bits.xml:704
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:711
+#, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Cấu hình miền địa phương và bàn phím"
 
-#: random-bits.xml:705
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:712
+#, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
 "install the <classname>locales</classname> support package and configure it. "
@@ -1657,9 +1590,9 @@ msgstr ""
 "</screen></informalexample> Để cấu hình bàn phím (nếu cần):"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: random-bits.xml:715
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:722
+#, no-c-format
 msgid ""
 "# aptitude install console-data\n"
 "# dpkg-reconfigure console-data"
@@ -1667,9 +1600,9 @@ msgstr ""
 "# aptitude install console-data\n"
 "# dpkg-reconfigure console-data"
 
-#: random-bits.xml:717
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:724
+#, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
 "configured for the next reboot."
@@ -1677,15 +1610,15 @@ msgstr ""
 "Ghi chú rằng bàn phím không thể được đặt trong khi nằm trong chroot, nhưng "
 "sẽ được cấu hình cho lần khởi động lại kế tiếp."
 
-#: random-bits.xml:727
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:734
+#, no-c-format
 msgid "Install a Kernel"
 msgstr "Cài đặt hạt nhân"
 
-#: random-bits.xml:728
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:735
+#, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
 "and a boot loader. Identify available pre-packaged kernels with:"
@@ -1694,41 +1627,37 @@ msgstr ""
 "(kernel) &arch-kernel; và một bộ nạp khởi động (boot loader). Có thể nhận "
 "diện các hạt nhân đóng gói sẵn bằng lệnh:"
 
-#: random-bits.xml:733
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:740
+#, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
-#: random-bits.xml:735
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:742
+#, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "Sau đó cài đặt gói hạt nhân đã chọn, dùng tên gói của nó."
 
-#: random-bits.xml:739
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:746
+#, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
 "replaceable>"
-msgstr "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-kiến_trúc-v.v.</"
-"replaceable>"
+msgstr ""
+"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-kiến_trúc-v."
+"v.</replaceable>"
 
-#: random-bits.xml:745
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:752
+#, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Thiết lập bộ nạp khởi động"
 
-#: random-bits.xml:746
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "To make your &debian-gnu; system bootable, set up your boot loader to "
-#| "load the installed kernel with your new root partition. Note that "
-#| "<command>debootstrap</command> does not install a boot loader, though you "
-#| "can use <command>aptitude</command> inside your Debian chroot to do so."
+#: random-bits.xml:753
+#, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
 "the installed kernel with your new root partition. Note that "
@@ -1741,18 +1670,9 @@ msgstr ""
 "có thể sử dụng chương trình <userinput>aptitude</userinput> bên trong chroot "
 "&debian; để làm như thế."
 
-#: random-bits.xml:753
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
-#| "userinput> for instructions on setting up the bootloader. If you are "
-#| "keeping the system you used to install Debian, just add an entry for the "
-#| "Debian install to your existing grub <filename>menu.lst</filename> or "
-#| "<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
-#| "could also copy it to the new system and edit it there. After you are "
-#| "done editing, call <command>lilo</command> (remember it will use "
-#| "<filename>lilo.conf</filename> relative to the system you call it from)."
+#: random-bits.xml:760
+#, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
 "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
@@ -1765,12 +1685,19 @@ msgid ""
 "relative to the system you call it from)</phrase>."
 msgstr ""
 "Chạy câu lệnh <userinput>info grub</userinput> <phrase arch=\"x86\">hay "
-"<userinput>man lilo.conf</userinput></phrase> để tìm hướng dẫn về cách thiết lập bộ nạp khởi động. Nếu bạn muốn giữ lại hệ thống được dùng để cài đặt &debian;, chỉ cần thêm một mục nhập cho bản cài đặt &debian; vào tập tin <filename>menu.lst</filename><phrase arch=\"x86\">hay <filename>lilo.conf</"
-"filename> tồn tại của grub. Đối với <filename>lilo.conf</filename>, bạn cũng có thể sao chép nó vào hệ thống mới và chỉnh sửa nó ở đó. Hoàn tất chỉnh sửa thì gọi <command>lilo</command> (ghi nhớ rằng nó dùng tập tin cấu hình <filename>lilo.conf</filename> tương đối với hệ thống từ đó bạn gói nó)</phrase>."
+"<userinput>man lilo.conf</userinput></phrase> để tìm hướng dẫn về cách thiết "
+"lập bộ nạp khởi động. Nếu bạn muốn giữ lại hệ thống được dùng để cài đặt "
+"&debian;, chỉ cần thêm một mục nhập cho bản cài đặt &debian; vào tập tin "
+"<filename>menu.lst</filename><phrase arch=\"x86\">hay <filename>lilo.conf</"
+"filename> tồn tại của grub. Đối với <filename>lilo.conf</filename>, bạn cũng "
+"có thể sao chép nó vào hệ thống mới và chỉnh sửa nó ở đó. Hoàn tất chỉnh sửa "
+"thì gọi <command>lilo</command> (ghi nhớ rằng nó dùng tập tin cấu hình "
+"<filename>lilo.conf</filename> tương đối với hệ thống từ đó bạn gói nó)</"
+"phrase>."
 
-#: random-bits.xml:765
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:772
+#, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
 "<informalexample><screen>\n"
@@ -1792,9 +1719,9 @@ msgstr ""
 "sẽ tạo một tập tin <filename>/boot/grub/menu.lst</filename> hợp lý và hoạt "
 "động được."
 
-#: random-bits.xml:775
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:782
+#, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
 "been created. There are alternative methods to install <command>grub</"
@@ -1804,16 +1731,16 @@ msgstr ""
 "được tạo. Có một số phương pháp xen kẽ để cài đặt <command>grub</command>, "
 "nhưng chúng nằm bên ngoại phạm vi của phụ lục này."
 
-#: random-bits.xml:781
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:788
+#, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Ở đây có mẫu <filename>/etc/lilo.conf</filename> cơ bản:"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: random-bits.xml:785
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:792
+#, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
 "root=/dev/<replaceable>hda6</replaceable>\n"
@@ -1833,17 +1760,9 @@ msgstr ""
 "initrd=/initrd.img\n"
 "label=Debian"
 
-#: random-bits.xml:787
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
-#| "up the bootloader. If you are keeping the system you used to install "
-#| "Debian, just add an entry for the Debian install to your existing "
-#| "<filename>yaboot.conf</filename>. You could also copy it to the new "
-#| "system and edit it there. After you are done editing, call ybin (remember "
-#| "it will use <filename>yaboot.conf</filename> relative to the system you "
-#| "call it from)."
+#: random-bits.xml:794
+#, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
 "the bootloader. If you are keeping the system you used to install &debian;, "
@@ -1852,11 +1771,17 @@ msgid ""
 "After you are done editing, call ybin (remember it will use <filename>yaboot."
 "conf</filename> relative to the system you call it from)."
 msgstr ""
-"Chạy câu lệnh <userinput>man yaboot.conf</userinput> để xem hướng dẫn về cách thiết lập bộ nạp khởi động. Nếu bạn giữ lại hệ thống được dùng để cài đặt &debian;, chỉ cần thêm một mục nhập cho bản cài đặt &debian; vào tập tin cấu hình <filename>yaboot.conf</filename> đã có. Bạn cũng có thể sao chép nó vào hệ thống mới và chỉnh sửa nó tại đó. Hoàn tất chỉnh sửa thì gọi <command>ybin</command> (ghi nhớ rằng nó dùng tập tin cấu hình <filename>yaboot.conf</filename> tương đối với hệ thống từ đó bạn gọi nó)."
+"Chạy câu lệnh <userinput>man yaboot.conf</userinput> để xem hướng dẫn về "
+"cách thiết lập bộ nạp khởi động. Nếu bạn giữ lại hệ thống được dùng để cài "
+"đặt &debian;, chỉ cần thêm một mục nhập cho bản cài đặt &debian; vào tập tin "
+"cấu hình <filename>yaboot.conf</filename> đã có. Bạn cũng có thể sao chép nó "
+"vào hệ thống mới và chỉnh sửa nó tại đó. Hoàn tất chỉnh sửa thì gọi "
+"<command>ybin</command> (ghi nhớ rằng nó dùng tập tin cấu hình "
+"<filename>yaboot.conf</filename> tương đối với hệ thống từ đó bạn gọi nó)."
 
-#: random-bits.xml:797
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:804
+#, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
 "<informalexample><screen>\n"
@@ -1888,15 +1813,15 @@ msgstr ""
 "Trên một số máy riêng, có lẽ bạn cần phải sử dụng <userinput>ide0:</"
 "userinput> thay cho <userinput>hd:</userinput>."
 
-#: random-bits.xml:810
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:817
+#, no-c-format
 msgid "Finishing touches"
 msgstr "Đòn kết liễu"
 
-#: random-bits.xml:811
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:818
+#, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
 "like to make the system a bit more mature, there is an easy method to "
@@ -1913,9 +1838,9 @@ msgstr ""
 "</screen></informalexample> Tất nhiên, bạn cũng có khả năng sử dụng "
 "<command>aptitude</command> để cài đặt mỗi gói riêng."
 
-#: random-bits.xml:822
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:829
+#, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
 "<filename>/var/cache/apt/archives/</filename>. You can free up some "
@@ -1925,27 +1850,21 @@ msgstr ""
 "<filename>/var/cache/apt/archives/</filename>. Vậy bạn có dịp giải phóng "
 "thêm chỗ trống trên đĩa bằng cách chạy lệnh « làm sạch »: "
 
-#: random-bits.xml:828
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:835
+#, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
-#: random-bits.xml:839
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:846
+#, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "Cài đặt &debian-gnu; qua IP đường song song (PLIP)"
 
-#: random-bits.xml:841
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "This section explains how to install &debian-gnu; on a computer without "
-#| "an Ethernet card, but with just a remote gateway computer attached via a "
-#| "Null-Modem cable (also called Null-Printer cable). The gateway computer "
-#| "should be connected to a network that has a Debian mirror on it (e.g. to "
-#| "the Internet)."
+#: random-bits.xml:848
+#, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
 "Ethernet card, but with just a remote gateway computer attached via a Null-"
@@ -1955,13 +1874,13 @@ msgid ""
 msgstr ""
 "Phần này diễn tả phương pháp cài đặt &debian-gnu; vào máy tính không có thẻ "
 "Ethernet, chỉ có máy tính cổng ra từ xa được gắn nối bằng cáp Null-Modem (bộ "
-"điều giải không có, cũng được gọi như là cáp Null-Printer, máy in không có). Máy "
-"tính cổng ra nên được kết nối đến một mạng chứa máy nhân bản &debian; (v.d. có kết "
-"nối đến Internet)."
+"điều giải không có, cũng được gọi như là cáp Null-Printer, máy in không có). "
+"Máy tính cổng ra nên được kết nối đến một mạng chứa máy nhân bản &debian; (v."
+"d. có kết nối đến Internet)."
 
-#: random-bits.xml:849
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:856
+#, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
 "gateway connected to the Internet over a dial-up connection (ppp0). We will "
@@ -1970,15 +1889,15 @@ msgid ""
 "unused within your network address space)."
 msgstr ""
 "Mẫu trong phụ lục này sẽ hiển thị phương pháp thiết lập sự kết nối PLIP, "
-"dùng cổng ra được kết nối đến Internet qua sự kết nối quay số (ppp0). Nó sẽ dùng "
-"địa chỉ IP <userinput>192.168.0.1</userinput> và <userinput>192.168.0.2</"
-"userinput> cho hai giao diện PLIP trên hệ thống đích và hệ thống nguồn riêng "
-"từng cái (những địa chỉ này nên là không dùng bên trong miền địa chỉ của "
-"mạng của bạn)."
+"dùng cổng ra được kết nối đến Internet qua sự kết nối quay số (ppp0). Nó sẽ "
+"dùng địa chỉ IP <userinput>192.168.0.1</userinput> và "
+"<userinput>192.168.0.2</userinput> cho hai giao diện PLIP trên hệ thống đích "
+"và hệ thống nguồn riêng từng cái (những địa chỉ này nên là không dùng bên "
+"trong miền địa chỉ của mạng của bạn)."
 
-#: random-bits.xml:857
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:864
+#, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
 "after the reboot into the installed system (see <xref linkend=\"boot-new\"/"
@@ -1987,9 +1906,9 @@ msgstr ""
 "Sự kết nối PLIP được thiết lập trong khi cài đặt sẽ cũng sẵn sàng sau khi "
 "khởi động lại vào hệ thống đã cài đặt (xem <xref linkend=\"boot-new\"/>)."
 
-#: random-bits.xml:862
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:869
+#, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
 "address and IRQ) for the parallel ports of both the source and target "
@@ -2000,18 +1919,15 @@ msgstr ""
 "để tìm cổng song song của hệ thống cả đích lẫn nguồn. Giá trị thường nhất là "
 "<literal>io=0x378</literal>, <literal>irq=7</literal>."
 
-#: random-bits.xml:872
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:879
+#, no-c-format
 msgid "Requirements"
 msgstr "Nhu cầu"
 
-#: random-bits.xml:875
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "A target computer, called <emphasis>target</emphasis>, where Debian will "
-#| "be installed."
+#: random-bits.xml:882
+#, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
 "be installed."
@@ -2019,16 +1935,17 @@ msgstr ""
 "Máy tính đích, được gọi như là <emphasis>target</emphasis> (đích), vào đó "
 "&debian; sẽ được cài đặt."
 
-#: random-bits.xml:881
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:888
+#, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
-"Vật chứa phần mềm cài đặt hệ thống; xem <xref linkend=\"installation-media\"/>."
+"Vật chứa phần mềm cài đặt hệ thống; xem <xref linkend=\"installation-media\"/"
+">."
 
-#: random-bits.xml:886
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:893
+#, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
 "emphasis>, that will function as the gateway."
@@ -2036,9 +1953,9 @@ msgstr ""
 "Máy tính khác được kết nối đến Internet, được gọi như là <emphasis>source</"
 "emphasis> (nguồn), mà sẽ hoạt động là cổng ra."
 
-#: random-bits.xml:892
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:899
+#, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
 "\">PLIP-Install-HOWTO</ulink> for more information on this cable and "
@@ -2048,15 +1965,15 @@ msgstr ""
 "\"&url-plip-install-howto;\">PLIP-Install-HOWTO</ulink> để tìm thông tin "
 "thêm về cáp kiểu này, gồm hướng dẫn về cách tạo điều riêng."
 
-#: random-bits.xml:904
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:911
+#, no-c-format
 msgid "Setting up source"
 msgstr "Thiết lập nguồn"
 
-#: random-bits.xml:905
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:912
+#, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
 "source computer as a gateway to the Internet using ppp0."
@@ -2064,9 +1981,9 @@ msgstr ""
 "Theo đây có một tập lệnh trình bao là mẫu đơn giản về phương pháp cấu hình "
 "máy tính nguồn như là cổng ra Internet dùng ppp0."
 
-#: random-bits.xml:910
-#, no-c-format
 #. Tag: screen
+#: random-bits.xml:917
+#, no-c-format
 msgid ""
 "#!/bin/sh\n"
 "\n"
@@ -2106,15 +2023,15 @@ msgstr ""
 "MASQUERADE\n"
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
-#: random-bits.xml:916
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:923
+#, no-c-format
 msgid "Installing target"
 msgstr "Cài đặt đích"
 
-#: random-bits.xml:917
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:924
+#, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
 "mode; enter <userinput>expert</userinput> at the boot prompt. If you need to "
@@ -2139,15 +2056,15 @@ msgstr ""
 "</screen></informalexample>Bên dưới có những trả lời cần nhập trong những "
 "giai đoạn khác nhau của tiến trình cài đặt."
 
-#: random-bits.xml:936
-#, no-c-format
 #. Tag: guimenuitem
+#: random-bits.xml:943
+#, no-c-format
 msgid "Load installer components from CD"
 msgstr "Tải các thành phần cài đặt từ đĩa CD"
 
-#: random-bits.xml:938
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:945
+#, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
 "will make the PLIP drivers available to the installation system."
@@ -2155,15 +2072,15 @@ msgstr ""
 "Chọn mục <userinput>plip-modules</userinput> trong danh sách: nó sẽ làm cho "
 "các trình điều khiển PLIP sẵn sàng cho hệ thống cài đặt."
 
-#: random-bits.xml:946
-#, no-c-format
 #. Tag: guimenuitem
+#: random-bits.xml:953
+#, no-c-format
 msgid "Detect network hardware"
 msgstr "Phát hiện phần cứng mạng"
 
-#: random-bits.xml:951
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:958
+#, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
 "modules for detected cards will be shown. If you want to force &d-i; to use "
@@ -2176,9 +2093,9 @@ msgstr ""
 "đun trình điều khiển đã liệt kê. Tất nhiên, nếu máy đích không có thẻ mạng, "
 "trình cài đặt sẽ không hiển thị danh sách này."
 
-#: random-bits.xml:960
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:967
+#, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
 "ask you to select a network driver module from a list. Select the "
@@ -2187,29 +2104,29 @@ msgstr ""
 "Vì chưa phát hiện thẻ mạng, trình cài đặt sẽ nhắc bạn chọn trình điều khiển "
 "mạng trong danh sách. Hãy chọn mô-đun <userinput>plip</userinput>."
 
-#: random-bits.xml:972
-#, no-c-format
 #. Tag: guimenuitem
+#: random-bits.xml:979
+#, no-c-format
 msgid "Configure the network"
 msgstr "Cấu hình mạng"
 
-#: random-bits.xml:975
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:982
+#, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Tự động cấu hình mạng bằng DHCP không? : Không"
 
-#: random-bits.xml:980
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:987
+#, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 msgstr ""
 "Địa chỉ IP: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
-#: random-bits.xml:985
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:992
+#, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
 "userinput>"
@@ -2217,9 +2134,9 @@ msgstr ""
 "Địa chỉ điểm-đến-điểm: <userinput><replaceable>192.168.0.2</replaceable></"
 "userinput>"
 
-#: random-bits.xml:991
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:998
+#, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
 "<filename>/etc/resolv.conf</filename>)"
@@ -2228,15 +2145,15 @@ msgstr ""
 "được dùng trên máy tính nguồn (xem tập tin cấu hình <filename>/etc/resolv."
 "conf</filename>)"
 
-#: random-bits.xml:1010
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:1017
+#, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "Cài đặt &debian-gnu; dùng PPP qua Ethernet (PPPoE)"
 
-#: random-bits.xml:1012
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1019
+#, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
 "broadband (ADSL or cable) connections to an Internet Service Provider. "
@@ -2250,9 +2167,9 @@ msgstr ""
 "theo mặc định trong trình cài đặt, nhưng dễ làm cho hoạt động. Phần này diễn "
 "tả phương pháp."
 
-#: random-bits.xml:1020
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1027
+#, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
 "after the reboot into the installed system (see <xref linkend=\"boot-new\"/"
@@ -2261,9 +2178,9 @@ msgstr ""
 "Sự kết nối PPPoE được thiết lập trong khi cài đặt sẽ cũng sẵn sàng sau khi "
 "khởi động lại vào hệ thống đã cài đặt (xem <xref linkend=\"boot-new\"/>)."
 
-#: random-bits.xml:1025
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1032
+#, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
 "you will need to install using one of the CD-ROM/DVD images that are "
@@ -2275,9 +2192,9 @@ msgstr ""
 "cho phương pháp cài đặt khác (v.d. khởi động qua mạng <phrase condition="
 "\"supports-floppy-boot\"> hay đĩa mềm</phrase>)."
 
-#: random-bits.xml:1032
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1039
+#, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
 "following steps explain the differences."
@@ -2285,9 +2202,9 @@ msgstr ""
 "Cài đặt qua PPPoE phần lớn là tương tự với các tiến trình cài đặt khác. "
 "Những bước sau diễn tả các sự khác."
 
-#: random-bits.xml:1040
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1047
+#, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
 "userinput><footnote arch=\"x86\"> <para> See <xref linkend=\"boot-screen\"/> "
@@ -2301,9 +2218,9 @@ msgstr ""
 "footnote>. Tham số này sẽ đảm bảo tự động nạp và chạy thành phần cần thiết "
 "để thiết lập PPPoE (<classname>ppp-udeb</classname>)."
 
-#: random-bits.xml:1055
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1062
+#, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
 "keyboard selection; the loading of additional installer components<footnote> "
@@ -2321,9 +2238,9 @@ msgstr ""
 "vào nhập tham số <quote>modules</quote> tại dấu nhắc khởi động. </para> </"
 "footnote>)."
 
-#: random-bits.xml:1074
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1081
+#, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
 "Ethernet cards present in the system."
@@ -2331,9 +2248,9 @@ msgstr ""
 "Bước tiếp theo là phát hiện phần cứng chạy mạng, để nhận diện bo mạch "
 "Ethernet có trong hệ thống."
 
-#: random-bits.xml:1080
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1087
+#, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
 "all the detected Ethernet interfaces in an attempt to find a PPPoE "
@@ -2343,9 +2260,9 @@ msgstr ""
 "thăm dò tất cả các giao diện Ethernet đã phát hiện để thử tìm bộ tập trung "
 "PPPoE (một kiểu trình phục vụ mà quản lý các kết nối PPPoE)."
 
-#: random-bits.xml:1086
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1093
+#, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
 "attempt. This can happen occasionally on slow or loaded networks or with "
@@ -2359,9 +2276,9 @@ msgstr ""
 "trung sẽ chạy thành công; để thử lại, chọn mục <guimenuitem>Cấu hình và khởi "
 "chạy một kết nối PPPoE</guimenuitem> trong trình đơn chính của trình cài đặt."
 
-#: random-bits.xml:1095
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1102
+#, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
 "information (the PPPoE username and password)."
@@ -2369,9 +2286,9 @@ msgstr ""
 "Một khi tìm bộ tập trung, người dùng sẽ được nhắc gõ thông tin đăng nhập "
 "(tên người dùng và mật khẩu PPPoE)."
 
-#: random-bits.xml:1101
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1108
+#, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
 "the PPPoE connection. If the correct information was provided, the PPPoE "
@@ -2389,15 +2306,15 @@ msgstr ""
 "chọn mục trình đơn <guimenuitem>Cấu hình và khởi chạy một kết nối PPPoE</"
 "guimenuitem>."
 
-#: random-bits.xml:1121
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:1128
+#, no-c-format
 msgid "The Graphical Installer"
 msgstr "Bộ cài đặt đồ họa"
 
-#: random-bits.xml:1122
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1129
+#, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
 "number of architectures, including &arch-title;. The functionality of the "
@@ -2408,9 +2325,9 @@ msgstr ""
 "chế, gồm &arch-title;. Bộ cài đặt đồ họa thật có cùng chức năng với bộ cài "
 "đặt chuẩn, vì nó sử dụng cùng những chương trình thông qua giao diện khác."
 
-#: random-bits.xml:1130
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1137
+#, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
 "few significant advantages. The main advantage is that it supports more "
@@ -2426,9 +2343,9 @@ msgstr ""
 "năng sử dụng con chuột, và trong một số trường hợp riêng, vài câu hỏi có thể "
 "được hiển thị trên cùng một màn hình."
 
-#: random-bits.xml:1139
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1146
+#, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
 "media installation method. To boot the graphical installer simply select the "
@@ -2449,16 +2366,9 @@ msgstr ""
 "động mà hiển thị sau khi bật tùy chọn <quote>Trợ giúp</quote> trong trình "
 "đơn khởi động."
 
-#: random-bits.xml:1150
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "There is also a graphical installer image that can be netbooted. And "
-#| "there is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso"
-#| "\"> <para> The mini ISO image can be downloaded from a Debian mirror as "
-#| "described in <xref linkend=\"downloading-files\"/>. Look for "
-#| "<filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is "
-#| "mainly useful for testing."
+#: random-bits.xml:1157
+#, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
 "is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso\"> "
@@ -2470,21 +2380,13 @@ msgstr ""
 "Cũng có một tập tin ảnh cài đặt đồ họa có thể được khởi động từ mạng. Hơn "
 "nữa, có một tập tin ảnh ISO <quote>nhỏ</quote> đặc biệt<footnote id=\"gtk-"
 "miniiso\"> <para>Tập tin ảnh ISO nhỏ có thể được tải xuống một máy nhân bản "
-"&debian; như được diễn tả trong <xref linkend=\"downloading-files\"/>. "
-"Tìm tên tập tin <filename>netboot/gtk/mini.iso</filename>. </para> </"
-"footnote>, mà chính có ích để thử."
+"&debian; như được diễn tả trong <xref linkend=\"downloading-files\"/>. Tìm "
+"tên tập tin <filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, "
+"mà chính có ích để thử."
 
-#: random-bits.xml:1163
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
-#| "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
-#| "can be downloaded from a Debian mirror as described in <xref linkend="
-#| "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</"
-#| "filename>. </para> </footnote>. It should work on almost all PowerPC "
-#| "systems that have an ATI graphical card, but is unlikely to work on other "
-#| "systems."
+#: random-bits.xml:1170
+#, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
 "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
@@ -2501,9 +2403,9 @@ msgstr ""
 "thống PowerPC có bo mạch đồ họa kiểu ATI, nhưng rất có thể sẽ không hoạt "
 "động được trên hệ thống khác."
 
-#: random-bits.xml:1177
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1184
+#, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
 "when starting the graphical installer."
@@ -2511,9 +2413,9 @@ msgstr ""
 "Đúng như dùng trình cài đặt thông thường, có thể thêm tham số khởi động khi "
 "khởi chạy trình cài đặt đồ họa."
 
-#: random-bits.xml:1183
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1190
+#, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
 "regular installer: &minimum-memory-gtk;. If insufficient memory is "
@@ -2524,9 +2426,9 @@ msgstr ""
 "&minimum-memory-gtk;. Không đủ bộ nhớ thì nó tự động sẽ dùng lại giao diện "
 "<quote>newt</quote>."
 
-#: random-bits.xml:1190
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1197
+#, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
 "graphical installer may fail to boot at all while booting the regular "
@@ -2537,15 +2439,15 @@ msgstr ""
 "có thể không khởi động được, còn trình cài đặt văn bản có phải. Vì thế máy "
 "có ít bộ nhớ sẵn sàng nên dùng trình cài đặt văn bản."
 
-#: random-bits.xml:1200
-#, no-c-format
 #. Tag: title
+#: random-bits.xml:1207
+#, no-c-format
 msgid "Using the graphical installer"
 msgstr "Sử dụng bộ cài đặt đồ họa"
 
-#: random-bits.xml:1201
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1208
+#, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
 "the regular installer and thus the rest of this manual can be used to guide "
@@ -2555,9 +2457,9 @@ msgstr ""
 "còn lại của sổ tay này có thể được dùng để hướng dẫn bạn qua tiến trình cài "
 "đặt."
 
-#: random-bits.xml:1207
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1214
+#, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
 "need to know. To expand a collapsed list (used for example for the selection "
@@ -2575,9 +2477,9 @@ msgstr ""
 "chọn mục thích hợp; bấm phím &enterkey; sẽ chọn/bỏ chọn, không phải kích "
 "hoạt &BTN-CONT;."
 
-#: random-bits.xml:1217
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1224
+#, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
 "guibutton> button will be displayed. The help information can be accessed "
@@ -2588,9 +2490,9 @@ msgstr ""
 "hoặc bằng cách bấm cái nút đó, hoặc bằng cách bấm phím chức năng <keycap>F1</"
 "keycap>."
 
-#: random-bits.xml:1223
-#, no-c-format
 #. Tag: para
+#: random-bits.xml:1230
+#, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
 "keycap> key, just as with the X Window System. For example, to switch to VT2 "
diff --git a/po/vi/using-d-i.po b/po/vi/using-d-i.po
index cb715b1f7..f34ccab4c 100644
--- a/po/vi/using-d-i.po
+++ b/po/vi/using-d-i.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-23 17:28+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,28 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: using-d-i.xml:5
 #, no-c-format
-#. Tag: title
-#| msgid "Using the Debian Installer"
 msgid "Using the &debian; Installer"
 msgstr "Sử dụng trình cài đặt &debian;"
 
+#. Tag: title
 #: using-d-i.xml:7
 #, no-c-format
-#. Tag: title
 msgid "How the Installer Works"
 msgstr "Trình cài đặt hoạt động như thế nào"
 
+#. Tag: para
 #: using-d-i.xml:8
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The Debian Installer consists of a number of special-purpose components "
-#| "to perform each installation task. Each component performs its task, "
-#| "asking the user questions as necessary to do its job. The questions "
-#| "themselves are given priorities, and the priority of questions to be "
-#| "asked is set when the installer is started."
 msgid ""
 "The &debian; Installer consists of a number of special-purpose components to "
 "perform each installation task. Each component performs its task, asking the "
@@ -46,14 +39,14 @@ msgid ""
 "given priorities, and the priority of questions to be asked is set when the "
 "installer is started."
 msgstr ""
-"Trình cài đặt &debian; là bao gồm một số thành phần nhằm mục đích đặc biệt, để "
-"thực hiện mỗi công việc cài đặt. Mỗi thành phần thi hành tác vụ riêng của "
+"Trình cài đặt &debian; là bao gồm một số thành phần nhằm mục đích đặc biệt, "
+"để thực hiện mỗi công việc cài đặt. Mỗi thành phần thi hành tác vụ riêng của "
 "nó, hỏi người dùng những câu cần thiết. Mỗi câu hỏi được gán ưu tiên, còn ưu "
 "tiên các câu cần hỏi có được đặt vào lúc khởi chạy trình cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:16
 #, no-c-format
-#. Tag: para
 msgid ""
 "When a default installation is performed, only essential (high priority) "
 "questions will be asked. This results in a highly automated installation "
@@ -68,9 +61,9 @@ msgstr ""
 "phụ thuộc chính vào phương pháp cài đặt được dùng, cũng vào phần cứng riêng "
 "của bạn. Trình cài đặt sẽ dùng giá trị mặc định cho mỗi câu chưa hỏi."
 
+#. Tag: para
 #: using-d-i.xml:25
 #, no-c-format
-#. Tag: para
 msgid ""
 "If there is a problem, the user will see an error screen, and the installer "
 "menu may be shown in order to select some alternative action. If there are "
@@ -84,9 +77,9 @@ msgstr ""
 "câu hỏi về mỗi thành phần lần lượt. Thông báo lỗi nghiêm trọng có ưu tiên "
 "<quote>tới hạn</quote> thì người dùng sẽ luôn luôn xem."
 
+#. Tag: para
 #: using-d-i.xml:34
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some of the defaults that the installer uses can be influenced by passing "
 "boot arguments when &d-i; is started. If, for example, you wish to force "
@@ -101,9 +94,9 @@ msgstr ""
 "userinput> (tắt DHCP=đúng). Xem <xref linkend=\"installer-args\"/> để tìm "
 "các tùy chọn có sẵn."
 
+#. Tag: para
 #: using-d-i.xml:42
 #, no-c-format
-#. Tag: para
 msgid ""
 "Power users may be more comfortable with a menu-driven interface, where each "
 "step is controlled by the user rather than the installer performing each "
@@ -116,9 +109,9 @@ msgstr ""
 "bằng trình đơn, bạn hãy thêm đối số khởi động <userinput>priority=medium</"
 "userinput> (ưu tiên=vừa)."
 
+#. Tag: para
 #: using-d-i.xml:50
 #, no-c-format
-#. Tag: para
 msgid ""
 "If your hardware requires you to pass options to kernel modules as they are "
 "installed, you will need to start the installer in <quote>expert</quote> "
@@ -134,9 +127,9 @@ msgstr ""
 "<userinput>priority=low</userinput> (ưu tiên=thấp). Chế độ nhà chuyên môn "
 "cho bạn khả năng điều khiển đầy đủ &d-i;."
 
+#. Tag: para
 #: using-d-i.xml:59
 #, no-c-format
-#. Tag: para
 msgid ""
 "For this architecture the &d-i; supports two different user interfaces: a "
 "character-based one and a graphical one. The character-based interface is "
@@ -150,9 +143,9 @@ msgstr ""
 "quote> trong trình đơn khởi động đầu tiên. Để tìm thêm thông tin về trình "
 "cài đặt kiểu đồ họa, xem <xref linkend=\"graphical\"/>."
 
+#. Tag: para
 #: using-d-i.xml:67
 #, no-c-format
-#. Tag: para
 msgid ""
 "For this architecture the installer uses a character-based user interface. A "
 "graphical user interface is currently not available."
@@ -160,9 +153,9 @@ msgstr ""
 "Đối với kiến trúc này, trình cài đặt sử dụng một giao diện dựa vào ký tự. "
 "Hiện thời không có sẵn sàng một giao diện kiểu đồ họa."
 
+#. Tag: para
 #: using-d-i.xml:72
 #, no-c-format
-#. Tag: para
 msgid ""
 "In the character-based environment the use of a mouse is not supported. Here "
 "are the keys you can use to navigate within the various dialogs. The "
@@ -194,9 +187,9 @@ msgstr ""
 "listitem><listitem><para><keycap>phím dài</keycap> chọn mỗi mục như hộp "
 "chọn: &enterkey; sẽ kích hoạt lựa chọn đó</para></listitem>  </itemizedlist> "
 
+#. Tag: para
 #: using-d-i.xml:89
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some dialogs may offer additional help information. If help is available "
 "this will be indicated on the bottom line of the screen by displaying that "
@@ -207,9 +200,9 @@ msgstr ""
 "hoặc bằng cách bấm cái nút đó, hoặc bằng cách bấm phím chức năng <keycap>F1</"
 "keycap>."
 
+#. Tag: para
 #: using-d-i.xml:95
 #, no-c-format
-#. Tag: para
 msgid ""
 "S/390 does not support virtual consoles. You may open a second and third ssh "
 "session to view the logs described below."
@@ -217,9 +210,9 @@ msgstr ""
 "Máy kiểu S/390 không hỗ trợ bàn giao tiếp ảo. Bạn có khả năng mở phiên chạy "
 "SSH thứ hai và thứ ba để xem những bản ghi được diễn tả bên dưới."
 
+#. Tag: para
 #: using-d-i.xml:100
 #, no-c-format
-#. Tag: para
 msgid ""
 "Error messages and logs are redirected to the fourth console. You can access "
 "this console by pressing <keycombo><keycap>Left Alt</keycap><keycap>F4</"
@@ -235,9 +228,9 @@ msgstr ""
 "keycap>); còn có thể trở về tiến trình cài đặt chính bằng tổ hợp phím "
 "<keycombo><keycap>Alt trái</keycap><keycap>F1</keycap></keycombo>."
 
+#. Tag: para
 #: using-d-i.xml:110
 #, no-c-format
-#. Tag: para
 msgid ""
 "These messages can also be found in <filename>/var/log/syslog</filename>. "
 "After installation, this log is copied to <filename>/var/log/installer/"
@@ -253,15 +246,15 @@ msgstr ""
 "trong khi cài đặt, rồi trong thư mục <filename>/var/log/installer/</"
 "filename> sau khi máy tính đã khởi động vào hệ thống mới cài đặt."
 
+#. Tag: title
 #: using-d-i.xml:124
 #, no-c-format
-#. Tag: title
 msgid "Components Introduction"
 msgstr "Giới thiệu về thành phần"
 
+#. Tag: para
 #: using-d-i.xml:125
 #, no-c-format
-#. Tag: para
 msgid ""
 "Here is a list of installer components with a brief description of each "
 "component's purpose. Details you might need to know about using a particular "
@@ -272,15 +265,15 @@ msgstr ""
 "linkend=\"module-details\"/>."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:136
 #, no-c-format
-#. Tag: term
 msgid "main-menu"
 msgstr "main-menu"
 
+#. Tag: para
 #: using-d-i.xml:136
 #, no-c-format
-#. Tag: para
 msgid ""
 "Shows the list of components to the user during installer operation, and "
 "starts a component when it is selected. Main-menu's questions are set to "
@@ -298,9 +291,9 @@ msgstr ""
 "của câu hỏi có thể được hạ cấp tạm thời để cho bạn khả năng giải quyết vấn "
 "đề: trong trường hợp đó, trình đơn có thể xuất hiện."
 
+#. Tag: para
 #: using-d-i.xml:146
 #, no-c-format
-#. Tag: para
 msgid ""
 "You can get to the main menu by selecting the &BTN-GOBACK; button repeatedly "
 "to back all the way out of the currently running component."
@@ -309,15 +302,15 @@ msgstr ""
 "lần để lùi lại hoàn toàn khỏi thành phần đang chạy."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:155
 #, no-c-format
-#. Tag: term
 msgid "localechooser"
 msgstr "localechooser"
 
+#. Tag: para
 #: using-d-i.xml:155
 #, no-c-format
-#. Tag: para
 msgid ""
 "Allows the user to select localization options for the installation and the "
 "installed system: language, country and locales. The installer will display "
@@ -331,15 +324,15 @@ msgstr ""
 "thông điệp riêng vẫn còn có thể được hiển thị bằng tiếng Anh."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:167
 #, no-c-format
-#. Tag: term
 msgid "kbd-chooser"
 msgstr "kbd-chooser"
 
+#. Tag: para
 #: using-d-i.xml:167
 #, no-c-format
-#. Tag: para
 msgid ""
 "Shows a list of keyboards, from which the user chooses the model which "
 "matches his own."
@@ -348,15 +341,15 @@ msgstr ""
 "thích hợp."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:176
 #, no-c-format
-#. Tag: term
 msgid "hw-detect"
 msgstr "hw-detect"
 
+#. Tag: para
 #: using-d-i.xml:176
 #, no-c-format
-#. Tag: para
 msgid ""
 "Automatically detects most of the system's hardware, including network "
 "cards, disk drives, and PCMCIA."
@@ -365,29 +358,28 @@ msgstr ""
 "mạng, ổ đĩa và PCMCIA."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:185
 #, no-c-format
-#. Tag: term
 msgid "cdrom-detect"
 msgstr "cdrom-detect"
 
+#. Tag: para
 #: using-d-i.xml:185
 #, no-c-format
-#. Tag: para
-#| msgid "Looks for and mounts a Debian installation CD."
 msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Thành phần này phát hiện và gắn kết đĩa CD cài đặt &debian;."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:193
 #, no-c-format
-#. Tag: term
 msgid "netcfg"
 msgstr "netcfg"
 
+#. Tag: para
 #: using-d-i.xml:193
 #, no-c-format
-#. Tag: para
 msgid ""
 "Configures the computer's network connections so it can communicate over the "
 "internet."
@@ -395,50 +387,47 @@ msgstr ""
 "Thành phần này cấu hình các sự kết nối mạng của máy tính để cho nó có khả "
 "năng liên lạc qua Mạng."
 
+#. Tag: term
 #: using-d-i.xml:202
 #, no-c-format
-#. Tag: term
 msgid "iso-scan"
 msgstr "iso-scan"
 
+#. Tag: para
 #: using-d-i.xml:202
 #, no-c-format
-#. Tag: para
 msgid ""
 "Searches for ISO images (<filename>.iso</filename> files) on hard drives."
 msgstr ""
 "Tìm kiếm ảnh ISO (tập tin có đuôi <filename>.iso</filename>) trên đĩa cứng."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:210
 #, no-c-format
-#. Tag: term
 msgid "choose-mirror"
 msgstr "choose-mirror"
 
+#. Tag: para
 #: using-d-i.xml:210
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Presents a list of Debian archive mirrors. The user may choose the source "
-#| "of his installation packages."
 msgid ""
 "Presents a list of &debian; archive mirrors. The user may choose the source "
 "of his installation packages."
 msgstr ""
-"Thành phần này hiển thị danh sách các máy nhân bản &debian;. Vì vậy người dùng có "
-"dịp chọn nguồn của các gói cài đặt."
+"Thành phần này hiển thị danh sách các máy nhân bản &debian;. Vì vậy người "
+"dùng có dịp chọn nguồn của các gói cài đặt."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:219
 #, no-c-format
-#. Tag: term
 msgid "cdrom-checker"
 msgstr "cdrom-checker"
 
+#. Tag: para
 #: using-d-i.xml:219
 #, no-c-format
-#. Tag: para
 msgid ""
 "Checks integrity of a CD-ROM. This way, the user may assure him/herself that "
 "the installation CD-ROM was not corrupted."
@@ -446,15 +435,15 @@ msgstr ""
 "Thành phần này kiểm tra sự nguyên vẹn của đĩa CD-ROM. Bằng cách này, người "
 "dùng có khả năng kiểm tra xem đĩa CD-ROM cài đặt chưa bị hỏng."
 
+#. Tag: term
 #: using-d-i.xml:228
 #, no-c-format
-#. Tag: term
 msgid "lowmem"
 msgstr "lowmem"
 
+#. Tag: para
 #: using-d-i.xml:228
 #, no-c-format
-#. Tag: para
 msgid ""
 "Lowmem tries to detect systems with low memory and then does various tricks "
 "to remove unnecessary parts of &d-i; from the memory (at the cost of some "
@@ -465,15 +454,15 @@ msgstr ""
 "vài tính năng)."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:238
 #, no-c-format
-#. Tag: term
 msgid "anna"
 msgstr "anna"
 
+#. Tag: para
 #: using-d-i.xml:238
 #, no-c-format
-#. Tag: para
 msgid ""
 "Anna's Not Nearly APT. Installs packages which have been retrieved from the "
 "chosen mirror or CD."
@@ -482,15 +471,30 @@ msgstr ""
 "CD."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr ""
+"Thành phần này thiết lập mật khẩu chủ (root), cũng thêm một người dùng khác "
+"người chủ."
+
+# Name: don't translate / Tên: đừng dịch
 #. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
-#: using-d-i.xml:247
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:255
+#, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
 "not."
@@ -499,51 +503,50 @@ msgstr ""
 "gian thế giới) hay không."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:256
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:264
+#, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
-#: using-d-i.xml:256
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:264
+#, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "Thành phần này chọn múi giờ, dựa vào địa điểm đã chọn trước."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:264
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:272
+#, no-c-format
 msgid "partman"
 msgstr "partman"
 
-#: using-d-i.xml:264
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "Allows the user to partition disks attached to the system, create file "
-#| "systems on the selected partitions, and attach them to the mountpoints. "
-#| "Included are also interesting features like a fully automatic mode or LVM "
-#| "support. This is the preferred partitioning tool in Debian."
+#: using-d-i.xml:272
+#, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
 "systems on the selected partitions, and attach them to the mountpoints. "
 "Included are also interesting features like a fully automatic mode or LVM "
 "support. This is the preferred partitioning tool in &debian;."
 msgstr ""
-"Thành phần này cho phép người dùng phân vùng đĩa được gắn kết vào hệ thống, tạo hệ thống tập tin trên những phân vùng đã chọn, và gắn kết mỗi điều vào điểm lắp thích hợp. Cũng gồm có một số tính năng có ích như chế độ tự động hoàn toàn và khả năng hỗ trợ LVM (bộ quản lý khối tin hợp lý). Thành phần partman là công cụ phân vùng ưa thích trong &debian;."
+"Thành phần này cho phép người dùng phân vùng đĩa được gắn kết vào hệ thống, "
+"tạo hệ thống tập tin trên những phân vùng đã chọn, và gắn kết mỗi điều vào "
+"điểm lắp thích hợp. Cũng gồm có một số tính năng có ích như chế độ tự động "
+"hoàn toàn và khả năng hỗ trợ LVM (bộ quản lý khối tin hợp lý). Thành phần "
+"partman là công cụ phân vùng ưa thích trong &debian;."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:276
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:284
+#, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
-#: using-d-i.xml:276
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:284
+#, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
 "program appropriate to your computer's architecture is chosen."
@@ -552,15 +555,15 @@ msgstr ""
 "thống. Nó chọn chương trình thích hợp với kiến trúc của mỗi máy tính."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:286
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:294
+#, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
-#: using-d-i.xml:286
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:294
+#, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
 "partitions according to user instructions."
@@ -569,15 +572,15 @@ msgstr ""
 "trên những phân vùng đã chọn, tùy theo những hướng dẫn của người dùng."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:295
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:303
+#, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
-#: using-d-i.xml:295
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:303
+#, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
 "(Logical Volume Manager)."
@@ -586,15 +589,15 @@ msgstr ""
 "quản lý khối tin hợp lý)."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:304
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:312
+#, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
-#: using-d-i.xml:304
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:312
+#, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
 "Array of Inexpensive Disks). This Software RAID is usually superior to the "
@@ -605,15 +608,15 @@ msgstr ""
 "IDE (phần cứng giả) rẻ nằm trên bo mạch chủ mới hơn."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:315
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:323
+#, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
-#: using-d-i.xml:315
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:323
+#, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
 "operate under &debian-gnu; when rebooted."
@@ -622,30 +625,15 @@ msgstr ""
 "được dưới &debian-gnu; khi được khởi động lại."
 
 # Name: don't translate / Tên: đừng dịch
-#: using-d-i.xml:324
-#, no-c-format
 #. Tag: term
-msgid "user-setup"
-msgstr "user-setup"
-
-#: using-d-i.xml:324
-#, no-c-format
-#. Tag: para
-msgid "Sets up the root password, and adds a non-root user."
-msgstr ""
-"Thành phần này thiết lập mật khẩu chủ (root), cũng thêm một người dùng khác "
-"người chủ."
-
-# Name: don't translate / Tên: đừng dịch
 #: using-d-i.xml:332
 #, no-c-format
-#. Tag: term
 msgid "apt-setup"
 msgstr "apt-setup"
 
+#. Tag: para
 #: using-d-i.xml:332
 #, no-c-format
-#. Tag: para
 msgid ""
 "Configures apt, mostly automatically, based on what media the installer is "
 "running from."
@@ -654,15 +642,15 @@ msgstr ""
 "vào vật chứa nơi trình cài đặt chạy."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:341
 #, no-c-format
-#. Tag: term
 msgid "pkgsel"
 msgstr "pkgsel"
 
+#. Tag: para
 #: using-d-i.xml:341
 #, no-c-format
-#. Tag: para
 msgid ""
 "Uses <classname>tasksel</classname> to select and install additional "
 "software."
@@ -671,15 +659,15 @@ msgstr ""
 "và cài đặt phần mềm thêm."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:349
 #, no-c-format
-#. Tag: term
 msgid "os-prober"
 msgstr "os-prober"
 
+#. Tag: para
 #: using-d-i.xml:349
 #, no-c-format
-#. Tag: para
 msgid ""
 "Detects currently installed operating systems on the computer and passes "
 "this information to the bootloader-installer, which may offer you an ability "
@@ -694,15 +682,15 @@ msgstr ""
 "cần khởi chạy."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:361
 #, no-c-format
-#. Tag: term
 msgid "bootloader-installer"
 msgstr "bootloader-installer"
 
+#. Tag: para
 #: using-d-i.xml:361
 #, no-c-format
-#. Tag: para
 msgid ""
 "The various bootloader installers each install a boot loader program on the "
 "hard disk, which is necessary for the computer to start up using &arch-"
@@ -715,15 +703,15 @@ msgstr ""
 "khả năng chọn hệ điều hành xen kẽ vào lúc khởi động máy tính."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:372
 #, no-c-format
-#. Tag: term
 msgid "shell"
 msgstr "shell"
 
+#. Tag: para
 #: using-d-i.xml:372
 #, no-c-format
-#. Tag: para
 msgid ""
 "Allows the user to execute a shell from the menu, or in the second console."
 msgstr ""
@@ -731,20 +719,15 @@ msgstr ""
 "hoặc trong bàn giao tiếp thứ hai."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: term
 #: using-d-i.xml:381
 #, no-c-format
-#. Tag: term
 msgid "save-logs"
 msgstr "save-logs"
 
+#. Tag: para
 #: using-d-i.xml:381
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Provides a way for the user to record information on a floppy disk, "
-#| "network, hard disk, or other media when trouble is encountered, in order "
-#| "to accurately report installer software problems to Debian developers "
-#| "later."
 msgid ""
 "Provides a way for the user to record information on a floppy disk, network, "
 "hard disk, or other media when trouble is encountered, in order to "
@@ -752,17 +735,18 @@ msgid ""
 msgstr ""
 "Thành phần này cung cấp cho người dùng có khả năng ghi thông tin vào đĩa "
 "mềm, qua mạng, vào đĩa cứng hay vào vật chứa khác khi gặp lỗi, để thông báo "
-"chính xác vấn đề phần mềm cài đặt cho nhà phát triển &debian; xem vào lúc sau."
+"chính xác vấn đề phần mềm cài đặt cho nhà phát triển &debian; xem vào lúc "
+"sau."
 
+#. Tag: title
 #: using-d-i.xml:399
 #, no-c-format
-#. Tag: title
 msgid "Using Individual Components"
 msgstr "Sử dụng mỗi thành phần"
 
+#. Tag: para
 #: using-d-i.xml:400
 #, no-c-format
-#. Tag: para
 msgid ""
 "In this section we will describe each installer component in detail. The "
 "components have been grouped into stages that should be recognizable for "
@@ -777,26 +761,15 @@ msgstr ""
 "cả các mô-đun sẽ được dùng trong mọi việc cài đặt; những mô-đun thật sự được "
 "dùng phụ thuộc vào phương pháp cài đặt và phần cứng riêng."
 
+#. Tag: title
 #: using-d-i.xml:412
 #, no-c-format
-#. Tag: title
-#| msgid "Setting up Debian Installer and Hardware Configuration"
 msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "Thiết lập trình cài đặt &debian; và cấu hình phần cứng"
 
+#. Tag: para
 #: using-d-i.xml:413
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Let's assume the Debian Installer has booted and you are facing its first "
-#| "screen. At this time, the capabilities of &d-i; are still quite limited. "
-#| "It doesn't know much about your hardware, preferred language, or even the "
-#| "task it should perform. Don't worry. Because &d-i; is quite clever, it "
-#| "can automatically probe your hardware, locate the rest of its components "
-#| "and upgrade itself to a capable installation system. However, you still "
-#| "need to help &d-i; with some information it can't determine automatically "
-#| "(like selecting your preferred language, keyboard layout or desired "
-#| "network mirror)."
 msgid ""
 "Let's assume the &debian; Installer has booted and you are facing its first "
 "screen. At this time, the capabilities of &d-i; are still quite limited. It "
@@ -808,19 +781,19 @@ msgid ""
 "selecting your preferred language, keyboard layout or desired network "
 "mirror)."
 msgstr ""
-"Giả sử là trình cài đặt &debian; vừa mới khởi động, và bạn xem màn hình thứ nhất. "
-"Vào lúc đó, khả năng của &d-i; vẫn còn hơi bị hạn chế. Nó chưa biết nhiều về "
-"phần cứng, về ngôn ngữ ưa thích của bạn, ngay cả về công việc cần thực "
-"hiện. Không có sao đó, vì &d-i; hơi thông minh. Nó có khả năng thăm dò tự "
-"động phần cứng, tìm các thành phần còn lại của nó, và nâng cấp tự nó lên một "
-"hệ thống cài đặt có đủ khả năng. Tuy nhiên, bạn vẫn còn cần phải giúp đỡ &d-"
-"i; tập hợp vài thông tin nó không thể quyết định tự động (v.d. bằng cách "
+"Giả sử là trình cài đặt &debian; vừa mới khởi động, và bạn xem màn hình thứ "
+"nhất. Vào lúc đó, khả năng của &d-i; vẫn còn hơi bị hạn chế. Nó chưa biết "
+"nhiều về phần cứng, về ngôn ngữ ưa thích của bạn, ngay cả về công việc cần "
+"thực hiện. Không có sao đó, vì &d-i; hơi thông minh. Nó có khả năng thăm dò "
+"tự động phần cứng, tìm các thành phần còn lại của nó, và nâng cấp tự nó lên "
+"một hệ thống cài đặt có đủ khả năng. Tuy nhiên, bạn vẫn còn cần phải giúp đỡ "
+"&d-i; tập hợp vài thông tin nó không thể quyết định tự động (v.d. bằng cách "
 "chọn ngôn ngữ ưa thích, bố trí bàn phím thích hợp hay máy nhân bản riêng "
 "trên mạng)."
 
+#. Tag: para
 #: using-d-i.xml:426
 #, no-c-format
-#. Tag: para
 msgid ""
 "You will notice that &d-i; performs <firstterm>hardware detection</"
 "firstterm> several times during this stage. The first time is targeted "
@@ -835,9 +808,9 @@ msgstr ""
 "việc chạy đầu tiên này, việc phát hiện phần cứng cần phải được lặp lại vào "
 "điểm sau trong tiến trình."
 
+#. Tag: para
 #: using-d-i.xml:434
 #, no-c-format
-#. Tag: para
 msgid ""
 "During hardware detection &d-i; checks if any of the drivers for the "
 "hardware devices in your system require firmware to be loaded. If any "
@@ -851,15 +824,15 @@ msgstr ""
 "thoại cho phép nạp phần vững còn thiếu từ một vật chứa rời. Xem <xref "
 "linkend=\"loading-firmware\"/> để tìm chi tiết."
 
+#. Tag: title
 #: using-d-i.xml:449
 #, no-c-format
-#. Tag: title
 msgid "Check available memory / low memory mode"
 msgstr "Kiểm tra bộ nhớ có sẵn / chế độ thiếu bộ nhớ"
 
+#. Tag: para
 #: using-d-i.xml:451
 #, no-c-format
-#. Tag: para
 msgid ""
 "One of the first things &d-i; does, is to check available memory. If the "
 "available memory is limited, this component will make some changes in the "
@@ -871,9 +844,9 @@ msgstr ""
 "cài đặt để (mong muốn) cho bạn khả năng cài đặt &debian-gnu; trên máy tính "
 "của mình."
 
+#. Tag: para
 #: using-d-i.xml:458
 #, no-c-format
-#. Tag: para
 msgid ""
 "The first measure taken to reduce memory consumption by the installer is to "
 "disable translations, which means that the installation can only be done in "
@@ -884,9 +857,9 @@ msgstr ""
 "có khả năng cài đặt bằng tiếng Anh. Tất nhiên, bạn vẫn còn có khả năng chạy "
 "hệ thống đã bản địa hoá sau khi cài đặt xong. "
 
+#. Tag: para
 #: using-d-i.xml:465
 #, no-c-format
-#. Tag: para
 msgid ""
 "If that is not sufficient, the installer will further reduce memory "
 "consumption by loading only those components essential to complete a basic "
@@ -901,9 +874,9 @@ msgstr ""
 "phần bạn chọn sẽ chiếm bộ nhớ thêm thì có thể gây ra tiến trình cài đặt bị "
 "lỗi do hết bộ nhớ."
 
+#. Tag: para
 #: using-d-i.xml:474
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the installer runs in low memory mode, it is recommended to create a "
 "relatively large swap partition (64&ndash;128MB). The swap partition will be "
@@ -919,9 +892,9 @@ msgstr ""
 "rằng cách sử dụng vùng trao đổi nặng sẽ giảm hiệu suất của hệ thống và có "
 "thể đưa tới hoạt động đĩa cao."
 
+#. Tag: para
 #: using-d-i.xml:484
 #, no-c-format
-#. Tag: para
 msgid ""
 "Despite these measures, it is still possible that your system freezes, that "
 "unexpected errors occur or that processes are killed by the kernel because "
@@ -932,9 +905,9 @@ msgstr ""
 "thường hay tiến trình bị giết bởi hạt nhân do hệ thống hết bộ nhớ (kết quả "
 "là thông điệp <quote>Hết bộ nhớ</quote> trên VT4 và trong bản ghi hệ thống)."
 
+#. Tag: para
 #: using-d-i.xml:491
 #, no-c-format
-#. Tag: para
 msgid ""
 "For example, it has been reported that creating a big ext3 file system fails "
 "in low memory mode when there is insufficient swap space. If a larger swap "
@@ -948,9 +921,9 @@ msgstr ""
 "tập tin dạng ext2 (thành phần chủ yếu của bộ cài đặt) thay thế. Vẫn có thể "
 "thay đổi phân vùng ext2 sang ext3 sa khi cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:499
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is possible to force the installer to use a higher lowmem level than the "
 "one based on available memory by using the boot parameter <quote>lowmem</"
@@ -960,15 +933,15 @@ msgstr ""
 "nhớ còn rảnh, bằng cách dùng tham số khởi động <quote>lowmem</quote> như "
 "được diễn tả trong <xref linkend=\"installer-args\"/>."
 
+#. Tag: title
 #: using-d-i.xml:514
 #, no-c-format
-#. Tag: title
 msgid "Selecting Localization Options"
 msgstr "Đặt tùy chọn địa phương hoá"
 
+#. Tag: para
 #: using-d-i.xml:516
 #, no-c-format
-#. Tag: para
 msgid ""
 "In most cases the first questions you will be asked concern the selection of "
 "localization options to be used both for the installation and for the "
@@ -979,9 +952,9 @@ msgstr ""
 "phương hoá cần dùng trong cả hai tiến trình cài đặt và hệ thống được cài "
 "đặt. Những tùy chọn địa phương hoá là ngôn ngữ, nơi ở và miền địa phương."
 
+#. Tag: para
 #: using-d-i.xml:523
 #, no-c-format
-#. Tag: para
 msgid ""
 "The language you choose will be used for the rest of the installation "
 "process, provided a translation of the different dialogs is available. If no "
@@ -992,15 +965,9 @@ msgstr ""
 "miễn là có sẵn bản dịch của các hộp thoại khác nhau. Nếu chưa có bản dịch "
 "sang ngôn ngữ đã chọn, trình cài đặt sẽ trở về ngôn ngữ mặc định: tiếng Anh."
 
+#. Tag: para
 #: using-d-i.xml:530
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The selected geographic location (in most cases a country) will be used "
-#| "later in the installation process to select the correct time zone and a "
-#| "Debian mirror appropriate for that country. Language and country together "
-#| "will help determine the default locale for your system and select the "
-#| "correct keyboard layout."
 msgid ""
 "The selected geographic location (in most cases a country) will be used "
 "later in the installation process to select the correct time zone and a "
@@ -1010,13 +977,13 @@ msgid ""
 msgstr ""
 "Vị trí địa lý (trong phần lớn các trường hợp là một quốc gia) sẽ được dùng "
 "về sau trong tiến trình cài đặt để chọn múi giờ đúng và một máy nhân bản "
-"&debian; thích hợp với quốc gia đó. Tổ hợp ngôn ngữ và quốc gia thì giúp quyết "
-"định miền địa phương mặc định cho hệ thống của bạn, cũng chọn bố trí bàn "
-"phím đúng."
+"&debian; thích hợp với quốc gia đó. Tổ hợp ngôn ngữ và quốc gia thì giúp "
+"quyết định miền địa phương mặc định cho hệ thống của bạn, cũng chọn bố trí "
+"bàn phím đúng."
 
+#. Tag: para
 #: using-d-i.xml:538
 #, no-c-format
-#. Tag: para
 msgid ""
 "You will first be asked to select your preferred language. The language "
 "names are listed both in English (left side) and in the language itself "
@@ -1038,9 +1005,9 @@ msgstr ""
 "phương hoá (không có ngôn ngữ khác v.v.) vì gói <classname>locales</"
 "classname> sẽ không được cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:550
 #, no-c-format
-#. Tag: para
 msgid ""
 "Next you will be asked to select your geographic location. If you selected a "
 "language that is recognized as an official language for more than one "
@@ -1060,9 +1027,9 @@ msgstr ""
 "sẽ hiển thị danh sách các lục địa; việc chọn một lục địa riêng thì dẫn tới "
 "danh sách các quốc gia thích hợp ở lục địa đó."
 
+#. Tag: para
 #: using-d-i.xml:567
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the language has only one country associated with it, a list of countries "
 "will be displayed for the continent or region the country belongs to, with "
@@ -1074,9 +1041,9 @@ msgstr ""
 "chọn làm mặc định. Hãy sử dụng cái nút <guibutton>Lùi</guibutton> để chọn "
 "quốc gia trong một châu khác."
 
+#. Tag: para
 #: using-d-i.xml:574
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is important to select the country where you live or where you are "
 "located as it determines the time zone that will be configured for the "
@@ -1085,9 +1052,9 @@ msgstr ""
 "Quan trọng là bạn chọn quốc gia ở, vì nó quyết định múi giờ nào được cấu "
 "hình cho hệ thống được cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:580
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you selected a combination of language and country for which no locale is "
 "defined and there exist multiple locales for the language, then the "
@@ -1107,9 +1074,9 @@ msgstr ""
 "hợp khác, một miền địa phương mặc định sẽ được lập dựa vào ngôn ngữ và quốc "
 "gia được người dùng chọn."
 
+#. Tag: para
 #: using-d-i.xml:595
 #, no-c-format
-#. Tag: para
 msgid ""
 "Any default locale selected as described in the previous paragraph will use "
 "<firstterm>UTF-8</firstterm> as character encoding."
@@ -1118,9 +1085,9 @@ msgstr ""
 "trước sẽ cũng sử dụng <firstterm>UTF-8</firstterm> (Unicode) làm bảng mã ký "
 "tự. (Ghi chú : tiếng Việt yêu cầu Unicode.)"
 
+#. Tag: para
 #: using-d-i.xml:600
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing at low priority, you will have the option of selecting "
 "additional locales, including so-called <quote>legacy</quote> "
@@ -1139,33 +1106,33 @@ msgstr ""
 "ra cho hệ thống được cài đặt. Chọn thêm miền địa phương ở bước này thì bạn "
 "được hỏi miền địa phương nào nên làm mặc định cho hệ thống được cài đặt."
 
+#. Tag: title
 #: using-d-i.xml:624
 #, no-c-format
-#. Tag: title
 msgid "Choosing a Keyboard"
 msgstr "Chọn bàn phím"
 
+#. Tag: para
 #: using-d-i.xml:626
 #, no-c-format
-#. Tag: para
 msgid ""
 "Keyboards are often tailored to the characters used in a language. Select a "
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "Bàn phím thường được thiết kế để nhập các ký tự đại diện ngôn ngữ riêng. Hãy "
 "chọn một bố trí bàn phím thích hợp với bàn phím hàng ngày của bạn, hoặc chọn "
 "điều tương tự nếu không có bố trí trùng. Một khi cài đặt xong hệ thống, bạn "
 "có khả năng chọn bố trí bàn phím trong phạm vị sự chọn rộng hơn (chạy tiện "
-"ích <command>dpkg-reconfigure keyboard-configuration</command> với tư cách người chủ, một khi cài đặt "
-"xong)."
+"ích <command>dpkg-reconfigure keyboard-configuration</command> với tư cách "
+"người chủ, một khi cài đặt xong)."
 
+#. Tag: para
 #: using-d-i.xml:636
 #, no-c-format
-#. Tag: para
 msgid ""
 "Move the highlight to the keyboard selection you desire and press "
 "&enterkey;. Use the arrow keys to move the highlight &mdash; they are in the "
@@ -1180,9 +1147,9 @@ msgstr ""
 "» ('extended') có các phím chức năng <keycap>F1</keycap> đến <keycap>F10</"
 "keycap> nằm bên trên."
 
+#. Tag: para
 #: using-d-i.xml:645
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are two keyboard layouts for US keyboards; the qwerty/mac-usb-us "
 "(Apple USB) layout will place the Alt function on the <keycap>Command/Apple</"
@@ -1199,21 +1166,15 @@ msgstr ""
 "có từ viết tắt 'alt' trên phần lớn bàn phím Mac). Bằng các cách khác, hai bố "
 "trí này là tương tự."
 
+#. Tag: title
 #: using-d-i.xml:675
 #, no-c-format
-#. Tag: title
-#| msgid "Looking for the Debian Installer ISO Image"
 msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Tìm ảnh ISO cài đặt &debian;"
 
+#. Tag: para
 #: using-d-i.xml:676
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "When installing via the <emphasis>hd-media</emphasis> method, there will "
-#| "be a moment where you need to find and mount the Debian Installer iso "
-#| "image in order to get the rest of the installation files. The component "
-#| "<command>iso-scan</command> does exactly this."
 msgid ""
 "When installing via the <emphasis>hd-media</emphasis> method, there will be "
 "a moment where you need to find and mount the &debian; Installer iso image "
@@ -1221,27 +1182,13 @@ msgid ""
 "<command>iso-scan</command> does exactly this."
 msgstr ""
 "Trong tiến trình cài đặt bằng phương pháp <emphasis>hd-media</emphasis>, có "
-"một thời điểm khi bạn cần phải tìm và gắn kết ảnh ISO của trình cài đặt &debian;, "
-"để lấy các tập tin cài đặt còn lại. Thành phần <command>iso-scan</command> "
-"thực hiện công việc dứt khoát này."
+"một thời điểm khi bạn cần phải tìm và gắn kết ảnh ISO của trình cài đặt "
+"&debian;, để lấy các tập tin cài đặt còn lại. Thành phần <command>iso-scan</"
+"command> thực hiện công việc dứt khoát này."
 
+#. Tag: para
 #: using-d-i.xml:683
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "At first, <command>iso-scan</command> automatically mounts all block "
-#| "devices (e.g. partitions) which have some known filesystem on them and "
-#| "sequentially searches for filenames ending with <filename>.iso</filename> "
-#| "(or <filename>.ISO</filename> for that matter). Beware that the first "
-#| "attempt scans only files in the root directory and in the first level of "
-#| "subdirectories (i.e. it finds <filename>/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, <filename>/data/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, but not <filename>/data/tmp/"
-#| "<replaceable>whatever</replaceable>.iso</filename>). After an iso image "
-#| "has been found, <command>iso-scan</command> checks its content to "
-#| "determine if the image is a valid Debian iso image or not. In the former "
-#| "case we are done, in the latter <command>iso-scan</command> seeks for "
-#| "another image."
 msgid ""
 "At first, <command>iso-scan</command> automatically mounts all block devices "
 "(e.g. partitions) which have some known filesystem on them and sequentially "
@@ -1256,14 +1203,22 @@ msgid ""
 "the former case we are done, in the latter <command>iso-scan</command> seeks "
 "for another image."
 msgstr ""
-"Trước tiên, thành phần <command>iso-scan</command> tự động gắn kết mọi thiết bị kiểu khối (v.d. phân vùng) chứa một hệ thống tập tin đã biết, sau đó tìm kiếm tính liên tục tên tập tin nào kết thúc bằng <filename>.iso</filename> (cũng tìm <filename>.ISO</filename>). Ghi chú rằng việc thử đầu tiên quét chỉ những tập tin nằm trong thư mục gốc và trong lớp đầu của thư mục con (tức là nó tìm <filename>/"
-"<replaceable>cái_gì</replaceable>.iso</filename> và <filename>/data/"
-"<replaceable>cái_gì</replaceable>.iso</filename>, nhưng không phải "
-"<filename>/data/tmp/<replaceable>cái_gì</replaceable>.iso</filename>). Tìm được một ảnh ISO thì công cụ <command>iso-scan</command> kiểm tra nội dung của nó, để quyết định nếu nó là một ảnh ISO &debian; đúng hay không. Nếu có thì hoàn tất, nếu không thì công cụ <command>iso-scan</command> tìm kiếm một ảnh khác."
+"Trước tiên, thành phần <command>iso-scan</command> tự động gắn kết mọi thiết "
+"bị kiểu khối (v.d. phân vùng) chứa một hệ thống tập tin đã biết, sau đó tìm "
+"kiếm tính liên tục tên tập tin nào kết thúc bằng <filename>.iso</filename> "
+"(cũng tìm <filename>.ISO</filename>). Ghi chú rằng việc thử đầu tiên quét "
+"chỉ những tập tin nằm trong thư mục gốc và trong lớp đầu của thư mục con "
+"(tức là nó tìm <filename>/<replaceable>cái_gì</replaceable>.iso</filename> "
+"và <filename>/data/<replaceable>cái_gì</replaceable>.iso</filename>, nhưng "
+"không phải <filename>/data/tmp/<replaceable>cái_gì</replaceable>.iso</"
+"filename>). Tìm được một ảnh ISO thì công cụ <command>iso-scan</command> "
+"kiểm tra nội dung của nó, để quyết định nếu nó là một ảnh ISO &debian; đúng "
+"hay không. Nếu có thì hoàn tất, nếu không thì công cụ <command>iso-scan</"
+"command> tìm kiếm một ảnh khác."
 
+#. Tag: para
 #: using-d-i.xml:700
 #, no-c-format
-#. Tag: para
 msgid ""
 "In case the previous attempt to find an installer iso image fails, "
 "<command>iso-scan</command> will ask you whether you would like to perform a "
@@ -1275,9 +1230,9 @@ msgstr ""
 "tìm kiếm tường tận hơn. Việc tìm kiếm đó không phải chỉ tìm trong những thư "
 "mục lên trên: nó thật sự đi qua toàn bộ hệ thống tập tin."
 
+#. Tag: para
 #: using-d-i.xml:707
 #, no-c-format
-#. Tag: para
 msgid ""
 "If <command>iso-scan</command> does not discover your installer iso image, "
 "reboot back to your original operating system and check if the image is "
@@ -1293,15 +1248,15 @@ msgstr ""
 "checksum). Người dùng UNIX kinh nghiệm có thể làm như thế, không cần khởi "
 "động lại, bằng bàn giao tiếp thứ hai."
 
+#. Tag: title
 #: using-d-i.xml:728
 #, no-c-format
-#. Tag: title
 msgid "Configuring the Network"
 msgstr "Cấu hình mạng"
 
+#. Tag: para
 #: using-d-i.xml:730
 #, no-c-format
-#. Tag: para
 msgid ""
 "As you enter this step, if the system detects that you have more than one "
 "network device, you'll be asked to choose which device will be your "
@@ -1319,9 +1274,9 @@ msgstr ""
 "<citerefentry> <refentrytitle>interfaces</refentrytitle> <manvolnum>5</"
 "manvolnum> </citerefentry>."
 
+#. Tag: para
 #: using-d-i.xml:741
 #, no-c-format
-#. Tag: para
 msgid ""
 "By default, &d-i; tries to configure your computer's network automatically "
 "via DHCP. If the DHCP probe succeeds, you are done. If the probe fails, it "
@@ -1342,9 +1297,9 @@ msgstr ""
 "nếu bạn muốn thử lại hoặc tự thiết lập. Trình phục vụ DHCP đôi khi đáp ứng "
 "rất chậm, vậy nếu bạn có chắc là mọi thứ ổn, hãy thử lại."
 
+#. Tag: para
 #: using-d-i.xml:753
 #, no-c-format
-#. Tag: para
 msgid ""
 "The manual network setup in turn asks you a number of questions about your "
 "network, notably <computeroutput>IP address</computeroutput>, "
@@ -1365,9 +1320,9 @@ msgstr ""
 "tuyến</computeroutput> và <computeroutput>khoá WEP</computeroutput>. Hãy "
 "điền vào các trả lời từ <xref linkend=\"needed-info\"/>."
 
+#. Tag: para
 #: using-d-i.xml:767
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some technical details you might, or might not, find handy: the program "
 "assumes the network IP address is the bitwise-AND of your system's IP "
@@ -1387,15 +1342,15 @@ msgstr ""
 "trị như vậy bằng cách chỉnh sửa tập tin <filename>/etc/network/interfaces</"
 "filename> một khi hệ thống được cài đặt."
 
+#. Tag: title
 #: using-d-i.xml:812
 #, no-c-format
-#. Tag: title
 msgid "Configuring the Clock and Time Zone"
 msgstr "Cấu hình Đồng hồ và Múi giờ"
 
+#. Tag: para
 #: using-d-i.xml:814
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installer will first attempt to connect to a time server on the Internet "
 "(using the <firstterm>NTP</firstterm> protocol) in order to correctly set "
@@ -1410,15 +1365,15 @@ msgstr ""
 "và thời gian được lấy từ đồng hồ hệ thống khi khởi động hệ thống cài đặt là "
 "đúng. Bạn không thể tự đặt thời gian hệ thống trong khi cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:823
 #, no-c-format
-#. Tag: para
 msgid "The installer does not modify the system clock on the s390 platform."
 msgstr "Trình cài đặt không sửa đổi đồng hồ hệ thống trên nền tảng s390."
 
+#. Tag: para
 #: using-d-i.xml:836
 #, no-c-format
-#. Tag: para
 msgid ""
 "Depending on the location selected earlier in the installation process, you "
 "may be shown a list of time zones relevant for that location. If your "
@@ -1430,9 +1385,9 @@ msgstr ""
 "múi giờ và bạn đang làm một việc cài đặt mặc định thì trình cài đặt không "
 "hỏi gì và hệ thống giả sử múi giờ đó."
 
+#. Tag: para
 #: using-d-i.xml:844
 #, no-c-format
-#. Tag: para
 msgid ""
 "In expert mode or when installing at medium priority, you will have the "
 "additional option to select <quote>Coordinated Universal Time</quote> (UTC) "
@@ -1441,9 +1396,9 @@ msgstr ""
 "Trong chế độ cấp cao, hoặc khi cài đặt ở mức ưu tiên Vừa, bạn có tuỳ chọn bổ "
 "sung để chọn <quote>Thời gian Thế giới</quote> (UTC) làm múi giờ."
 
+#. Tag: para
 #: using-d-i.xml:850
 #, no-c-format
-#. Tag: para
 msgid ""
 "If for some reason you wish to set a time zone for the installed system that "
 "does <emphasis>not</emphasis> match the selected location, there are two "
@@ -1452,9 +1407,9 @@ msgstr ""
 "Nếu (vì lý do nào) bạn muốn đặt cho hệ thống đã cài đặt một múi giờ mà "
 "<emphasis>không</emphasis> tương ứng với địa điểm đã chọn, có hai tùy chọn."
 
+#. Tag: para
 #: using-d-i.xml:861
 #, no-c-format
-#. Tag: para
 msgid ""
 "The simplest option is to just select a different time zone after the "
 "installation has been completed and you've booted into the new system. The "
@@ -1464,15 +1419,15 @@ msgstr ""
 "bạn đã khởi động hệ thống mới. Câu lệnh để làm như thế là:"
 
 # Literal: don't translate/Nghĩa chữ : đừng dịch
+#. Tag: screen
 #: using-d-i.xml:867
 #, no-c-format
-#. Tag: screen
 msgid "# dpkg-reconfigure tzdata"
 msgstr "# dpkg-reconfigure tzdata"
 
+#. Tag: para
 #: using-d-i.xml:873
 #, no-c-format
-#. Tag: para
 msgid ""
 "Alternatively, the time zone can be set at the very start of the "
 "installation by passing the parameter <userinput>time/"
@@ -1486,9 +1441,9 @@ msgstr ""
 "usr/share/zoneinfo)  v.d. <userinput>Asia/Saigon</userinput> hay "
 "<userinput>UTC</userinput>."
 
+#. Tag: para
 #: using-d-i.xml:887
 #, no-c-format
-#. Tag: para
 msgid ""
 "For automated installations the time zone can be set to any desired value "
 "using preseeding."
@@ -1496,15 +1451,148 @@ msgstr ""
 "Đối với tiến trình tự động cài đặt, cũng có thể đặt múi giờ dùng chức năng "
 "chèn sẵn."
 
+#. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "Thiết lập Người và Mật khẩu"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"Sau khi cài đặt hệ thống cơ bản, trình cài đặt sẽ cho phép bạn thiết lập tài "
+"khoản <quote>người chủ</quote> và/hay một tài khoản cho người dùng thứ nhất. "
+"Các tài khoản người dùng khác có thể được tạo sau khi cài đặt xong."
+
 #. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "Đặt mật khẩu chủ"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"Tài khoản <emphasis>chủ</emphasis> (root) cũng được gọi là <emphasis>siêu "
+"người dùng</emphasis>; nó là cách đăng nhập mà đi qua toàn bộ sự bảo vệ bảo "
+"mật trên máy tính. Tài khoản chủ nên được dùng chỉ để quản trị hệ thống, và "
+"trong thời lượng càng ngắn càng có thể."
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"Mỗi mật khẩu bạn tạo phải chứa ít nhất 6 ký tự (nhiều hơn là mạnh hơn), gồm "
+"chữ cả hoa lẫn thường, cùng với ký tự chấm câu. Hãy rất cẩn thận khi đặt mật "
+"khẩu chủ (root) vì tài khoản đó có nhiều quyền quan trọng. Bạn nên tránh "
+"chọn từ nằm trong bất kỳ từ điển hay thông tin cá nhân có thể được đoán."
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"Nếu người nào xin mật khẩu chủ của bạn, hãy rất cẩn thận. Bình thường, đừng "
+"cho ai biết mật khẩu chủ, trừ bạn quản lý máy có nhiều quản trị hệ thống."
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "Tạo người dùng chuẩn"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"Hệ thống sẽ hỏi nếu bạn muốn tạo một tài khoản người dùng chuẩn tại điểm "
+"thời này. Tài khoản này nên là sự đăng nhập cá nhân chính của bạn. Bạn "
+"<emphasis>không</emphasis> nên dùng tài khoản người chủ để làm việc hàng "
+"ngày hay như là sự đăng nhập cá nhân."
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"Tại sao không? Một lý do là để tránh sử dụng các quyền của người chủ, vì các "
+"quyền này làm cho rất dễ dàng làm hại không thể sửa chữa. Một lý do khác là "
+"bạn có thể bị mắc mưu chạy chương trình <emphasis>Trojan</emphasis> mà nhớ "
+"dịp các quyền của siêu người dùng để hại thậm sự bảo mật của hệ thống bạn "
+"một cách bí mật. Bất kỳ cuốn sách tốt về cách quản lý hệ thống UNIX sẽ diễn "
+"tả chủ đề này bằng chi tiết: đề nghị bạn đọc nó nếu bạn chưa quen với vấn đề "
+"này."
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"Trước tiên, bạn sẽ được nhắc nhập họ tên của người dùng. Sau đó, bạn cần "
+"nhập tên của tài khoản người dùng, như tên của bạn hay tên riêng khác nào "
+"(tên của bạn là giá trị mặc định). Cuối cùng, bạn nên nhập mật khẩu dành cho "
+"tài khoản này."
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"Nếu tại bất kỳ điểm thời sau khi cài đặt, bạn muốn tạo tài khoản thêm, hãy "
+"sử dụng lệnh <command>adduser</command> (thêm người dùng)."
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "Phân vùng và chọn điểm lắp"
 
-#: using-d-i.xml:902
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:986
+#, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
 "should be at its full strength, customized for the user's needs and ready to "
@@ -1520,9 +1608,9 @@ msgstr ""
 "tin, gán điểm lắp và (tùy chọn) cấu hình các tùy chọn rất liên quan đến nhau "
 "như LVM, thiết bị RAID và thiết bị đã mật mã."
 
-#: using-d-i.xml:923
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1007
+#, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
 "details, see <xref linkend=\"partitioning\"/>."
@@ -1530,9 +1618,9 @@ msgstr ""
 "Nếu bạn chưa quen với công việc phân vùng, hoặc chỉ muốn biết thêm, xem "
 "<xref linkend=\"partitioning\"/>."
 
-#: using-d-i.xml:929
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1013
+#, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
 "detect the size of the drive correctly. Creating a new partition table does "
@@ -1552,9 +1640,9 @@ msgstr ""
 "</screen></informalexample> Ghi chú rằng việc này sẽ làm cho dữ liệu nào tồn "
 "tại trên cùng đĩa không còn có khả năng truy cấp lại."
 
-#: using-d-i.xml:942
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1026
+#, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
 "entire drive, or available free space on a drive. This is also called "
@@ -1566,15 +1654,15 @@ msgstr ""
 "<quote>đã hướng dẫn</quote>. Nếu bạn không muốn phân vùng tự động, hãy chọn "
 "mục <guimenuitem>Bằng tay</guimenuitem> trong trình đơn."
 
-#: using-d-i.xml:952
-#, no-c-format
 #. Tag: title
+#: using-d-i.xml:1036
+#, no-c-format
 msgid "Supported partitioning options"
 msgstr "Tùy chọn phân vùng được hỗ trợ"
 
-#: using-d-i.xml:953
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1037
+#, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
 "different partitioning schemes, using various partition tables, file systems "
@@ -1584,9 +1672,9 @@ msgstr ""
 "tạo nhiều lược đồ phân vùng khác nhau, dùng các bảng phân vùng, hệ thống tập "
 "tin và thiết bị khối cấp cao khác nhau."
 
-#: using-d-i.xml:959
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1043
+#, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
 "also on other factors. For example, on systems with limited internal memory "
@@ -1604,9 +1692,9 @@ msgstr ""
 "có thể được thay đổi khi cài đặt ở mức ưu tiên Debconf « vừa » hoặc « thấp "
 "»; ở mức ưu tiên « cao » thì dùng giá trị mặc định thích hợp."
 
-#: using-d-i.xml:970
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1054
+#, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
 "storage devices, which in many cases can be used in combination."
@@ -1615,41 +1703,41 @@ msgstr ""
 "và sử dụng thiết bị lưu trữ, mà trong nhiều trường hợp cũng có thể được sử "
 "dụng với nhau."
 
-#: using-d-i.xml:977
-#, no-c-format
 #. Tag: emphasis
+#: using-d-i.xml:1061
+#, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "Quản lý Khối Tin Hợp Lý (LVM)"
 
-#: using-d-i.xml:980
-#, no-c-format
 #. Tag: emphasis
+#: using-d-i.xml:1064
+#, no-c-format
 msgid "Software RAID"
 msgstr "RAID phần mềm"
 
-#: using-d-i.xml:981
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1065
+#, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "Hỗ trợ các lớp RAID 0, 1, 4, 5, 6, 10."
 
-#: using-d-i.xml:985
-#, no-c-format
 #. Tag: emphasis
+#: using-d-i.xml:1069
+#, no-c-format
 msgid "Encryption"
 msgstr "Mật mã"
 
-#: using-d-i.xml:987
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1071
+#, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
 msgstr ""
 "<emphasis>RAID ATA nối tiếp</emphasis> (dùng <classname>dmraid</classname>)"
 
-#: using-d-i.xml:989
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1073
+#, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
 "for Serial ATA RAID is currently only available if enabled when the "
@@ -1661,15 +1749,15 @@ msgstr ""
 "khả năng hỗ trợ đó được hiệu lực khi trình cài đặt được khởi động. Có thêm "
 "thông tin trong <ulink url=\"&url-d-i-sataraid;\">Wiki của chúng ta</ulink>."
 
-#: using-d-i.xml:995
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1079
+#, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>Đa đường dẫn</emphasis> (vẫn thực nghiệm)"
 
-#: using-d-i.xml:997
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1081
+#, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
 "Support for multipath is currently only available if enabled when the "
@@ -1679,16 +1767,16 @@ msgstr ""
 "thông tin. Hiện thời chỉ hỗ trợ chức năng đa đường dẫn nếu khả năng hỗ trợ "
 "đó được hiệu lực khi trình cài đặt được khởi động."
 
-#: using-d-i.xml:1004
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1088
+#, no-c-format
 msgid "The following file systems are supported."
 msgstr "Hỗ trợ những hệ thống tập tin theo đây."
 
 # cả tên
-#: using-d-i.xml:1009
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1093
+#, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
 "<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
@@ -1698,9 +1786,9 @@ msgstr ""
 "<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
 "emphasis>"
 
-#: using-d-i.xml:1014
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1098
+#, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
 "filename> partitions ext2 will be selected by default when guided "
@@ -1710,30 +1798,30 @@ msgstr ""
 "đối với phân vùng <filename>/boot</filename> (khởi động) thì ext2 được chọn "
 "theo mặc định khi sử dụng chức năng phân vùng đã hướng dẫn."
 
-#: using-d-i.xml:1019
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1103
+#, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>jfs</emphasis> (không phải sẵn sàng trên mọi kiến trúc)"
 
-#: using-d-i.xml:1022
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1106
+#, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>xfs</emphasis> (không phải sẵn sàng trên mọi kiến trúc)"
 
-#: using-d-i.xml:1025
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1109
+#, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr ""
 "<emphasis>reiserfs</emphasis> (vẫn tuỳ chọn; không sẵn sàng trên mọi kiến "
 "trúc)"
 
-#: using-d-i.xml:1027
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1111
+#, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
 "the installer is running at medium or low debconf priority it can be enabled "
@@ -1746,15 +1834,15 @@ msgstr ""
 "classname>. Chỉ hỗ trợ phiên bản 3 của hệ thống tập tin đó."
 
 # tên
-#: using-d-i.xml:1034
-#, no-c-format
 #. Tag: emphasis
+#: using-d-i.xml:1118
+#, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
-#: using-d-i.xml:1035
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1119
+#, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
 "jffs2 partitions."
@@ -1763,15 +1851,15 @@ msgstr ""
 "được phân vùng jffs2 mới."
 
 # tên
-#: using-d-i.xml:1040
-#, no-c-format
 #. Tag: emphasis
+#: using-d-i.xml:1124
+#, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
-#: using-d-i.xml:1041
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1125
+#, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
 "points for them. It is not possible to create new qnx4 partitions."
@@ -1780,21 +1868,21 @@ msgstr ""
 "Không thể tạo được phân vùng qnx4 mới."
 
 # cả tên
-#: using-d-i.xml:1045
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1129
+#, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
-#: using-d-i.xml:1048
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1132
+#, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (chỉ-đọc)"
 
-#: using-d-i.xml:1050
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1134
+#, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
 "points for them. It is not possible to create new NTFS partitions."
@@ -1802,15 +1890,15 @@ msgstr ""
 "Đối với phân vùng NTFS đã tồn tại, cũng có thể thay đổi kích cỡ và gán điểm "
 "lắp. Không thể tạo được phân vùng NTFS mới."
 
-#: using-d-i.xml:1060
-#, no-c-format
 #. Tag: title
+#: using-d-i.xml:1144
+#, no-c-format
 msgid "Guided Partitioning"
 msgstr "Phân vùng hướng dẫn"
 
-#: using-d-i.xml:1061
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1145
+#, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
 "partitions directly on the hard disk (classic method), or to create them "
@@ -1826,17 +1914,17 @@ msgstr ""
 "nhóm khối tin LVM bằng một khoá AES 256 bit, và sử dụng khả năng hỗ trợ "
 "<quote>dm-crypt</quote> của hạt nhân. </para> </footnote>."
 
-#: using-d-i.xml:1076
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1160
+#, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr ""
 "Tùy chọn sử dụng LVM (đã mật mã) có lẽ không sẵn sàng trên mọi kiến trúc."
 
-#: using-d-i.xml:1081
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1165
+#, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
 "inside one big partition; the advantage of this method is that partitions "
@@ -1851,9 +1939,9 @@ msgstr ""
 "người dùng không có cụm từ khoá đặc biệt, thì cung cấp bảo mật thêm cho dữ "
 "liệu (riêng) của bạn."
 
-#: using-d-i.xml:1090
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1174
+#, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
 "disk by writing random data to it. This further improves security (as it "
@@ -1867,9 +1955,9 @@ msgstr ""
 "đặt trước đã được xoá hoàn toàn), nhưng có thể kéo dài một lát phụ thuộc vào "
 "kích cỡ của đĩa."
 
-#: using-d-i.xml:1099
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1183
+#, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
 "in the partition table will need to be written to the selected disk while "
@@ -1884,9 +1972,9 @@ msgstr ""
 "nằm trên đĩa cứng đã chọn, và bạn không thể hủy bước này. Tuy niên, bộ cài "
 "đặt sẽ nhắc bạn xác nhận các thay đổi này trước khi ghi vào đĩa."
 
-#: using-d-i.xml:1109
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1193
+#, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
 "for a whole disk, you will first be asked to select the disk you want to "
@@ -1901,9 +1989,9 @@ msgstr ""
 "vài đĩa, xem bạn đã chọn điều đúng. Thứ tự danh sách có thể khác với thứ tự "
 "bạn thường xem. Kích cỡ của đĩa có thể giúp đỡ bạn nhận diện mỗi điều."
 
-#: using-d-i.xml:1118
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1202
+#, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
 "be asked to confirm any changes before they are written to the disk. If you "
@@ -1916,9 +2004,9 @@ msgstr ""
 "đã chọn phương pháp phân vùng truyền thống, bạn sẽ có khả năng hủy bước thay "
 "đổi nào đúng đến kết thúc; còn khi sử dụng LVM (đã mật mã), không có."
 
-#: using-d-i.xml:1126
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1210
+#, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
 "All schemes have their pros and cons, some of which are discussed in <xref "
@@ -1935,75 +2023,75 @@ msgstr ""
 "sức chứa (phụ thuộc vào giản đồ đã chọn), tiến trình phân vùng đã hướng dẫn "
 "sẽ không thành công."
 
-#: using-d-i.xml:1142
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1226
+#, no-c-format
 msgid "Partitioning scheme"
 msgstr "Bố trí phân vùng"
 
-#: using-d-i.xml:1143
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1227
+#, no-c-format
 msgid "Minimum space"
 msgstr "Chỗ tối thiểu"
 
-#: using-d-i.xml:1144
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1228
+#, no-c-format
 msgid "Created partitions"
 msgstr "Phân vùng đã tạo"
 
-#: using-d-i.xml:1150
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1234
+#, no-c-format
 msgid "All files in one partition"
 msgstr "Mọi tập tin trên một phân vùng"
 
-#: using-d-i.xml:1151
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1235
+#, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
-#: using-d-i.xml:1152
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1236
+#, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, trao đổi"
 
-#: using-d-i.xml:1154
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1238
+#, no-c-format
 msgid "Separate /home partition"
 msgstr "Phân vùng /home riêng"
 
-#: using-d-i.xml:1155
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1239
+#, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
-#: using-d-i.xml:1156
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1240
+#, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, trao đổi"
 
-#: using-d-i.xml:1160
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1244
+#, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "Các phân vùng /home, /usr, /var, và /tmp riêng"
 
-#: using-d-i.xml:1161
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1245
+#, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
-#: using-d-i.xml:1162
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1246
+#, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
@@ -2011,9 +2099,9 @@ msgstr ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, trao đổi"
 
-#: using-d-i.xml:1171
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1255
+#, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
 "also create a separate <filename>/boot</filename> partition. The other "
@@ -2024,9 +2112,9 @@ msgstr ""
 "cài đặt sẽ cũng tạo một phân vùng <filename>/boot</filename> riêng. Các phân "
 "vùng khác, bao gồm phân vùng trao đổi, sẽ được tạo bên trong phân vùng LVM."
 
-#: using-d-i.xml:1177
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1261
+#, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
 "additional partition, formatted as a FAT16 bootable filesystem, for the EFI "
@@ -2039,9 +2127,9 @@ msgstr ""
 "trong trình đơn định dạng, để tự thiết lập một phân vùng như là phân vùng "
 "khởi động EFI."
 
-#: using-d-i.xml:1185
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1269
+#, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
 "table, including information on whether and how partitions will be formatted "
@@ -2050,9 +2138,9 @@ msgstr ""
 "Sau khi bạn chọn bố trí, màn hình kế tiếp sẽ hiển thị bảng phân vùng mới, "
 "gồm có thông tin về trạng thái kiểu định dạng và gắn kết của mỗi phân vùng."
 
-#: using-d-i.xml:1191
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1275
+#, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
 "  IDE1 master (hda) - 6.4 GB WDC AC36400L\n"
@@ -2106,9 +2194,9 @@ msgstr ""
 "phân vùng đã hướng dẫn, nhưng nó có phải hiển thị trường hợp khác\n"
 "có thể được đạt khi tự phân vùng."
 
-#: using-d-i.xml:1204
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1288
+#, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
 "generated partition table, you can choose <guimenuitem>Finish partitioning "
@@ -2127,21 +2215,15 @@ msgstr ""
 "đổi các thay đổi đã đề nghị (như được diễn tả bên dưới) cho việc tự phân "
 "vùng."
 
-#: using-d-i.xml:1218
-#, no-c-format
 #. Tag: title
+#: using-d-i.xml:1302
+#, no-c-format
 msgid "Manual Partitioning"
 msgstr "Phân vùng bằng tay"
 
-#: using-d-i.xml:1219
-#, no-c-format
 #. Tag: para
-#| msgid ""
-#| "A similar screen to the one shown just above will be displayed if you "
-#| "choose manual partitioning except that your existing partition table will "
-#| "be shown and without the mount points. How to manually set up your "
-#| "partition table and the usage of partitions by your new Debian system "
-#| "will be covered in the remainder of this section."
+#: using-d-i.xml:1303
+#, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
 "manual partitioning except that your existing partition table will be shown "
@@ -2149,11 +2231,15 @@ msgid ""
 "and the usage of partitions by your new &debian; system will be covered in "
 "the remainder of this section."
 msgstr ""
-"Một màn hình tương tự với hình được hiển thị đúng trên đây sẽ được trình bày nếu bạn chọn phân vùng bằng tay, trừ là bảng phân vùng đã có sẽ được hiển thị mà không có điểm lắp. Phần còn lại của tiết đoạn này sẽ diễn tả cách thiết lập bằng tay bảng phân vùng và cách sử dụng phân vùng cho hệ thống &debian; mới."
+"Một màn hình tương tự với hình được hiển thị đúng trên đây sẽ được trình bày "
+"nếu bạn chọn phân vùng bằng tay, trừ là bảng phân vùng đã có sẽ được hiển "
+"thị mà không có điểm lắp. Phần còn lại của tiết đoạn này sẽ diễn tả cách "
+"thiết lập bằng tay bảng phân vùng và cách sử dụng phân vùng cho hệ thống "
+"&debian; mới."
 
-#: using-d-i.xml:1227
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1311
+#, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
 "it, you will be asked if a new partition table should be created (this is "
@@ -2165,9 +2251,9 @@ msgstr ""
 "mới). Sau đó, một dòng mới tên <quote>CHỖ TRỐNG</quote> nên xuất hiện trong "
 "bảng, bên dưới tên đĩa đã chọn."
 
-#: using-d-i.xml:1235
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1319
+#, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
 "partition. You will have to answer a quick series of questions about its "
@@ -2205,9 +2291,9 @@ msgstr ""
 "guimenuitem> rồi tiến trình sẽ trở về màn hình chính của <command>partman</"
 "command>."
 
-#: using-d-i.xml:1257
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1341
+#, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
 "select the partition, which will bring you to the partition configuration "
@@ -2226,9 +2312,9 @@ msgstr ""
 "trường hợp này là ít nhất fat16, fat32, ext2, ext3 và vùng trao đổi. Trình "
 "đơn này cũng cho bạn có khả năng xoá phân vùng."
 
-#: using-d-i.xml:1268
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1352
+#, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
 "emphasis> filesystem (which must be mounted as <filename>/</filename>) and "
@@ -2242,9 +2328,9 @@ msgstr ""
 "quên gắn kết hệ thống tập tin gốc, chương trình <command>partman</command> "
 "sẽ không cho phép bạn tiếp tục, cho đến khi bạn sửa trường hợp này."
 
-#: using-d-i.xml:1276
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1360
+#, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
 "command> will detect this and will not let you continue until you allocate "
@@ -2254,9 +2340,9 @@ msgstr ""
 "<command>partman</command> sẽ phát hiện lỗi này, không cho phép bạn tiếp "
 "tục, cho đến khi bạn cấp phát một điều."
 
-#: using-d-i.xml:1282
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1366
+#, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
 "modules, but are dependent on your system's architecture. So if you can't "
@@ -2270,9 +2356,9 @@ msgstr ""
 "mọi mô-đun cần thiết chưa (v.d. <filename>partman-ext3</filename>, "
 "<filename>partman-xfs</filename>, hay <filename>partman-lvm</filename>)."
 
-#: using-d-i.xml:1290
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1374
+#, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
 "partitioning and write changes to disk</guimenuitem> from the partitioning "
@@ -2284,15 +2370,15 @@ msgstr ""
 "vùng. Bạn sẽ xem bản tóm tắt các thay đổi trên đĩa, và được nhắc xác nhận "
 "các hệ thống tập tin nên được tạo như được yêu cầu."
 
-#: using-d-i.xml:1318
-#, no-c-format
 #. Tag: title
+#: using-d-i.xml:1402
+#, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "Cấu hình thiết bị đa đĩa (RAID phần mềm)"
 
-#: using-d-i.xml:1319
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1403
+#, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
 "construct an MD device even from partitions residing on single physical "
@@ -2310,9 +2396,9 @@ msgstr ""
 "<firstterm>Thiết bị Đa Đĩa</firstterm> (hoặc theo biến thể nổi tiếng nhất "
 "<firstterm>RAID phần mềm</firstterm>)."
 
-#: using-d-i.xml:1332
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1416
+#, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
 "combined together to form a <emphasis>logical</emphasis> device. This device "
@@ -2325,9 +2411,9 @@ msgstr ""
 "chương trình <command>partman</command> bạn có thể định dạng nó, gán điểm "
 "lắp v.v.)."
 
-#: using-d-i.xml:1340
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1424
+#, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
 "Currently supported are: <variablelist> <varlistentry> <term>RAID0</"
@@ -2436,152 +2522,143 @@ msgstr ""
 "tin cậy và sự thừa dư mà không cần tính chẵn lẻ. </para></listitem> </"
 "varlistentry> </variablelist> Để tóm tắt:"
 
-#: using-d-i.xml:1454
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1538
+#, no-c-format
 msgid "Type"
 msgstr "Kiểu"
 
-#: using-d-i.xml:1455
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1539
+#, no-c-format
 msgid "Minimum Devices"
 msgstr "Thiết bị tối thiểu"
 
-#: using-d-i.xml:1456
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1540
+#, no-c-format
 msgid "Spare Device"
 msgstr "Thiết bị phụ tùng"
 
-#: using-d-i.xml:1457
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1541
+#, no-c-format
 msgid "Survives disk failure?"
 msgstr "Vẫn còn hoạt động sau khi đĩa thất bại ?"
 
-#: using-d-i.xml:1458
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1542
+#, no-c-format
 msgid "Available Space"
 msgstr "Chỗ sẵn sàng"
 
-#: using-d-i.xml:1464
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1548
+#, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
-#: using-d-i.xml:1465
-#: using-d-i.xml:1473
-#: using-d-i.xml:1503
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
+#, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
-#: using-d-i.xml:1466
-#: using-d-i.xml:1467
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1550 using-d-i.xml:1551
+#, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>không</entry>"
 
-#: using-d-i.xml:1468
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1552
+#, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "Kích cỡ của phân vùng nhỏ nhất được nhân số thiết bị trong RAID"
 
-#: using-d-i.xml:1472
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1556
+#, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
-#: using-d-i.xml:1474
-#: using-d-i.xml:1482
-#: using-d-i.xml:1493
-#: using-d-i.xml:1504
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
+#, no-c-format
 msgid "optional"
 msgstr "tùy chọn"
 
-#: using-d-i.xml:1475
-#: using-d-i.xml:1483
-#: using-d-i.xml:1494
-#: using-d-i.xml:1505
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
+#, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>có</entry>"
 
-#: using-d-i.xml:1476
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1560
+#, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "Kích cỡ của phân vùng nhỏ nhất trong RAID"
 
-#: using-d-i.xml:1480
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1564
+#, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
-#: using-d-i.xml:1481
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1565
+#, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
-#: using-d-i.xml:1484
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1568
+#, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
 "minus one)"
 msgstr ""
 "Kích cỡ của phân vùng nhỏ nhất nhận lên (số thiết bị trong RAID trừ một)"
 
-#: using-d-i.xml:1491
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1575
+#, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
-#: using-d-i.xml:1492
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1576
+#, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
-#: using-d-i.xml:1495
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1579
+#, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
 "minus two)"
 msgstr ""
 "Kích cỡ của phân vùng nhỏ nhất nhận lên (số thiết bị trong RAID trừ hai)"
 
-#: using-d-i.xml:1502
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1586
+#, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
-#: using-d-i.xml:1506
-#, no-c-format
 #. Tag: entry
+#: using-d-i.xml:1590
+#, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
 "two)"
 msgstr "Tổng số các phiên bản chia cho số các bản sao đoạn (mặc định là hai)"
 
-#: using-d-i.xml:1513
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1597
+#, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
 "\"&url-software-raid-howto;\">Software RAID HOWTO</ulink>."
@@ -2589,9 +2666,9 @@ msgstr ""
 "Muốn biết thêm về RAID kiểu phần mềm, hãy xem tài liệu RAID phần mềm Thế Nào "
 "<ulink url=\"&url-software-raid-howto;\">Software RAID HOWTO</ulink>."
 
-#: using-d-i.xml:1518
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1602
+#, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
 "consist of marked for use in a RAID. (This is done in <command>partman</"
@@ -2605,9 +2682,9 @@ msgstr ""
 "<menuchoice> <guimenu>Dùng làm:</guimenu> <guimenuitem>khối tin vật lý cho "
 "RAID</guimenuitem> </menuchoice>.)"
 
-#: using-d-i.xml:1527
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1611
+#, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
 "planning. In general it will be necessary to create a separate file system "
@@ -2625,9 +2702,9 @@ msgstr ""
 "đánh sọc !), vì thế cũng có thể dùng (v.d.) RAID5 cho<filename>/</filename> "
 "và RAID1 cho <filename>/boot</filename>."
 
-#: using-d-i.xml:1539
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1623
+#, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
 "experience problems for some RAID levels and in combination with some "
@@ -2643,9 +2720,9 @@ msgstr ""
 "vấn đề như thế bằng cách tự thực hiện một số bước cấu hình hay cài đặt trong "
 "trình bao."
 
-#: using-d-i.xml:1548
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1632
+#, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
 "from the main <command>partman</command> menu. (The menu will only appear "
@@ -2665,9 +2742,9 @@ msgstr ""
 "các thiết bị đa đĩa được hỗ trợ, trong đó bạn nên chọn một thiết bị (v.d. "
 "RAID1). Kết quả phụ thuộc vào kiểu thiết bị đa đĩa bạn đã chọn."
 
-#: using-d-i.xml:1561
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1645
+#, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
 "partitions and your only task is to select the partitions which will form "
@@ -2677,9 +2754,9 @@ msgstr ""
 "và công việc duy nhất của bạn là việc chọn những phân vùng sẽ tạo thành "
 "thiết bị đa đĩa."
 
-#: using-d-i.xml:1568
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1652
+#, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
 "active devices and the number of spare devices which will form the MD. Next, "
@@ -2697,9 +2774,9 @@ msgstr ""
 "nếu bạn làm lỗi, chọn số phân vùng khác, &d-i; không cho phép bạn tiếp tục "
 "cho đến khi bạn sửa vấn đề."
 
-#: using-d-i.xml:1580
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1664
+#, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
 "need to use at least <emphasis>three</emphasis> active partitions."
@@ -2707,9 +2784,9 @@ msgstr ""
 "RAID5 có thủ tục thiết lập tương tự với RAID1, trừ bạn cần phải sử dụng ít "
 "nhất <emphasis>ba</emphasis> phân vùng hoạt động."
 
-#: using-d-i.xml:1586
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1670
+#, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
 "<emphasis>four</emphasis> active partitions are required."
@@ -2717,9 +2794,9 @@ msgstr ""
 "RAID6 có thủ tục thiết lập tương tự với RAID1, trừ bạn cần thiết ít nhất "
 "<emphasis>bốn</emphasis> phân vùng hoạt động."
 
-#: using-d-i.xml:1592
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1676
+#, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
 "In expert mode, &d-i; will ask you for the layout. The layout has two parts. "
@@ -2736,9 +2813,9 @@ msgstr ""
 "hiệu số). Phần sau là số các bản sao dữ liệu cần làm. Số này không thể vượt "
 "quá số các thiết bị hoạt động, để phân phối mỗi bản sao trên một đĩa riêng."
 
-#: using-d-i.xml:1606
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1690
+#, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
 "if you have three 200 GB hard drives dedicated to MD, each containing two "
@@ -2754,9 +2831,9 @@ msgstr ""
 "và sử dụng ba phân vùng khác (2 hoạt động và 1 phụ tùng) như là RAID1 (phân "
 "vùng 100 GB hơi đáng tin cậy cho <filename>/home</filename>)."
 
-#: using-d-i.xml:1615
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1699
+#, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
 "guimenuitem> <command>mdcfg</command> to return back to the "
@@ -2768,15 +2845,15 @@ msgstr ""
 "<command>partman</command>, để tạo hệ thống tập tin trên các thiết bị đa đĩa "
 "mới, và gán cho chúng những thuộc tính thường như điểm lắp."
 
-#: using-d-i.xml:1630
-#, no-c-format
 #. Tag: title
+#: using-d-i.xml:1714
+#, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "Cấu hình Bộ Quản lý Khối Tin Hợp Lý (LVM)"
 
-#: using-d-i.xml:1631
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1715
+#, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
 "<quote>advanced</quote> user, you have surely seen the situation where some "
@@ -2790,9 +2867,9 @@ msgstr ""
 "khác nào được dùng rất ít, nên bạn phải quản lý trường hợp đó bằng cách di "
 "chuyển các thứ, tạo liên kết tượng trưng v.v."
 
-#: using-d-i.xml:1639
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1723
+#, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
 "Simply said, with LVM you can combine your partitions (<firstterm>physical "
@@ -2810,9 +2887,9 @@ msgstr ""
 "Điểm có ích là khối tin hợp lý (và các nhóm khối tin cơ sở) có thể chiều dài "
 "qua vài đĩa vật lý."
 
-#: using-d-i.xml:1649
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1733
+#, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
 "filename> partition, you can simply add a new 300GB disk to the computer, "
@@ -2830,9 +2907,9 @@ msgstr ""
 "hạn. (Mẫu này là hơi đơn giản.) Có thông tin chi tiết trong tài liệu LVM Thế "
 "Nào <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>."
 
-#: using-d-i.xml:1660
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1744
+#, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
 "<command>partman</command>. First, you have to mark the partition(s) to be "
@@ -2847,9 +2924,9 @@ msgstr ""
 "<menuchoice> <guimenu>Dùng làm:</guimenu> <guimenuitem>khối tin vật lý cho "
 "LVM</guimenuitem> </menuchoice>.)"
 
-#: using-d-i.xml:1669
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1753
+#, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
 "a new option <guimenuitem>Configure the Logical Volume Manager</"
@@ -2866,9 +2943,9 @@ msgstr ""
 "đơn có hiển thị một bản tóm tắt cấu hình LVM. Trình đơn chính nó tùy thuộc "
 "ngữ cảnh, chỉ hiển thị những hành động hợp lệ. Những hành động có thể là:"
 
-#: using-d-i.xml:1680
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1764
+#, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
 "structure, names and sizes of logical volumes and more"
@@ -2876,45 +2953,45 @@ msgstr ""
 "<guimenuitem>Hiển thị chi tiết cấu hình</guimenuitem>: hiển thị cấu trúc "
 "thiết bị LVM, các tên và kích cỡ của khối tin hợp lý, v.v."
 
-#: using-d-i.xml:1685
-#, no-c-format
 #. Tag: guimenuitem
+#: using-d-i.xml:1769
+#, no-c-format
 msgid "Create volume group"
 msgstr "Tạo nhóm khối tin"
 
-#: using-d-i.xml:1688
-#, no-c-format
 #. Tag: guimenuitem
+#: using-d-i.xml:1772
+#, no-c-format
 msgid "Create logical volume"
 msgstr "Tạo khối tin hợp lệ"
 
-#: using-d-i.xml:1691
-#, no-c-format
 #. Tag: guimenuitem
+#: using-d-i.xml:1775
+#, no-c-format
 msgid "Delete volume group"
 msgstr "Xóa nhóm khối tin"
 
-#: using-d-i.xml:1694
-#, no-c-format
 #. Tag: guimenuitem
+#: using-d-i.xml:1778
+#, no-c-format
 msgid "Delete logical volume"
 msgstr "Xóa khối tin hợp lệ"
 
-#: using-d-i.xml:1697
-#, no-c-format
 #. Tag: guimenuitem
+#: using-d-i.xml:1781
+#, no-c-format
 msgid "Extend volume group"
 msgstr "Kéo dài nhóm khối tin"
 
-#: using-d-i.xml:1700
-#, no-c-format
 #. Tag: guimenuitem
+#: using-d-i.xml:1784
+#, no-c-format
 msgid "Reduce volume group"
 msgstr "Giảm nhóm khối tin"
 
-#: using-d-i.xml:1702
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1786
+#, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
 "command> screen"
@@ -2922,9 +2999,9 @@ msgstr ""
 "<guimenuitem>Kết thúc</guimenuitem>: trở về màn hình <command>partman</"
 "command> chính"
 
-#: using-d-i.xml:1708
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1792
+#, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
 "your logical volumes inside it."
@@ -2932,9 +3009,9 @@ msgstr ""
 "Hãy sử dụng những tùy chọn trong trình đơn đó để tạo một nhóm khối tin, rồi "
 "tạo các khối tin hợp lý bên trong nó."
 
-#: using-d-i.xml:1713
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1797
+#, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
 "logical volumes will be displayed in the same way as ordinary partitions "
@@ -2944,15 +3021,15 @@ msgstr ""
 "hợp lý đã tạo nào sẽ được hiển thị đúng như phân vùng chuẩn (bạn cũng nên "
 "thao tác nó như vậy)."
 
-#: using-d-i.xml:1727
-#, no-c-format
 #. Tag: title
+#: using-d-i.xml:1811
+#, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "Cấu hình khối tin được mật mã"
 
-#: using-d-i.xml:1728
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1812
+#, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
 "such a partition is immediately saved to the device in encrypted form. "
@@ -2972,9 +3049,9 @@ msgstr ""
 "cụm từ mật khẩu đúng, dữ liệu nằm trên đĩa cứng sẽ hình như ký tự ngẫu nhiên "
 "thôi."
 
-#: using-d-i.xml:1740
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1824
+#, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
 "your private data resides, and the swap partition, where sensitive data "
@@ -2998,9 +3075,9 @@ msgstr ""
 "boot</filename> (khởi động) mà phải còn lại không được mật mã, vì hiện thời "
 "không có khả năng tải hạt nhân từ phân vùng được mật mã."
 
-#: using-d-i.xml:1755
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1839
+#, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
 "that of unencrypted ones because the data needs to be decrypted or encrypted "
@@ -3012,9 +3089,9 @@ msgstr ""
 "ghi. Tác động hiệu suất phụ thuộc vào tốc độ của CPU, kiểu mật mã và độ dài "
 "của khoá."
 
-#: using-d-i.xml:1762
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1846
+#, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
 "space in the main partitioning menu. Another option is to choose an existing "
@@ -3033,9 +3110,9 @@ msgstr ""
 "menuchoice>. Trình đơn lúc đó thay đổi để hiển thị vài tùy chọn mật mã cho "
 "phân vùng đó."
 
-#: using-d-i.xml:1773
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1857
+#, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
 "<firstterm>dm-crypt</firstterm> (included in newer Linux kernels, able to "
@@ -3049,9 +3126,9 @@ msgstr ""
 "(cũ hơn, được bảo tồn riêng với cây hạt nhân Linux). Khuyên bạn dùng phương "
 "pháp mặc định, nếu bạn không bắt buộc phải làm khác."
 
-#: using-d-i.xml:1785
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1869
+#, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
 "<userinput>Device-mapper (dm-crypt)</userinput> as the encryption method. As "
@@ -3063,15 +3140,15 @@ msgstr ""
 "định, khi bạn chưa chắc, vì mỗi giá trị mặc định đã được chọn cẩn thận tùy "
 "theo bảo mật."
 
-#: using-d-i.xml:1795
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:1879
+#, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Mật mã: <userinput>aes</userinput>"
 
-#: using-d-i.xml:1797
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1881
+#, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
 "firstterm>) which will be used to encrypt the data on the partition. &d-i; "
@@ -3095,15 +3172,15 @@ msgstr ""
 "thuật toán mật mã tiêu chuẩn để bảo vệ thông tin nhạy cảm trong thế kỷ thứ "
 "hai mươi mốt."
 
-#: using-d-i.xml:1815
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:1899
+#, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Dài khoá:<userinput>256</userinput>"
 
-#: using-d-i.xml:1817
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1901
+#, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
 "size, the strength of the encryption is generally improved. On the other "
@@ -3114,15 +3191,15 @@ msgstr ""
 "mật mã mạnh hơn. Mặt khác, khoá dài hơn thường cũng giảm hiệu suất. Những độ "
 "dài khoá sẵn sàng phụ thuộc vào thuật toán mật mã."
 
-#: using-d-i.xml:1829
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:1913
+#, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "Thuật toán IV: <userinput>cbc-essiv:sha256</userinput>"
 
-#: using-d-i.xml:1831
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1915
+#, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
 "firstterm> algorithm is used in cryptography to ensure that applying the "
@@ -3137,9 +3214,9 @@ msgstr ""
 "<firstterm>đoạn mật mã</firstterm> duy nhất. Mục đích là chặn người tấn công "
 "suy luận thông tin nào ra mẫu xảy ra nhiều lần trong dữ liệu đã mật mã."
 
-#: using-d-i.xml:1841
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1925
+#, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
 "userinput> is currently the least vulnerable to known attacks. Use the other "
@@ -3151,27 +3228,27 @@ msgstr ""
 "khi bạn cần phải chắc là tương thích với hệ thống được cài đặt trước mà "
 "không có khả năng dùng thuật toán mới hơn."
 
-#: using-d-i.xml:1853
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:1937
+#, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Khoá mật mã: <userinput>Cụm từ mật khẩu</userinput>"
 
-#: using-d-i.xml:1855
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1939
+#, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "Ở đây bạn có thể chọn kiểu khoá mật mã cho phân vùng này."
 
-#: using-d-i.xml:1861
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:1945
+#, no-c-format
 msgid "Passphrase"
 msgstr "Cụm từ mật khẩu"
 
-#: using-d-i.xml:1862
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1946
+#, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
 "the key currently means that the partition will be set up using <ulink url="
@@ -3183,16 +3260,15 @@ msgstr ""
 "\">LUKS</ulink>. </para></footnote> dựa vào cụm từ mật khẩu bạn có thể nhập "
 "vào lúc sau trong tiến trình."
 
-#: using-d-i.xml:1877
-#: using-d-i.xml:1970
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:1961 using-d-i.xml:2054
+#, no-c-format
 msgid "Random key"
 msgstr "Khoá ngẫu nhiên"
 
-#: using-d-i.xml:1878
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1962
+#, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
 "bring up the encrypted partition. In other words: on every shutdown the "
@@ -3208,9 +3284,9 @@ msgstr ""
 "thuật toán mật mã không có sở đoản chưa được biết, sự tấn công kiểu này "
 "không thể thành công trong đời sống của bạn.)"
 
-#: using-d-i.xml:1887
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1971
+#, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
 "yourself with remembering the passphrase or wiping sensitive information "
@@ -3227,16 +3303,15 @@ msgstr ""
 "nhân Linux mới hơn cung cấp, vì không thể phục hồi dữ liệu được ngưng đã "
 "được ghi vào phân vùng trao đổi, khi khởi động lại."
 
-#: using-d-i.xml:1906
-#: using-d-i.xml:1983
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:1990 using-d-i.xml:2067
+#, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Xoá bỏ dữ liệu : <userinput>có</userinput>"
 
-#: using-d-i.xml:1908
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:1992
+#, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
 "random data before setting up the encryption. This is recommended because it "
@@ -3255,9 +3330,9 @@ msgstr ""
 "không thể phục hồi dữ liệu, ngay cả sau khi vật chứa quang từ bị ghi lại vài "
 "lần.</para></footnote>."
 
-#: using-d-i.xml:1928
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2012
+#, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
 "<guimenuitem>Loopback (loop-AES)</guimenuitem> </menuchoice>, the menu "
@@ -3267,15 +3342,15 @@ msgstr ""
 "guimenu><guimenuitem>Vòng lặp (loop-AES)</guimenuitem> </menuchoice>, trình "
 "đơn thay đổi để cung cấp những tùy chọn này:"
 
-#: using-d-i.xml:1937
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:2021
+#, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Mật mã: <userinput>AES256</userinput>"
 
-#: using-d-i.xml:1939
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2023
+#, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
 "combined, so you can select both at the same time. Please see the above "
@@ -3286,27 +3361,27 @@ msgstr ""
 "thông tin thêm, xem những tiết đoạn bên trên diễn tả thuật toán mật mã và độ "
 "dài khoá."
 
-#: using-d-i.xml:1949
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:2033
+#, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Khoá mật mã: <userinput>Tập tin khoá (GnuPG)</userinput>"
 
-#: using-d-i.xml:1951
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2035
+#, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "Ở đây bạn có thể chọn kiểu mật mã cho phân vùng này."
 
-#: using-d-i.xml:1957
-#, no-c-format
 #. Tag: term
+#: using-d-i.xml:2041
+#, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Tập tin khoá (GnuPG)"
 
-#: using-d-i.xml:1958
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2042
+#, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
 "installation. Moreover this key will be encrypted with <application>GnuPG</"
@@ -3318,21 +3393,21 @@ msgstr ""
 "bạn cần phải nhập cụm từ mật khẩu đúng (bạn sẽ được nhắc cung cấp một điều "
 "vào lúc sau trong tiến trình)."
 
-#: using-d-i.xml:1971
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2055
+#, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "Xem phần bên trên diễn tả khoá ngẫu nhiên."
 
-#: using-d-i.xml:1985
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2069
+#, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "Xem tiết đoạn bên trên diễn tả cách xoá sạch dữ liệu."
 
-#: using-d-i.xml:1994
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2078
+#, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
 "partitions, return back to the main partitioning menu. There should now be a "
@@ -3348,9 +3423,9 @@ msgstr ""
 "xoá sạch, cũng có lẽ một số hành động khác, như việc ghi một bảng phân vùng "
 "mới. Đối với phân vùng lớn, có thể kéo dài một lát."
 
-#: using-d-i.xml:2004
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2088
+#, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
 "use one. Good passphrases should be longer than 8 characters, should be a "
@@ -3367,9 +3442,9 @@ msgstr ""
 "bè): không chứa từ nào chương trình có thể tìm kiếm hoặc người khác có thể "
 "đoán.</para></listitem> </itemizedlist>"
 
-#: using-d-i.xml:2013
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2097
+#, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
 "keyboard is configured correctly and generates the expected characters. If "
@@ -3392,9 +3467,9 @@ msgstr ""
 "khẩu cho hệ thống tập tin gốc. Khuyên bạn luôn luôn kiểm tra xem bố trí bàn "
 "phím nào được dùng, trước khi nhập mật khẩu kiểu nào."
 
-#: using-d-i.xml:2026
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2110
+#, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
 "keys, they will be generated now. Because the kernel may not have gathered a "
@@ -3414,9 +3489,9 @@ msgstr ""
 "tin, nạp tập tin lớn vào <filename>/dev/null</filename>). Tiến trình này "
 "được lặp lại cho mỗi phân vùng cần mật mã."
 
-#: using-d-i.xml:2042
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2126
+#, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
 "volumes as additional partitions which can be configured in the same way as "
@@ -3447,9 +3522,9 @@ msgstr ""
 "tin, và tùy chọn thay đổi các kiểu hệ thống nếu giá trị mặc định chưa thích "
 "hợp."
 
-#: using-d-i.xml:2055
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2139
+#, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
 "replaceable> and <replaceable>loop0</replaceable> in this case) and the "
@@ -3465,23 +3540,23 @@ msgstr ""
 "quá trình khởi động tiêu chuẩn và quá trình khởi động cũng mật mã sẽ được "
 "giải thích trong <xref linkend=\"mount-encrypted-volumes\"/>."
 
-#: using-d-i.xml:2065
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2149
+#, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
 "installation."
 msgstr "Một khi bạn thấy sơ đồ phân vùng là ổn thoả, hãy tiếp tục cài đặt."
 
-#: using-d-i.xml:2076
-#, no-c-format
 #. Tag: title
+#: using-d-i.xml:2160
+#, no-c-format
 msgid "Installing the Base System"
 msgstr "Cài đặt Hệ thống Cơ bản"
 
-#: using-d-i.xml:2077
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2161
+#, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
 "fraction of the install because it downloads, verifies and unpacks the whole "
@@ -3493,9 +3568,9 @@ msgstr ""
 "Nếu máy tính hay sự kết nối mạng của bạn có chạy chậm, giai đoạn này có thể "
 "kéo dài một lát."
 
-#: using-d-i.xml:2090
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2174
+#, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
 "are redirected to <userinput>tty4</userinput>. You can access this terminal "
@@ -3509,9 +3584,9 @@ msgstr ""
 "keycap><keycap>F4</keycap></keycombo>, và lùi lại về tiến trình cài đặt "
 "chính bằng <keycombo><keycap>Alt trái</keycap><keycap>F1</keycap></keycombo>."
 
-#: using-d-i.xml:2099
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2183
+#, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
 "<filename>/var/log/syslog</filename>. You can check them there if the "
@@ -3522,9 +3597,9 @@ msgstr ""
 "có khả năng kiểm tra những thông điệp ở đó nếu tiến trình cài đặt được chạy "
 "qua bàn giao tiếp nối tiếp."
 
-#: using-d-i.xml:2105
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2189
+#, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
 "the default priority, the installer will choose one for you that best "
@@ -3536,9 +3611,9 @@ msgstr ""
 "cứng của bạn. Trong chế độ ưu tiên thấp hơn, bạn có khả năng chọn trong danh "
 "sách các hạt nhân có sẵn."
 
-#: using-d-i.xml:2112
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2196
+#, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
 "default also install packages that are recommended by those packages. "
@@ -3553,9 +3628,9 @@ msgstr ""
 "phải tăng cường phần mềm đó thì (theo ý kiến của nhà duy trì gói) bình "
 "thường nên được cài đặt cùng với phần mềm đó."
 
-#: using-d-i.xml:2122
-#, no-c-format
 #. Tag: para
+#: using-d-i.xml:2206
+#, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
 "system are installed without their <quote>Recommends</quote>. The rule "
@@ -3566,143 +3641,15 @@ msgstr ""
 "thì được cài đặt mà không có các gói <quote>Khuyến khích</quote> tương ứng. "
 "Quy tắc nêu trên chỉ có hiệu lực sau thời điểm này trong quá trình cài đặt."
 
-#: using-d-i.xml:2134
-#, no-c-format
-#. Tag: title
-msgid "Setting Up Users And Passwords"
-msgstr "Thiết lập Người và Mật khẩu"
-
-#: using-d-i.xml:2135
-#, no-c-format
-#. Tag: para
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"Sau khi cài đặt hệ thống cơ bản, trình cài đặt sẽ cho phép bạn thiết lập tài "
-"khoản <quote>người chủ</quote> và/hay một tài khoản cho người dùng thứ nhất. "
-"Các tài khoản người dùng khác có thể được tạo sau khi cài đặt xong."
-
-#: using-d-i.xml:2149
-#, no-c-format
-#. Tag: title
-msgid "Set the Root Password"
-msgstr "Đặt mật khẩu chủ"
-
-#: using-d-i.xml:2153
-#, no-c-format
-#. Tag: para
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"Tài khoản <emphasis>chủ</emphasis> (root) cũng được gọi là <emphasis>siêu "
-"người dùng</emphasis>; nó là cách đăng nhập mà đi qua toàn bộ sự bảo vệ bảo "
-"mật trên máy tính. Tài khoản chủ nên được dùng chỉ để quản trị hệ thống, và "
-"trong thời lượng càng ngắn càng có thể."
-
-#: using-d-i.xml:2161
-#, no-c-format
-#. Tag: para
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"Mỗi mật khẩu bạn tạo phải chứa ít nhất 6 ký tự (nhiều hơn là mạnh hơn), gồm "
-"chữ cả hoa lẫn thường, cùng với ký tự chấm câu. Hãy rất cẩn thận khi đặt mật "
-"khẩu chủ (root) vì tài khoản đó có nhiều quyền quan trọng. Bạn nên tránh "
-"chọn từ nằm trong bất kỳ từ điển hay thông tin cá nhân có thể được đoán."
-
-#: using-d-i.xml:2169
-#, no-c-format
-#. Tag: para
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"Nếu người nào xin mật khẩu chủ của bạn, hãy rất cẩn thận. Bình thường, đừng "
-"cho ai biết mật khẩu chủ, trừ bạn quản lý máy có nhiều quản trị hệ thống."
-
-#: using-d-i.xml:2179
-#, no-c-format
 #. Tag: title
-msgid "Create an Ordinary User"
-msgstr "Tạo người dùng chuẩn"
-
-#: using-d-i.xml:2181
-#, no-c-format
-#. Tag: para
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"Hệ thống sẽ hỏi nếu bạn muốn tạo một tài khoản người dùng chuẩn tại điểm "
-"thời này. Tài khoản này nên là sự đăng nhập cá nhân chính của bạn. Bạn "
-"<emphasis>không</emphasis> nên dùng tài khoản người chủ để làm việc hàng "
-"ngày hay như là sự đăng nhập cá nhân."
-
-#: using-d-i.xml:2190
-#, no-c-format
-#. Tag: para
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"Tại sao không? Một lý do là để tránh sử dụng các quyền của người chủ, vì các "
-"quyền này làm cho rất dễ dàng làm hại không thể sửa chữa. Một lý do khác là "
-"bạn có thể bị mắc mưu chạy chương trình <emphasis>Trojan</emphasis> mà nhớ "
-"dịp các quyền của siêu người dùng để hại thậm sự bảo mật của hệ thống bạn "
-"một cách bí mật. Bất kỳ cuốn sách tốt về cách quản lý hệ thống UNIX sẽ diễn "
-"tả chủ đề này bằng chi tiết: đề nghị bạn đọc nó nếu bạn chưa quen với vấn đề "
-"này."
-
-#: using-d-i.xml:2200
-#, no-c-format
-#. Tag: para
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"Trước tiên, bạn sẽ được nhắc nhập họ tên của người dùng. Sau đó, bạn cần "
-"nhập tên của tài khoản người dùng, như tên của bạn hay tên riêng khác nào "
-"(tên của bạn là giá trị mặc định). Cuối cùng, bạn nên nhập mật khẩu dành cho "
-"tài khoản này."
-
-#: using-d-i.xml:2207
-#, no-c-format
-#. Tag: para
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"Nếu tại bất kỳ điểm thời sau khi cài đặt, bạn muốn tạo tài khoản thêm, hãy "
-"sử dụng lệnh <command>adduser</command> (thêm người dùng)."
-
 #: using-d-i.xml:2218
 #, no-c-format
-#. Tag: title
 msgid "Installing Additional Software"
 msgstr "Cài đặt phần mềm thêm"
 
+#. Tag: para
 #: using-d-i.xml:2219
 #, no-c-format
-#. Tag: para
 msgid ""
 "At this point you have a usable but limited system. Most users will want to "
 "install additional software on the system to tune it to their needs, and the "
@@ -3715,15 +3662,15 @@ msgstr ""
 "đó. Bước này có thể mất ngay cả lâu hơn tiến trình cài đặt hệ thống cơ bản "
 "nếu máy tính hay mạng có chạy chậm."
 
+#. Tag: title
 #: using-d-i.xml:2234
 #, no-c-format
-#. Tag: title
 msgid "Configuring apt"
 msgstr "Cấu hình apt"
 
+#. Tag: para
 #: using-d-i.xml:2236
 #, no-c-format
-#. Tag: para
 msgid ""
 "One of the tools used to install packages on a &debian-gnu; system is a "
 "program called <command>apt-get</command>, from the <classname>apt</"
@@ -3755,9 +3702,9 @@ msgstr ""
 "đẹp và dễ dùng. <command>aptitude</command> đặc biệt là tiện ích quản lý gói "
 "khuyến khích."
 
+#. Tag: para
 #: using-d-i.xml:2260
 #, no-c-format
-#. Tag: para
 msgid ""
 "<command>apt</command> must be configured so that it knows from where to "
 "retrieve packages. The results of this configuration are written to the file "
@@ -3769,9 +3716,9 @@ msgstr ""
 "apt/sources.list</filename>, và bạn có thể xem lại nó và sửa đổi nó sau khi "
 "cài đặt xong."
 
+#. Tag: para
 #: using-d-i.xml:2267
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing at default priority, the installer will largely take "
 "care of the configuration automatically, based on the installation method "
@@ -3787,9 +3734,9 @@ msgstr ""
 "phát hành ổn định, một máy nhân bản cho dịch vụ cập nhật <quote>volatile</"
 "quote>."
 
+#. Tag: para
 #: using-d-i.xml:2276
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing at a lower priority (e.g. in expert mode), you will be "
 "able to make more decisions yourself. You can choose whether or not to use "
@@ -3803,15 +3750,15 @@ msgstr ""
 "kho lưu <quote>contrib</quote> (đã cung cấp) và <quote>non-free</quote> "
 "(khác tự do)."
 
+#. Tag: title
 #: using-d-i.xml:2287
 #, no-c-format
-#. Tag: title
 msgid "Installing from more than one CD or DVD"
 msgstr "Cài đặt từ nhiều đĩa CD/DVD"
 
+#. Tag: para
 #: using-d-i.xml:2289
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing from a CD or a DVD that is part of a larger set, the "
 "installer will ask if you want to scan additional CDs or DVDs. If you have "
@@ -3822,9 +3769,9 @@ msgstr ""
 "bạn muốn quét thêm đĩa CD/DVD. Quét đi để làm cho sẵn sàng những gói bổ sung "
 "trên các đĩa đó."
 
+#. Tag: para
 #: using-d-i.xml:2296
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you do not have any additional CDs or DVDs, that is no problem: using "
 "them is not required. If you also do not use a network mirror (as explained "
@@ -3836,9 +3783,9 @@ msgstr ""
 "hợp này có thể nghĩa là không phải tất cả các gói thuộc về những tác vụ bạn "
 "chọn trong bước kế tiếp của tiến trình cài đặt thực sự có thể được cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:2304
 #, no-c-format
-#. Tag: para
 msgid ""
 "Packages are included on CDs (and DVDs) in the order of their popularity. "
 "This means that for most uses only the first CDs in a set are needed and "
@@ -3849,9 +3796,9 @@ msgstr ""
 "trong hậu hết trường hợp đều, chỉ cần thiết vài đĩa CD đầu tiên: rất ít "
 "người thực sự dùng những gói nằm trong vài đĩa CD cuối cùng trong tập hợp."
 
+#. Tag: para
 #: using-d-i.xml:2311
 #, no-c-format
-#. Tag: para
 msgid ""
 "It also means that buying or downloading and burning a full CD set is just a "
 "waste of money as you'll never use most of them. In most cases you are "
@@ -3866,9 +3813,9 @@ msgstr ""
 "đĩa DVD đầu tiên, hoặc có lẽ hai đĩa DVD đầu tiên, sẽ cung cấp tất cả các "
 "gói cần thiết."
 
+#. Tag: para
 #: using-d-i.xml:2320
 #, no-c-format
-#. Tag: para
 msgid ""
 "A good rule of thumb is that for a regular desktop installation (using the "
 "GNOME desktop environment) only the first three CDs are needed. For the "
@@ -3880,9 +3827,9 @@ msgstr ""
 "trường làm việc xen kẽ (KDE hoặc Xfce), cần có đĩa CD thêm. Đĩa DVD đầu tiên "
 "chứa cả ba môi trường làm việc này."
 
+#. Tag: para
 #: using-d-i.xml:2328
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you do scan multiple CDs or DVDs, the installer will prompt you to "
 "exchange them when it needs packages from another CD/DVD than the one "
@@ -3896,15 +3843,15 @@ msgstr ""
 "rằng chỉ những đĩa CD/DVD thuộc về cùng một tập hợp nên được quét. Thứ tự "
 "quét không quan trọng, nhưng quét theo thứ tự tăng dần sẽ giảm dịp bị lỗi."
 
+#. Tag: title
 #: using-d-i.xml:2341
 #, no-c-format
-#. Tag: title
 msgid "Using a network mirror"
 msgstr "Sử dụng máy nhân bản mạng"
 
+#. Tag: para
 #: using-d-i.xml:2343
 #, no-c-format
-#. Tag: para
 msgid ""
 "One question that will be asked during most installs is whether or not to "
 "use a network mirror as a source for packages. In most cases the default "
@@ -3914,9 +3861,9 @@ msgstr ""
 "nhân bản mạng làm nguồn gói, hay không. Trong phần lớn trường hợp, trả lời "
 "mặc định là tốt, nhưng vẫn có một số ngoại lệ."
 
+#. Tag: para
 #: using-d-i.xml:2349
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
 "using a full CD/DVD image, you really should use a network mirror as "
@@ -3932,9 +3879,9 @@ msgstr ""
 "emphasis> phải chọn tác vụ lớn <literal>mì trường làm việc</literal> trong "
 "bước tiếp theo của tiến trình cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:2358
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing from a single full CD or using a full CD image, using "
 "a network mirror is not required, but is still strongly recommended because "
@@ -3953,9 +3900,9 @@ msgstr ""
 "trên sự tuyển chọn sau khi cài đặt xong (tức là sau khi bạn khởi động vào hệ "
 "thống mới)."
 
+#. Tag: para
 #: using-d-i.xml:2369
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing from a DVD or using a DVD image, any packages needed "
 "during the installation should be present on the first DVD. The same is true "
@@ -3967,9 +3914,9 @@ msgstr ""
 "bạn đã quét nhiều đĩa CD, như được diễn tả trong phần trước. Dùng máy nhân "
 "bản mạng vẫn là tùy chọn."
 
+#. Tag: para
 #: using-d-i.xml:2376
 #, no-c-format
-#. Tag: para
 msgid ""
 "One advantage of adding a network mirror is that updates that have occurred "
 "since the CD/DVD set was created and have been included in a point release, "
@@ -3982,9 +3929,9 @@ msgstr ""
 "DVD. Bản cập nhật như vậy thì mở rộng khả năng của tập hợp CD/DVD, mà không "
 "rủi ro bảo mật hay sự ổn định của hệ thống đã cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:2383
 #, no-c-format
-#. Tag: para
 msgid ""
 "In summary: selecting a network mirror is generally a good idea, except if "
 "you do not have a good Internet connection. If the current version of a "
@@ -3997,30 +3944,30 @@ msgstr ""
 "sẵn sàng trên đĩa CD/DVD, trình cài đặt lúc nào sẽ cũng dùng nó. Số lượng dữ "
 "liệu được tải xuống nếu bạn có phải chọn máy nhân bản thì phụ thuộc vào"
 
+#. Tag: para
 #: using-d-i.xml:2392
 #, no-c-format
-#. Tag: para
 msgid "the tasks you select in the next step of the installation,"
 msgstr "những tác vụ bạn chọn trong bước tiếp theo của tiến trình cài đặt,"
 
+#. Tag: para
 #: using-d-i.xml:2397
 #, no-c-format
-#. Tag: para
 msgid "which packages are needed for those tasks,"
 msgstr "những gói nào cần thiết cho các tác vụ đó,"
 
+#. Tag: para
 #: using-d-i.xml:2402
 #, no-c-format
-#. Tag: para
 msgid ""
 "which of those packages are present on the CDs or DVDs you have scanned, and"
 msgstr ""
 "những gói nào của các gói đó vẫn còn nằm trên những đĩa CD/DVD bạn đã quét, "
 "và"
 
+#. Tag: para
 #: using-d-i.xml:2407
 #, no-c-format
-#. Tag: para
 msgid ""
 "whether any updated versions of packages included on the CDs or DVDs are "
 "available from a mirror (either a regular package mirror, or a mirror for "
@@ -4030,9 +3977,9 @@ msgstr ""
 "nhân bản (hoặc một máy nhân bản gói bình thường, hoặc một máy nhân cho bản "
 "cập nhật kiểu bảo mật hay dễ thay đổi)."
 
+#. Tag: para
 #: using-d-i.xml:2416
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that the last point means that, even if you choose not to use a network "
 "mirror, some packages may still be downloaded from the Internet if there is "
@@ -4044,15 +3991,15 @@ msgstr ""
 "một bản cập nhật kiểu bảo mật hay dễ thay đổi, và dịch vụ đó đã được cấu "
 "hình."
 
+#. Tag: title
 #: using-d-i.xml:2432
 #, no-c-format
-#. Tag: title
 msgid "Selecting and Installing Software"
 msgstr "Lựa chọn và Cài đặt Phần mềm"
 
+#. Tag: para
 #: using-d-i.xml:2434
 #, no-c-format
-#. Tag: para
 msgid ""
 "During the installation process, you are given the opportunity to select "
 "additional software to install. Rather than picking individual software "
@@ -4067,9 +4014,9 @@ msgstr ""
 "hợp phần mềm định sẵn để thiết lập nhanh máy tính của bạn để thực hiện nhiều "
 "tác vụ khác nhau."
 
+#. Tag: para
 #: using-d-i.xml:2443
 #, no-c-format
-#. Tag: para
 msgid ""
 "So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
 "then add on more individual packages later. These tasks loosely represent a "
@@ -4100,9 +4047,9 @@ msgstr ""
 "<xref linkend=\"tasksel-size-list\"/> xác định sức chứa cần thiết cho các "
 "công việc có sẵn."
 
+#. Tag: para
 #: using-d-i.xml:2470
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some tasks may be pre-selected based on the characteristics of the computer "
 "you are installing. If you disagree with these selections you can deselect "
@@ -4113,9 +4060,9 @@ msgstr ""
 "vẫn có khả năng bỏ chọn điều nào. Tại điểm thời này, bạn ngay cả có thể chọn "
 "không cài đặt gì cả."
 
+#. Tag: para
 #: using-d-i.xml:2477
 #, no-c-format
-#. Tag: para
 msgid ""
 "In the standard user interface of the installer, you can use the space bar "
 "to toggle selection of a task."
@@ -4123,9 +4070,9 @@ msgstr ""
 "Trong giao diện người dùng chuẩn của trình cài đặt, bạn có thể sử dụng phím "
 "dài để (bỏ) chọn công việc nào."
 
+#. Tag: para
 #: using-d-i.xml:2483
 #, no-c-format
-#. Tag: para
 msgid ""
 "Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
 "environment</quote> task will install the GNOME desktop environment."
@@ -4133,9 +4080,9 @@ msgstr ""
 "Nếu bạn không dùng đĩa CD đặc biệt cho KDE hay Xfce/LXDE, công việc "
 "<quote>Môi trường làm việc</quote> sẽ cài đặt môi trường làm việc GNOME."
 
+#. Tag: para
 #: using-d-i.xml:2488
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is not possible to interactively select a different desktop during the "
 "installation. However, it <emphasis>is</emphasis> possible to get &d-i; to "
@@ -4154,9 +4101,9 @@ msgstr ""
 "chọn môi trường làm việc nhỏ gọn hơn Xfce hay LXDE bằng cách đặt "
 "<literal>desktop=xfce</literal> hay <literal>desktop=lxde</literal>."
 
+#. Tag: para
 #: using-d-i.xml:2499
 #, no-c-format
-#. Tag: para
 msgid ""
 "Some CD images (businesscard, netinst and DVD) also allow selection of the "
 "desired desktop environment from the graphical boot menu. Select the "
@@ -4168,9 +4115,9 @@ msgstr ""
 "động kiểu đồ họa. Hãy chọn mục <quote>Tuỳ chọn cấp cao</quote> trong trình "
 "đơn chính và tìm <quote>Môi trường làm việc xen kẽ</quote>."
 
+#. Tag: para
 #: using-d-i.xml:2506
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that this will only work if the packages needed for the desired desktop "
 "environment are actually available. If you are installing using a single "
@@ -4186,9 +4133,9 @@ msgstr ""
 "Xfce hay LXDE bằng cách này nên có tác động nếu bạn đang cài đặt từ một đĩa "
 "DVD, hoặc bất kỳ phương pháp cài đặt khác nào."
 
+#. Tag: para
 #: using-d-i.xml:2516
 #, no-c-format
-#. Tag: para
 msgid ""
 "The various server tasks will install software roughly as follows. DNS "
 "server: <classname>bind9</classname>; File server: <classname>samba</"
@@ -4206,9 +4153,9 @@ msgstr ""
 "classname>; Cơ sở dữ liệu SQL: <classname>postgresql</classname>; Trình phục "
 "vụ Mạng: <classname>apache2</classname>."
 
+#. Tag: para
 #: using-d-i.xml:2527
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <quote>Standard system</quote> task will install any package that has a "
 "priority <quote>standard</quote>. This includes a lot of common utilities "
@@ -4221,9 +4168,9 @@ msgstr ""
 "dùng mà bình thường sẵn sàng trên bất cứ hệ thống Linux/UNIX nào. Không tắt "
 "công việc này nếu bạn không biết cách sử dụng."
 
+#. Tag: para
 #: using-d-i.xml:2535
 #, no-c-format
-#. Tag: para
 msgid ""
 "If during language selection a default locale other than the <quote>C</"
 "quote> locale was selected, <command>tasksel</command> will check if any "
@@ -4241,9 +4188,9 @@ msgstr ""
 "bạn. Nếu một môi trường làm việc được chọn thì cũng cài đặt các gói địa "
 "phương hoá thích hợp (nếu có)."
 
+#. Tag: para
 #: using-d-i.xml:2545
 #, no-c-format
-#. Tag: para
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
 "<command>aptitude</command> will install the packages that are part of the "
@@ -4255,9 +4202,9 @@ msgstr ""
 "chọn. Nếu một chưng trình nào đó cần thêm thông tin từ người dùng, nó sẽ "
 "nhắc bạn trong quá trình này."
 
+#. Tag: para
 #: using-d-i.xml:2552
 #, no-c-format
-#. Tag: para
 msgid ""
 "You should be aware that especially the Desktop task is very large. "
 "Especially when installing from a normal CD-ROM in combination with a mirror "
@@ -4272,9 +4219,9 @@ msgstr ""
 "chậm thì việc này mất nhiều thời gian. Không có tùy chọn dừng chạy tiến "
 "trình cài đặt gói một khi khởi chạy được."
 
+#. Tag: para
 #: using-d-i.xml:2561
 #, no-c-format
-#. Tag: para
 msgid ""
 "Even when packages are included on the CD-ROM, the installer may still "
 "retrieve them from the mirror if the version available on the mirror is more "
@@ -4290,15 +4237,15 @@ msgstr ""
 "chính). Còn nếu bạn đang cài đặt bản phân phối thử ra (testing), nó có thể "
 "xảy ra nếu bạn sử dụng ảnh cũ."
 
+#. Tag: title
 #: using-d-i.xml:2576
 #, no-c-format
-#. Tag: title
 msgid "Making Your System Bootable"
 msgstr "Cho hệ thống khả năng khởi động"
 
+#. Tag: para
 #: using-d-i.xml:2578
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you are installing a diskless workstation, obviously, booting off the "
 "local disk isn't a meaningful option, and this step will be skipped. <phrase "
@@ -4310,21 +4257,15 @@ msgstr ""
 "OpenBoot khởi động qua mạng theo mặc định; xem <xref linkend=\"boot-dev-"
 "select-sun\"/>.</phrase>"
 
+#. Tag: title
 #: using-d-i.xml:2593
 #, no-c-format
-#. Tag: title
 msgid "Detecting other operating systems"
 msgstr "Phát hiện hệ điều hành khác"
 
+#. Tag: para
 #: using-d-i.xml:2595
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Before a boot loader is installed, the installer will attempt to probe "
-#| "for other operating systems which are installed on the machine. If it "
-#| "finds a supported operating system, you will be informed of this during "
-#| "the boot loader installation step, and the computer will be configured to "
-#| "boot this other operating system in addition to Debian."
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
 "other operating systems which are installed on the machine. If it finds a "
@@ -4332,11 +4273,14 @@ msgid ""
 "loader installation step, and the computer will be configured to boot this "
 "other operating system in addition to &debian;."
 msgstr ""
-"Trước khi cài đặt bộ nạp khởi động, trình cài đặt sẽ thử dò tìm hệ điều hành khác được cài đặt trên cùng một máy. Tìm được một hệ điều hành được hỗ trợ thì nó thông báo cho bạn trong bước cài đặt bộ nạp khởi động, và máy tính cũng được cấu hình để khởi động hệ điều hành khác đó, thêm vào &debian;."
+"Trước khi cài đặt bộ nạp khởi động, trình cài đặt sẽ thử dò tìm hệ điều hành "
+"khác được cài đặt trên cùng một máy. Tìm được một hệ điều hành được hỗ trợ "
+"thì nó thông báo cho bạn trong bước cài đặt bộ nạp khởi động, và máy tính "
+"cũng được cấu hình để khởi động hệ điều hành khác đó, thêm vào &debian;."
 
+#. Tag: para
 #: using-d-i.xml:2603
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that multiple operating systems booting on a single machine is still "
 "something of a black art. The automatic support for detecting and setting up "
@@ -4350,15 +4294,15 @@ msgstr ""
 "theo kiến trúc phụ. Nếu nó không hoạt động được, bạn nên xem tài liệu hướng "
 "dẫn sử dụng bộ nạp khởi động riêng để tìm thông tin thêm."
 
+#. Tag: title
 #: using-d-i.xml:2621
 #, no-c-format
-#. Tag: title
 msgid "<command>palo</command>-installer"
 msgstr "Trình cài đặt <command>palo</command>"
 
+#. Tag: para
 #: using-d-i.xml:2622
 #, no-c-format
-#. Tag: para
 msgid ""
 "The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
 "similar in configuration and usage to <command>LILO</command>, with a few "
@@ -4372,21 +4316,21 @@ msgstr ""
 "năng khởi động bất kỳ ảnh hạt nhân nằm trên phân vùng khởi động. Đó là vì "
 "<command>PALO</command> thật có thể đọc phân vùng Linux."
 
+#. Tag: para
 #: using-d-i.xml:2631
 #, no-c-format
-#. Tag: para
 msgid "hppa FIXME ( need more info )"
 msgstr "hppa SỬA ĐI (cần thêm thông tin)"
 
+#. Tag: title
 #: using-d-i.xml:2643
 #, no-c-format
-#. Tag: title
 msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
 msgstr "Cài đặt bộ nạp khởi động <command>Grub</command> vào đĩa cứng"
 
+#. Tag: para
 #: using-d-i.xml:2645
 #, no-c-format
-#. Tag: para
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
 "flexible and robust boot loader and a good default choice for new users and "
@@ -4396,9 +4340,9 @@ msgstr ""
 "quote>. GRUB là một bộ nạp khởi động dẻo và mạnh, một sự chọn mặc định hữu "
 "ích cho cả hai người dùng mới và nhà chuyên môn."
 
+#. Tag: para
 #: using-d-i.xml:2651
 #, no-c-format
-#. Tag: para
 msgid ""
 "By default, grub will be installed into the Master Boot Record (MBR), where "
 "it will take over complete control of the boot process. If you prefer, you "
@@ -4408,9 +4352,9 @@ msgstr ""
 "điều khiển hoàn toàn tiến trình khởi động. Hoặc bạn có thể cài đặt nó vào "
 "nơi khác. Xem sổ tay GRUB để tìm thông tin đầy đủ."
 
+#. Tag: para
 #: using-d-i.xml:2657
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
 "the main menu, and from there select whatever bootloader you would like to "
@@ -4419,15 +4363,15 @@ msgstr ""
 "Không muốn cài đặt GRUB thì bấm &BTN-GOBACK; để trở về trình đơn chính, và "
 "từ đó, chọn bộ nạp khởi động đã muốn."
 
+#. Tag: title
 #: using-d-i.xml:2670
 #, no-c-format
-#. Tag: title
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr "Cài đặt bộ nạp khởi động <command>LILO</command> vào đĩa cứng"
 
+#. Tag: para
 #: using-d-i.xml:2672
 #, no-c-format
-#. Tag: para
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
 "an old complex program which offers lots of functionality, including DOS, "
@@ -4442,9 +4386,9 @@ msgstr ""
 "nếu bạn cần gì đặc biệt, cũng xem tài liệu nhỏ LILO Thế Nào <ulink url="
 "\"&url-lilo-howto;\">LILO mini-HOWTO</ulink>."
 
+#. Tag: para
 #: using-d-i.xml:2682
 #, no-c-format
-#. Tag: para
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
 "operating systems if these can be <firstterm>chainloaded</firstterm>. This "
@@ -4456,9 +4400,9 @@ msgstr ""
 "phải tự thêm mục trình đơn cho hệ điều hành như GNU/Linux và GNU/Hurd, sau "
 "khi cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:2690
 #, no-c-format
-#. Tag: para
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
 "command> boot loader:"
@@ -4466,15 +4410,15 @@ msgstr ""
 "&d-i; cung cấp ba sự chọn về nơi vào đó cần cài đặt bộ nạp khởi động "
 "<command>LILO</command>:"
 
+#. Tag: term
 #: using-d-i.xml:2697
 #, no-c-format
-#. Tag: term
 msgid "Master Boot Record (MBR)"
 msgstr "Mục ghi khởi động cái (MBR)"
 
+#. Tag: para
 #: using-d-i.xml:2697
 #, no-c-format
-#. Tag: para
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
 "process."
@@ -4482,57 +4426,47 @@ msgstr ""
 "Cách này, <command>LILO</command> sẽ điều khiển hoàn toàn tiến trình khởi "
 "động."
 
+#. Tag: term
 #: using-d-i.xml:2704
 #, no-c-format
-#. Tag: term
-#| msgid "new Debian partition"
 msgid "new &debian; partition"
 msgstr "phân vùng &debian; mới"
 
+#. Tag: para
 #: using-d-i.xml:2704
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Choose this if you want to use another boot manager. <command>LILO</"
-#| "command> will install itself at the beginning of the new Debian partition "
-#| "and it will serve as a secondary boot loader."
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
 "will install itself at the beginning of the new &debian; partition and it "
 "will serve as a secondary boot loader."
 msgstr ""
-"Hãy chọn mục này nếu bạn muốn sử dụng một bộ nạp khởi động khác. <command>LILO</"
-"command> sẽ tự cài đặt tại đầu của phân vùng &debian; mới, và sẽ làm việc như một bộ nạp khởi động phụ."
+"Hãy chọn mục này nếu bạn muốn sử dụng một bộ nạp khởi động khác. "
+"<command>LILO</command> sẽ tự cài đặt tại đầu của phân vùng &debian; mới, và "
+"sẽ làm việc như một bộ nạp khởi động phụ."
 
+#. Tag: term
 #: using-d-i.xml:2713
 #, no-c-format
-#. Tag: term
 msgid "Other choice"
 msgstr "Khác"
 
+#. Tag: para
 #: using-d-i.xml:2713
 #, no-c-format
-#. Tag: para
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
 "somewhere else. In this case you will be asked for desired location. You can "
 "use traditional device names such as <filename>/dev/hda</filename> or "
 "<filename>/dev/sda</filename>."
 msgstr ""
-"Mục này có ích cho người dùng cấp cao mà muốn cài đặt <command>LILO</command> vào "
-"nơi khác. Trong trường hợp này, bạn sẽ được nhắc nhập vị trí đã muốn. Bạn có "
-"thể nhập tên kiểu truyền thống như <filename>/dev/hda</filename> hay "
-"<filename>/dev/sda</filename>."
+"Mục này có ích cho người dùng cấp cao mà muốn cài đặt <command>LILO</"
+"command> vào nơi khác. Trong trường hợp này, bạn sẽ được nhắc nhập vị trí đã "
+"muốn. Bạn có thể nhập tên kiểu truyền thống như <filename>/dev/hda</"
+"filename> hay <filename>/dev/sda</filename>."
 
+#. Tag: para
 #: using-d-i.xml:2723
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If you can no longer boot into Windows 9x (or DOS) after this step, "
-#| "you'll need to use a Windows 9x (MS-DOS) boot disk and use the "
-#| "<userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS master "
-#| "boot record &mdash; however, this means that you'll need to use some "
-#| "other way to get back into Debian!"
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
 "need to use a Windows 9x (MS-DOS) boot disk and use the <userinput>fdisk /"
@@ -4540,21 +4474,21 @@ msgid ""
 "however, this means that you'll need to use some other way to get back into "
 "&debian;!"
 msgstr ""
-"Không còn có thể khởi động lại vào Windows 9x (hay DOS) sau khi làm bước này thì bạn "
-"sẽ cần phải sử dụng một đĩa khởi động Windows 9x (MS-DOS), và chạy câu lệnh "
-"<userinput>fdisk /mbr</userinput> để cài đặt lại mục ghi khởi động cái MS-"
-"DOS &mdash; tuy nhiên, kết quả là bạn cần phải sử dụng một phương pháp khác để "
-"trở về &debian;."
+"Không còn có thể khởi động lại vào Windows 9x (hay DOS) sau khi làm bước này "
+"thì bạn sẽ cần phải sử dụng một đĩa khởi động Windows 9x (MS-DOS), và chạy "
+"câu lệnh <userinput>fdisk /mbr</userinput> để cài đặt lại mục ghi khởi động "
+"cái MS-DOS &mdash; tuy nhiên, kết quả là bạn cần phải sử dụng một phương "
+"pháp khác để trở về &debian;."
 
+#. Tag: title
 #: using-d-i.xml:2739
 #, no-c-format
-#. Tag: title
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr "Cài đặt bộ nạp khởi động <command>ELILO</command> vào đĩa cứng"
 
+#. Tag: para
 #: using-d-i.xml:2741
 #, no-c-format
-#. Tag: para
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
 "on the <quote>lilo</quote> boot loader for the x86 architecture and uses a "
@@ -4580,9 +4514,9 @@ msgstr ""
 "sao chép vào phân vùng EFI, rồi được chạy bởi <quote>EFI Boot Manager</"
 "quote> để làm việc thật tải và khởi chạy hạt nhân Linux."
 
+#. Tag: para
 #: using-d-i.xml:2757
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
 "step of installing the packages of the base installation. &d-i; will present "
@@ -4598,22 +4532,29 @@ msgstr ""
 "đặt, thường là một phân vùng trên cùng một đĩa chứa hệ thống tập tin "
 "<emphasis>gốc</emphasis> của máy tính."
 
+#. Tag: title
 #: using-d-i.xml:2769
 #, no-c-format
-#. Tag: title
 msgid "Choose the correct partition!"
 msgstr "Chọn phân vùng đúng đi."
 
-#: using-d-i.xml:2771
-#, no-c-format
 #. Tag: para
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#: using-d-i.xml:2771
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "Tiêu chuẩn để chọn phân vùng là nó chứa hệ thống tập tin định dạng FAT với "
 "cờ <emphasis>khả năng khởi động</emphasis> được đặt. &d-i; có thể hiển thị "
@@ -4622,15 +4563,15 @@ msgstr ""
 "đoán EFI. Ghi nhớ rằng trong khi cài đặt, <command>elilo</command> có thể "
 "định dạng phân vùng nên xoá hoàn toàn nội dung đã có !"
 
+#. Tag: title
 #: using-d-i.xml:2786
 #, no-c-format
-#. Tag: title
 msgid "EFI Partition Contents"
 msgstr "Nội dung phân vùng EFI"
 
+#. Tag: para
 #: using-d-i.xml:2788
 #, no-c-format
-#. Tag: para
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
 "disks of the system, usually the same disk that contains the <emphasis>root</"
@@ -4659,15 +4600,15 @@ msgstr ""
 "được cập nhật hay cấu hình lại."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: filename
 #: using-d-i.xml:2810
 #, no-c-format
-#. Tag: filename
 msgid "elilo.conf"
 msgstr "elilo.conf"
 
+#. Tag: para
 #: using-d-i.xml:2811
 #, no-c-format
-#. Tag: para
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
 "a copy of the <filename>/etc/elilo.conf</filename> with the filenames re-"
@@ -4678,20 +4619,15 @@ msgstr ""
 "tập tin được ghi lại vào tập tin nằm trên phân vùng EFI."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: filename
 #: using-d-i.xml:2820
 #, no-c-format
-#. Tag: filename
 msgid "elilo.efi"
 msgstr "elilo.efi"
 
+#. Tag: para
 #: using-d-i.xml:2821
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
-#| "runs to boot the system. It is the program behind the <guimenuitem>Debian "
-#| "GNU/Linux</guimenuitem> menu item of the <quote>EFI Boot Manager</quote> "
-#| "command menu."
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
 "runs to boot the system. It is the program behind the <guimenuitem>&debian; "
@@ -4704,40 +4640,37 @@ msgstr ""
 "Boot Manager</quote>."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: filename
 #: using-d-i.xml:2831
 #, no-c-format
-#. Tag: filename
 msgid "initrd.img"
 msgstr "initrd.img"
 
+#. Tag: para
 #: using-d-i.xml:2832
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This is the initial root filesystem used to boot the kernel. It is a copy "
-#| "of the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
-#| "standard Debian installation it would be the file in <filename>/boot</"
-#| "filename> pointed to by the symbolic link <filename>/initrd.img</"
-#| "filename>."
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
 "the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
 "standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
-"Đây là hệ thống gốc đầu tiên được dùng để khởi động hạt nhân. Nó là một bản sao của tập tin được tham chiếu trong tập tin cấu hình <filename>/etc/elilo.conf</filename>. Trong bản cài đặt &debian; tiêu chuẩn, nó là tập tin trong <filename>/boot</filename> là đích của liên kết tượng trưng <filename>/"
+"Đây là hệ thống gốc đầu tiên được dùng để khởi động hạt nhân. Nó là một bản "
+"sao của tập tin được tham chiếu trong tập tin cấu hình <filename>/etc/elilo."
+"conf</filename>. Trong bản cài đặt &debian; tiêu chuẩn, nó là tập tin trong "
+"<filename>/boot</filename> là đích của liên kết tượng trưng <filename>/"
 "initrd.img</filename>."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: filename
 #: using-d-i.xml:2844
 #, no-c-format
-#. Tag: filename
 msgid "readme.txt"
 msgstr "readme.txt"
 
+#. Tag: para
 #: using-d-i.xml:2845
 #, no-c-format
-#. Tag: para
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
 "managed by the <command>elilo</command> and that any local changes would be "
@@ -4748,37 +4681,35 @@ msgstr ""
 "mất hoàn toàn vào lần kế tiếp chạy <filename>/usr/sbin/elilo</filename>."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: filename
 #: using-d-i.xml:2855
 #, no-c-format
-#. Tag: filename
 msgid "vmlinuz"
 msgstr "vmlinuz"
 
+#. Tag: para
 #: using-d-i.xml:2856
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This is the compressed kernel itself. It is a copy of the file referenced "
-#| "in the <filename>/etc/elilo.conf</filename>. In a standard Debian "
-#| "installation it would be the file in <filename>/boot</filename> pointed "
-#| "to by the symbolic link <filename>/vmlinuz</filename>."
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
 "the <filename>/etc/elilo.conf</filename>. In a standard &debian; "
 "installation it would be the file in <filename>/boot</filename> pointed to "
 "by the symbolic link <filename>/vmlinuz</filename>."
 msgstr ""
-"Đây là hạt nhân đã nén. Nó là một bản sao của tập tin được tham chiếu trong tập tin cấu hình <filename>/etc/elilo.conf</filename>. Trong bản cài đặt &debian; tiêu chuẩn, nó là tập tin trong <filename>/boot</filename> là đích của liên kết tượng trưng <filename>/vmlinuz</filename>."
+"Đây là hạt nhân đã nén. Nó là một bản sao của tập tin được tham chiếu trong "
+"tập tin cấu hình <filename>/etc/elilo.conf</filename>. Trong bản cài đặt "
+"&debian; tiêu chuẩn, nó là tập tin trong <filename>/boot</filename> là đích "
+"của liên kết tượng trưng <filename>/vmlinuz</filename>."
 
+#. Tag: title
 #: using-d-i.xml:2876
 #, no-c-format
-#. Tag: title
 msgid "<command>arcboot</command>-installer"
 msgstr "Bộ cài đặt <command>arcboot</command>"
 
+#. Tag: para
 #: using-d-i.xml:2877
 #, no-c-format
-#. Tag: para
 msgid ""
 "The boot loader on SGI machines is <command>arcboot</command>. It has to be "
 "installed on the same hard disk as the kernel (this is done automatically by "
@@ -4820,15 +4751,15 @@ msgstr ""
 "<command>boot</command>."
 
 # Name: don't translate / Tên: đừng dịch
+#. Tag: replaceable
 #: using-d-i.xml:2896
 #, no-c-format
-#. Tag: replaceable
 msgid "scsi"
 msgstr "scsi"
 
+#. Tag: para
 #: using-d-i.xml:2897
 #, no-c-format
-#. Tag: para
 msgid ""
 "is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
 "onboard controllers"
@@ -4836,15 +4767,15 @@ msgstr ""
 "là mạch nối SCSI từ đó cần khởi động: nó là <userinput>0</userinput> cho bộ "
 "điều khiển có sẵn"
 
+#. Tag: replaceable
 #: using-d-i.xml:2905
 #, no-c-format
-#. Tag: replaceable
 msgid "disk"
 msgstr "đĩa"
 
+#. Tag: para
 #: using-d-i.xml:2906
 #, no-c-format
-#. Tag: para
 msgid ""
 "is the SCSI ID of the hard disk on which <command>arcboot</command> is "
 "installed"
@@ -4852,15 +4783,15 @@ msgstr ""
 "là SCSI ID (mã nhận diện SCSI) của đĩa cứng nơi <command>arcboot</command> "
 "được cài đặt"
 
+#. Tag: replaceable
 #: using-d-i.xml:2914
 #, no-c-format
-#. Tag: replaceable
 msgid "partnr"
 msgstr "số_phân"
 
+#. Tag: para
 #: using-d-i.xml:2915
 #, no-c-format
-#. Tag: para
 msgid ""
 "is the number of the partition on which <filename>/etc/arcboot.conf</"
 "filename> resides"
@@ -4868,15 +4799,15 @@ msgstr ""
 "là số hiệu phân vùng chứa tập tin cấu hình <filename>/etc/arcboot.conf</"
 "filename>"
 
+#. Tag: replaceable
 #: using-d-i.xml:2923
 #, no-c-format
-#. Tag: replaceable
 msgid "config"
 msgstr "cấu_hình"
 
+#. Tag: para
 #: using-d-i.xml:2924
 #, no-c-format
-#. Tag: para
 msgid ""
 "is the name of the configuration entry in <filename>/etc/arcboot.conf</"
 "filename>, which is <quote>linux</quote> by default."
@@ -4884,15 +4815,15 @@ msgstr ""
 "là tên của mục nhập cấu hình trong tập tin <filename>/etc/arcboot.conf</"
 "filename>, mà là <quote>linux</quote> theo mặc định."
 
+#. Tag: title
 #: using-d-i.xml:2945
 #, no-c-format
-#. Tag: title
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr "Cài đặt <command>Yaboot</command> vào đĩa cứng"
 
+#. Tag: para
 #: using-d-i.xml:2946
 #, no-c-format
-#. Tag: para
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
 "boot loader. The installer will set up <command>yaboot</command> "
@@ -4910,15 +4841,15 @@ msgstr ""
 "đó đĩa nên có khả năng khởi động và OpenFirmware sẽ được đặt để khởi động "
 "&debian-gnu;."
 
+#. Tag: title
 #: using-d-i.xml:2964
 #, no-c-format
-#. Tag: title
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr "Cài đặt <command>Quik</command> vào đĩa cứng"
 
+#. Tag: para
 #: using-d-i.xml:2965
 #, no-c-format
-#. Tag: para
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
 "command>. You can also use it on CHRP. The installer will attempt to set up "
@@ -4930,15 +4861,15 @@ msgstr ""
 "<command>quik</command>. Thiết lập này được biết là hoạt động được trên máy "
 "PowerMac 7200, 7300, và 7600, và trên một số máy bắt chước Power Computing."
 
+#. Tag: title
 #: using-d-i.xml:2981
 #, no-c-format
-#. Tag: title
 msgid "<command>zipl</command>-installer"
 msgstr "Bộ cài đặt <command>zipl</command>"
 
+#. Tag: para
 #: using-d-i.xml:2982
 #, no-c-format
-#. Tag: para
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
 "command> is similar in configuration and usage to <command>LILO</command>, "
@@ -4953,15 +4884,15 @@ msgstr ""
 "developerWorks của công ty IBM nếu bạn muốn biết thêm về <command>ZIPL</"
 "command>."
 
+#. Tag: title
 #: using-d-i.xml:2999
 #, no-c-format
-#. Tag: title
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr "Cài đặt bộ nạp khởi động <command>SILO</command> vào đĩa cứng"
 
+#. Tag: para
 #: using-d-i.xml:3001
 #, no-c-format
-#. Tag: para
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
 "documented in <filename>/usr/share/doc/silo/</filename>. <command>SILO</"
@@ -4990,15 +4921,15 @@ msgstr ""
 "phân vùng kiểu SunOS/Solaris. Có ích nếu bạn muốn cài đặt hệ điều hành GNU/"
 "Linux kế bên bản cài đặt SunOS/Solaris đã có."
 
+#. Tag: title
 #: using-d-i.xml:3026
 #, no-c-format
-#. Tag: title
 msgid "Continue Without Boot Loader"
 msgstr "Tiếp tục không có bộ nạp khởi động"
 
+#. Tag: para
 #: using-d-i.xml:3028
 #, no-c-format
-#. Tag: para
 msgid ""
 "This option can be used to complete the installation even when no boot "
 "loader is to be installed, either because the arch/subarch doesn't provide "
@@ -5008,9 +4939,9 @@ msgstr ""
 "không có bộ nạp khởi động cần cài đặt, hoặc vì kiến trúc/kiến trúc phụ không "
 "cung cấp, hoặc vì không muốn nó (v.d. bạn sẽ dùng bộ nạp khởi động đã có)."
 
+#. Tag: para
 #: using-d-i.xml:3035
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
 "of the installed kernel in <filename>/target/boot</filename>. You should "
@@ -5029,19 +4960,15 @@ msgstr ""
 "filename>, và nếu bạn đã chọn cài đặt <filename>/boot</filename> vào phân "
 "vùng riêng, tên hệ thống tập tin <filename>/boot</filename>."
 
+#. Tag: title
 #: using-d-i.xml:3052
 #, no-c-format
-#. Tag: title
 msgid "Finishing the Installation"
 msgstr "Cài đặt xong"
 
+#. Tag: para
 #: using-d-i.xml:3053
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This is the last step in the Debian installation process during which the "
-#| "installer will do any last minute tasks. It mostly consists of tidying up "
-#| "after the &d-i;."
 msgid ""
 "This is the last step in the &debian; installation process during which the "
 "installer will do any last minute tasks. It mostly consists of tidying up "
@@ -5050,15 +4977,15 @@ msgstr ""
 "Đây là bước cuối cùng trong tiến trình cài đặt &debian;, trong đó trình cài "
 "đặt sẽ làm bất cứ công việc nào còn lại. Phần lớn là làm sạch sau &d-i;."
 
+#. Tag: title
 #: using-d-i.xml:3066
 #, no-c-format
-#. Tag: title
 msgid "Setting the System Clock"
 msgstr "Đặt đồng hồ hệ thống"
 
+#. Tag: para
 #: using-d-i.xml:3068
 #, no-c-format
-#. Tag: para
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
 "this question is avoided if possible and the installer tries to work out "
@@ -5070,9 +4997,9 @@ msgstr ""
 "thể, và thử tính biết nếu đồng hồ được đặt thành thời gian thế giới (UTC) "
 "dựa vào thứ như hệ điều hành khác đã được cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:3075
 #, no-c-format
-#. Tag: para
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
 "set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally "
@@ -5088,9 +5015,9 @@ msgstr ""
 "arch=\"any-x86\">Hệ thống (cũng) chạy DOS hay Windows thường được đặt thành "
 "giờ cục bộ. Nếu bạn muốn khởi động đôi, hãy chọn giờ cục bộ hơn UTC.</phrase>"
 
+#. Tag: para
 #: using-d-i.xml:3086
 #, no-c-format
-#. Tag: para
 msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
 "system's hardware clock. This will be done either in UTC or local time, "
@@ -5100,19 +5027,15 @@ msgstr ""
 "cứng của hệ thống. Việc này sẽ được làm theo hoặc UTC hoặc giờ cục bộ, phụ "
 "thuộc vào sự chọn mới làm."
 
+#. Tag: title
 #: using-d-i.xml:3101
 #, no-c-format
-#. Tag: title
 msgid "Reboot the System"
 msgstr "Khởi động lại hệ thống"
 
+#. Tag: para
 #: using-d-i.xml:3103
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "You will be prompted to remove the boot media (CD, floppy, etc) that you "
-#| "used to boot the installer. After that the system will be rebooted into "
-#| "your new Debian system."
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
 "used to boot the installer. After that the system will be rebooted into your "
@@ -5122,9 +5045,9 @@ msgstr ""
 "để khởi động trình cài đặt. Sau đó, hệ thống sẽ được khởi động lại vào hệ "
 "thống &debian; mới."
 
+#. Tag: para
 #: using-d-i.xml:3109
 #, no-c-format
-#. Tag: para
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
 "supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD "
@@ -5136,15 +5059,15 @@ msgstr ""
 "&debian-gnu; từ DASD bạn đã chọn cho hệ thống tập tin gốc trong những bước "
 "đầu của tiến trình cài đặt."
 
+#. Tag: title
 #: using-d-i.xml:3122
 #, no-c-format
-#. Tag: title
 msgid "Miscellaneous"
 msgstr "Linh tinh"
 
+#. Tag: para
 #: using-d-i.xml:3123
 #, no-c-format
-#. Tag: para
 msgid ""
 "The components listed in this section are usually not involved in the "
 "installation process, but are waiting in the background to help the user in "
@@ -5154,29 +5077,27 @@ msgstr ""
 "tiến trình cài đặt, vì chúng đợi phía sau để giúp đỡ người dùng nếu họ gặp "
 "khó khăn."
 
+#. Tag: title
 #: using-d-i.xml:3136
 #, no-c-format
-#. Tag: title
 msgid "Saving the installation logs"
 msgstr "Lưu bản ghi cài đặt"
 
+#. Tag: para
 #: using-d-i.xml:3138
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "If the installation is successful, the logfiles created during the "
-#| "installation process will be automatically saved to <filename>/var/log/"
-#| "installer/</filename> on your new Debian system."
 msgid ""
 "If the installation is successful, the logfiles created during the "
 "installation process will be automatically saved to <filename>/var/log/"
 "installer/</filename> on your new &debian; system."
 msgstr ""
-"Cài đặt thành công thì các tập tin theo dõi được tạo trong tiến trình cài đặt sẽ được tự động lưu vào thư mục <filename>/var/log/installer/</filename> trong hệ thống &debian; mới."
+"Cài đặt thành công thì các tập tin theo dõi được tạo trong tiến trình cài "
+"đặt sẽ được tự động lưu vào thư mục <filename>/var/log/installer/</filename> "
+"trong hệ thống &debian; mới."
 
+#. Tag: para
 #: using-d-i.xml:3145
 #, no-c-format
-#. Tag: para
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
 "allows you to save the log files to a floppy disk, network, hard disk, or "
@@ -5190,15 +5111,15 @@ msgstr ""
 "tiến trình cài đặt và muốn xem lại bản ghi trên máy tính khác, hay đính nó "
 "kèm báo cáo cài đặt."
 
+#. Tag: title
 #: using-d-i.xml:3165
 #, no-c-format
-#. Tag: title
 msgid "Using the Shell and Viewing the Logs"
 msgstr "Sử dụng trình bao và xem bản ghi"
 
+#. Tag: para
 #: using-d-i.xml:3167
 #, no-c-format
-#. Tag: para
 msgid ""
 "There are several methods you can use to get a shell while running an "
 "installation. On most systems, and if you are not installing over serial "
@@ -5223,15 +5144,15 @@ msgstr ""
 "phím <keycap>option</keycap>.). Rồi bấm tổ hợp phím <keycombo><keycap>Alt "
 "trái</keycap> <keycap>F1</keycap></keycombo> để trở về bộ cài đặt chính nó."
 
+#. Tag: para
 #: using-d-i.xml:3185
 #, no-c-format
-#. Tag: para
 msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
 msgstr "Đối với trình cài đặt đồ họa, xem thêm <xref linkend=\"gtk-using\"/>."
 
+#. Tag: para
 #: using-d-i.xml:3189
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
 "Shell</guimenuitem> item on the main menu that can be used to start a shell. "
@@ -5245,9 +5166,9 @@ msgstr ""
 "nút &BTN-GOBACK; một hay nhiều lần. Gõ lệnh <userinput>exit</userinput> "
 "(thoát) để đóng trình bao, và trở về trình cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:3197
 #, no-c-format
-#. Tag: para
 msgid ""
 "At this point you are booted from the RAM disk, and there is a limited set "
 "of Unix utilities available for your use. You can see what programs are "
@@ -5263,9 +5184,9 @@ msgstr ""
 "Bourne tên <command>ash</command> có một số tính năng tốt đẹp như khả năng "
 "tự động gõ và lược sử."
 
+#. Tag: para
 #: using-d-i.xml:3206
 #, no-c-format
-#. Tag: para
 msgid ""
 "To edit and view files, use the text editor <command>nano</command>. Log "
 "files for the installation system can be found in the <filename>/var/log</"
@@ -5275,9 +5196,9 @@ msgstr ""
 "command>. Các tập tin ghi lưu cho hệ thống cài đặt nằm trong thư mục "
 "<filename>/var/log</filename>."
 
+#. Tag: para
 #: using-d-i.xml:3213
 #, no-c-format
-#. Tag: para
 msgid ""
 "Although you can do basically anything in a shell that the available "
 "commands allow you to do, the option to use a shell is really only there in "
@@ -5286,9 +5207,9 @@ msgstr ""
 "Mặc dù bạn có thể sử dụng bất cứ lệnh có sẵn trong trình bao, tùy chọn dùng "
 "trình bao chỉ sẵn sàng để giúp đỡ trong trường hợp bị lỗi hay gỡ lỗi."
 
+#. Tag: para
 #: using-d-i.xml:3219
 #, no-c-format
-#. Tag: para
 msgid ""
 "Doing things manually from the shell may interfere with the installation "
 "process and result in errors or an incomplete installation. In particular, "
@@ -5300,15 +5221,15 @@ msgstr ""
 "trình cài đặt kích hoạt vùng trao đổi, không bao giờ tự làm như thế từ trình "
 "bao."
 
+#. Tag: title
 #: using-d-i.xml:3234
 #, no-c-format
-#. Tag: title
 msgid "Installation Over the Network"
 msgstr "Cài đặt qua mạng"
 
+#. Tag: para
 #: using-d-i.xml:3236
 #, no-c-format
-#. Tag: para
 msgid ""
 "One of the more interesting components is <firstterm>network-console</"
 "firstterm>. It allows you to do a large part of the installation over the "
@@ -5323,9 +5244,9 @@ msgstr ""
 "từ bàn điều khiển, ít nhất đến khi thiết lập khả năng chạy mạng (dù bạn có "
 "thể tự động hoá phần đó bằng phần <xref linkend=\"automatic-install\"/>.)"
 
+#. Tag: para
 #: using-d-i.xml:3246
 #, no-c-format
-#. Tag: para
 msgid ""
 "This component is not loaded into the main installation menu by default, so "
 "you have to explicitly ask for it. If you are installing from CD, you need "
@@ -5345,9 +5266,9 @@ msgstr ""
 "thành công được ngụ ý bằng một mục nhập trình đơn mới : <guimenuitem>Tiếp "
 "tục lại cài đặt từ xa bằng SSH</guimenuitem>."
 
+#. Tag: para
 #: using-d-i.xml:3259
 #, no-c-format
-#. Tag: para
 msgid ""
 "For installations on &arch-title;, this is the default method after setting "
 "up the network."
@@ -5355,9 +5276,9 @@ msgstr ""
 "Đối với việc cài đặt vào máy có kiến trúc &arch-title;, đây là phương pháp "
 "mặc định sau khi thiết lập mạng."
 
+#. Tag: para
 #: using-d-i.xml:3264
 #, no-c-format
-#. Tag: para
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
 "<phrase arch=\"s390\">You</phrase> will be asked for a new password to be "
@@ -5377,9 +5298,9 @@ msgstr ""
 "thống này. Bạn cần phải truyền vân tay này một cách bảo mật cho người sẽ "
 "tiếp tục cài đặt từ xa."
 
+#. Tag: para
 #: using-d-i.xml:3276
 #, no-c-format
-#. Tag: para
 msgid ""
 "Should you decide to continue with the installation locally, you can always "
 "press &enterkey;, which will bring you back to the main menu, where you can "
@@ -5389,9 +5310,9 @@ msgstr ""
 "&enterkey;, mà sẽ mang bạn về trình đơn chính nơi bạn có thể chọn thành phần "
 "khác."
 
+#. Tag: para
 #: using-d-i.xml:3282
 #, no-c-format
-#. Tag: para
 msgid ""
 "Now let's switch to the other side of the wire. As a prerequisite, you need "
 "to configure your terminal for UTF-8 encoding, because that is what the "
@@ -5419,9 +5340,9 @@ msgstr ""
 "nhập, vân tay của hệ thống ở xa sẽ được hiển thị, và bạn sẽ phải xác nhận "
 "nếu nó là đúng không."
 
+#. Tag: para
 #: using-d-i.xml:3299
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <command>ssh</command> server in the installer uses a default "
 "configuration that does not send keep-alive packets. In principle, a "
@@ -5444,9 +5365,9 @@ msgstr ""
 "kết nối, bạn có thể hay không thể tiếp tục lại tiến trình cài đặt sau khi "
 "tái kết nối."
 
+#. Tag: para
 #: using-d-i.xml:3312
 #, no-c-format
-#. Tag: para
 msgid ""
 "You may be able to avoid the connection being dropped by adding the option "
 "<userinput>-o&nbsp;ServerAliveInterval=<replaceable>value</replaceable></"
@@ -5466,9 +5387,9 @@ msgstr ""
 "trong khi kết nối bị dừng ngắn, không thì <command>ssh</command> phục hồi "
 "kết nối) vậy chỉ dùng nó khi cần thiết."
 
+#. Tag: para
 #: using-d-i.xml:3325
 #, no-c-format
-#. Tag: para
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
 "address or hostname, <command>ssh</command> will refuse to connect to such "
@@ -5490,9 +5411,9 @@ msgstr ""
 "<replaceable>địa_chỉ_IP</replaceable>&gt;</command>. </para> </footnote> rồi "
 "thử lại."
 
+#. Tag: para
 #: using-d-i.xml:3341
 #, no-c-format
-#. Tag: para
 msgid ""
 "After the login you will be presented with an initial screen where you have "
 "two possibilities called <guimenuitem>Start menu</guimenuitem> and "
@@ -5510,9 +5431,9 @@ msgstr ""
 "chỉ một phiên chạy SSH cho trình đơn cài đặt, nhưng có thể chạy nhiều phiên "
 "chạy cho các trình bao."
 
+#. Tag: para
 #: using-d-i.xml:3351
 #, no-c-format
-#. Tag: para
 msgid ""
 "After you have started the installation remotely over SSH, you should not go "
 "back to the installation session running on the local console. Doing so may "
@@ -5526,15 +5447,15 @@ msgstr ""
 "lần lượt có thể gây ra việc cài đặt bị lỗi hay lỗi trong hệ thống đã được "
 "cài đặt."
 
+#. Tag: title
 #: using-d-i.xml:3371
 #, no-c-format
-#. Tag: title
 msgid "Loading Missing Firmware"
 msgstr "Nạp phần vững bị thiếu"
 
+#. Tag: para
 #: using-d-i.xml:3372
 #, no-c-format
-#. Tag: para
 msgid ""
 "As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
 "firmware to be loaded. In most cases the device will not work at all if the "
@@ -5546,9 +5467,9 @@ msgstr ""
 "hoạt động bằng cách nào cả nếu phần vững không sẵn sàng; đôi khi nó chỉ có "
 "chức năng cơ bản và yêu cầu phần vững để hiệu lực thêm tính năng."
 
+#. Tag: para
 #: using-d-i.xml:3380
 #, no-c-format
-#. Tag: para
 msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
 "display a dialog offering to load the missing firmware. If this option is "
@@ -5564,9 +5485,9 @@ msgstr ""
 "đúng (<filename>/lib/firmware</filename>) và mô-đun trình điều khiển được "
 "nạp lại."
 
+#. Tag: para
 #: using-d-i.xml:3390
 #, no-c-format
-#. Tag: para
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
 "the architecture, the installation method and the stage of the installation. "
@@ -5582,9 +5503,9 @@ msgstr ""
 "\"x86\">Trên kiến trúc i386 và amd64, cũng có thể nạp phần vững từ một bo "
 "mạch MMC hay SD.</phrase>"
 
+#. Tag: para
 #: using-d-i.xml:3400
 #, no-c-format
-#. Tag: para
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
 "will also function without it, or if the device is not needed during the "
@@ -5593,9 +5514,9 @@ msgstr ""
 "Ghi chú rằng cũng có thể bỏ qua bước nạp phần vững nếu thiết bị vẫn còn chức "
 "năng, hoặc nếu thiết bị không cần trong khi cài đặt."
 
+#. Tag: para
 #: using-d-i.xml:3407
 #, no-c-format
-#. Tag: para
 msgid ""
 "Support for loading firmware is still relatively basic and is likely to be "
 "improved in future releases of the installer. Currently &d-i; will for "
@@ -5608,15 +5529,15 @@ msgstr ""
 "bạn chọn nạp phần vững bị thiếu mà không tìm thấy. Hãy thông báo vấn đề nào "
 "bằng cách gửi một báo cáo cài đặt (xem  <xref linkend=\"submit-bug\"/>)."
 
+#. Tag: title
 #: using-d-i.xml:3418
 #, no-c-format
-#. Tag: title
 msgid "Preparing a medium"
 msgstr "Chuẩn bị vật chứa"
 
+#. Tag: para
 #: using-d-i.xml:3419
 #, no-c-format
-#. Tag: para
 msgid ""
 "Although in some cases the firmware can also be loaded from a partition on a "
 "hard disk, the most common method to load firmware will be from some "
@@ -5634,15 +5555,9 @@ msgstr ""
 "thống tập tin khuyến khích là FAT vì nó được hỗ trợ hoàn toàn trong các giai "
 "đoạn cài đặt đầu tiên."
 
+#. Tag: para
 #: using-d-i.xml:3429
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Tarballs containing current packages for the most common firmware are "
-#| "available from: <itemizedlist> <listitem><para> <ulink url=\"&url-"
-#| "firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
-#| "download the tarball for the correct release and unpack it to the file "
-#| "system on the medium."
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
 "firmware are available from: <itemizedlist> <listitem><para> <ulink url="
@@ -5655,9 +5570,9 @@ msgstr ""
 "\"></ulink> </para></listitem> </itemizedlist> Chỉ nên tải về kho nén cho "
 "bản phát hành hiện thời, và giải nén nó vào hệ thống tập tin trên vật chứa."
 
+#. Tag: para
 #: using-d-i.xml:3443
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
 "download specific firmware packages from the (non-free section of the) "
@@ -5670,9 +5585,9 @@ msgstr ""
 "phần lớn các gói phần vững sẵn sàng, nhưng không đảm bảo nó hoàn toàn, và nó "
 "cũng có thể chứa gói khác phần vững:"
 
+#. Tag: para
 #: using-d-i.xml:3457
 #, no-c-format
-#. Tag: para
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
 "firmware could be obtained for example from an already installed system or "
@@ -5682,15 +5597,15 @@ msgstr ""
 "như vậy có thể sẵn sàng từ một hệ thống đã cài đặt trước, hay nhà sản xuất "
 "phần cứng."
 
+#. Tag: title
 #: using-d-i.xml:3466
 #, no-c-format
-#. Tag: title
 msgid "Firmware and the Installed System"
 msgstr "Phần vững và Hệ thống đã Cài đặt"
 
+#. Tag: para
 #: using-d-i.xml:3467
 #, no-c-format
-#. Tag: para
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
 "the installed system. In most cases this will ensure that the device that "
@@ -5706,9 +5621,9 @@ msgstr ""
 "cài đặt có chạy một phiên bản hạt nhân khác với trình cài đặt, cũng có thể "
 "là phần vững không nạp được do phiên bản bị đối xứng lệch."
 
+#. Tag: para
 #: using-d-i.xml:3476
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
 "this package for the installed system and will automatically add the non-"
@@ -5722,9 +5637,9 @@ msgstr ""
 "Hữu ích vì phần vững nên được tự động cập nhật khi một phiên bản mới được "
 "phát hành."
 
+#. Tag: para
 #: using-d-i.xml:3484
 #, no-c-format
-#. Tag: para
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
 "device will probably not work with the installed system until the firmware "
@@ -5734,9 +5649,9 @@ msgstr ""
 "có thể không hoạt động với hệ thống đã cài đặt đến khi (gói) phần vững được "
 "cài đặt một cách thủ công."
 
+#. Tag: para
 #: using-d-i.xml:3491
 #, no-c-format
-#. Tag: para
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "
 "the installed system will <emphasis>not</emphasis> be automatically updated "
diff --git a/po/vi/welcome.po b/po/vi/welcome.po
index 5419ef6e8..08a32012c 100644
--- a/po/vi/welcome.po
+++ b/po/vi/welcome.po
@@ -17,38 +17,33 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Tag: title
 #: welcome.xml:4
 #, no-c-format
-#. Tag: title
-#| msgid "Welcome to Debian"
 msgid "Welcome to &debian;"
 msgstr "Chào mừng bạn dùng &debian;"
 
+#. Tag: para
 #: welcome.xml:5
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This chapter provides an overview of the Debian Project and &debian-gnu;. "
-#| "If you already know about the Debian Project's history and the &debian-"
-#| "gnu; distribution, feel free to skip to the next chapter."
 msgid ""
 "This chapter provides an overview of the &debian; Project and &debian-gnu;. "
 "If you already know about the &debian; Project's history and the &debian-"
 "gnu; distribution, feel free to skip to the next chapter."
 msgstr ""
-"Chương này cung cấp tổng quan của Dự Án &debian; và &debian-gnu;. Nếu bạn quen "
-"với lịch sử của Dự Án &debian; và bản phát hành &debian-gnu;, bạn cũng nhảy "
-"được tới chương kế tiếp."
+"Chương này cung cấp tổng quan của Dự Án &debian; và &debian-gnu;. Nếu bạn "
+"quen với lịch sử của Dự Án &debian; và bản phát hành &debian-gnu;, bạn cũng "
+"nhảy được tới chương kế tiếp."
 
+#. Tag: title
 #: welcome.xml:19
 #, no-c-format
-#. Tag: title
 msgid "What is Debian?"
 msgstr "Debian là gì vậy?"
 
+#. Tag: para
 #: welcome.xml:20
 #, no-c-format
-#. Tag: para
 msgid ""
 "Debian is an all-volunteer organization dedicated to developing free "
 "software and promoting the ideals of the Free Software community. The Debian "
@@ -71,9 +66,9 @@ msgstr ""
 "qua một số năm để trở thành một tổ chức có khoảng &num-of-debian-developers; "
 "<firstterm>Nhà Phát Triển Debian</firstterm>."
 
+#. Tag: para
 #: welcome.xml:35
 #, no-c-format
-#. Tag: para
 msgid ""
 "Debian Developers are involved in a variety of activities, including <ulink "
 "url=\"&url-debian-home;\">Web</ulink> and <ulink url=\"&url-debian-ftp;"
@@ -86,9 +81,9 @@ msgstr ""
 "debian-ftp;\">FTP</ulink>, thiết kế đồ họa, phân tích pháp luật các giấy "
 "phép phần mềm, tạo tài liệu hướng dẫn và, tất nhiên, bảo trì gói phần mềm."
 
+#. Tag: para
 #: welcome.xml:44
 #, no-c-format
-#. Tag: para
 msgid ""
 "In the interest of communicating our philosophy and attracting developers "
 "who believe in the principles that Debian stands for, the Debian Project has "
@@ -100,9 +95,9 @@ msgstr ""
 "họa các giá trị của chúng tôi, cũng chỉ dẫn người nào muốn trở thành nhà "
 "phát triển Debian."
 
+#. Tag: para
 #: welcome.xml:52
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"&url-social-contract;\">Debian Social Contract</ulink> is a "
 "statement of Debian's commitments to the Free Software Community. Anyone who "
@@ -118,9 +113,9 @@ msgstr ""
 "mềm mới vào Debian &mdash; miễn là gói phần mềm thỏa tiêu chuẩn cả tự do lẫn "
 "chất lượng của chúng tôi."
 
+#. Tag: para
 #: welcome.xml:64
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink> are a "
 "clear and concise statement of Debian's criteria for free software. The DFSG "
@@ -133,9 +128,9 @@ msgstr ""
 "DFSG là tài liệu có ảnh hưởng rất lớn trong Phong Trào Phần Mềm Tự Do, cũng "
 "đã đặt nền móng cho <ulink url=\"&url-osd;\">Lời Định Nghĩa Nguồn Mở</ulink>."
 
+#. Tag: para
 #: welcome.xml:74
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> is an "
 "extensive specification of the Debian Project's standards of quality."
@@ -143,9 +138,9 @@ msgstr ""
 "<ulink url=\"&url-debian-policy;\">Sổ Tay Chính Sách Debian</ulink> là đặc "
 "tả rộng rãi về những tiêu chuẩn chất lượng của Dự Án Debian."
 
+#. Tag: para
 #: welcome.xml:82
 #, no-c-format
-#. Tag: para
 msgid ""
 "Debian developers are also involved in a number of other projects; some "
 "specific to Debian, others involving some or all of the Linux community. "
@@ -154,9 +149,9 @@ msgstr ""
 "Nhà phát triển Debian cũng tham gia một số dự án khác, đặc trưng cho Debian "
 "hay gồm một phần cộng đồng Linux. Chẳng hạn:"
 
+#. Tag: para
 #: welcome.xml:89
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) is a "
 "project aimed at standardizing the basic GNU/Linux system, which will enable "
@@ -170,9 +165,9 @@ msgstr ""
 "trình và trình điều khiển thiết bị cho Linux chung, hơn là cho một bản phát "
 "hành GNU/Linux riêng."
 
+#. Tag: para
 #: welcome.xml:99
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> "
 "(FHS) is an effort to standardize the layout of the Linux file system. The "
@@ -186,9 +181,9 @@ msgstr ""
 "chương trình, không cần lo lăng về phương pháp cài đặt gói đó vào mỗi bản "
 "phát hành GNU/Linux riêng."
 
+#. Tag: para
 #: welcome.xml:109
 #, no-c-format
-#. Tag: para
 msgid ""
 "<ulink url=\"&url-debian-jr;\">Debian Jr.</ulink> is an internal project, "
 "aimed at making sure Debian has something to offer to our youngest users."
@@ -196,9 +191,9 @@ msgstr ""
 "<ulink url=\"&url-debian-jr;\">Debian Còn Trẻ</ulink> là một dự án bên "
 "trong, nhắm mục đích là bảo đảm Debian hấp dẫn được người dùng trẻ nhất."
 
+#. Tag: para
 #: welcome.xml:118
 #, no-c-format
-#. Tag: para
 msgid ""
 "For more general information about Debian, see the <ulink url=\"&url-debian-"
 "faq;\">Debian FAQ</ulink>."
@@ -206,15 +201,15 @@ msgstr ""
 "Để tìm thông tin chung thêm về Debian, xem <ulink url=\"&url-debian-faq;"
 "\">Hỏi Đáp Debian</ulink>."
 
+#. Tag: title
 #: welcome.xml:133
 #, no-c-format
-#. Tag: title
 msgid "What is GNU/Linux?"
 msgstr "GNU/Linux là gì vậy?"
 
+#. Tag: para
 #: welcome.xml:134
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linux is an operating system: a series of programs that let you interact "
 "with your computer and run other programs."
@@ -222,9 +217,9 @@ msgstr ""
 "Linux là hệ điều hành: một dãy chương trình cho bạn khả năng tương tác với "
 "máy tính, cũng chạy chương trình khác."
 
+#. Tag: para
 #: welcome.xml:139
 #, no-c-format
-#. Tag: para
 msgid ""
 "An operating system consists of various fundamental programs which are "
 "needed by your computer so that it can communicate and receive instructions "
@@ -247,9 +242,9 @@ msgstr ""
 "dụng tên <quote>GNU/Linux</quote> để diễn tả hệ thống cũng có tên cẩu thả "
 "<quote>Linux</quote>."
 
+#. Tag: para
 #: welcome.xml:153
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linux is modelled on the Unix operating system. From the start, Linux was "
 "designed to be a multi-tasking, multi-user system. These facts are enough to "
@@ -264,9 +259,9 @@ msgstr ""
 "khác hơn. Trái ngược với hệ điều hành khác, không có ai sở hữu Linux. Phần "
 "lớn việc phát triển nó được làm bởi người tình nguyện không được tiền."
 
+#. Tag: para
 #: welcome.xml:162
 #, no-c-format
-#. Tag: para
 msgid ""
 "Development of what later became GNU/Linux began in 1984, when the <ulink "
 "url=\"&url-fsf;\">Free Software Foundation</ulink> began development of a "
@@ -276,9 +271,9 @@ msgstr ""
 "<ulink url=\"&url-fsf;\">Tổ Chức Phần Mềm Tự Do</ulink> bắt đầu phát triển "
 "một hệ điều hành miễn phí kiểu UNIX&trade; được gọi là GNU."
 
+#. Tag: para
 #: welcome.xml:168
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a "
 "comprehensive set of free software tools for use with Unix&trade; and Unix-"
@@ -294,9 +289,9 @@ msgstr ""
 "đến việc phức tạp (như ghi hay biên dịch chương trình hoặc hiệu chỉnh cấp "
 "cao nhiều định dạng tài liệu khác nhau)."
 
+#. Tag: para
 #: welcome.xml:178
 #, no-c-format
-#. Tag: para
 msgid ""
 "While many groups and individuals have contributed to Linux, the largest "
 "single contributor is still the Free Software Foundation, which created not "
@@ -307,9 +302,9 @@ msgstr ""
 "còn đã đóng góp nhiều nhất: nó đã tạo phần lớn công cụ được dùng trong "
 "Linux, ngay cả triết lý và cộng đồng hỗ trợ nó."
 
+#. Tag: para
 #: welcome.xml:185
 #, no-c-format
-#. Tag: para
 msgid ""
 "The <ulink url=\"&url-kernel-org;\">Linux kernel</ulink> first appeared in "
 "1991, when a Finnish computing science student named Linus Torvalds "
@@ -323,9 +318,9 @@ msgstr ""
 "nhân thay thế điều của Minix. Xem trang lịch sử Linux <ulink url=\"&url-"
 "linux-history;\">Linux History Page</ulink> của Linux Quốc Tế."
 
+#. Tag: para
 #: welcome.xml:194
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linus Torvalds continues to coordinate the work of several hundred "
 "developers with the help of a number of subsystem maintainers. There is an "
@@ -341,9 +336,9 @@ msgstr ""
 "Hỏi Đáp <ulink url=\"&url-linux-kernel-list-faq;\">linux-kernel mailing list "
 "FAQ</ulink>."
 
+#. Tag: para
 #: welcome.xml:204
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linux users have immense freedom of choice in their software. For example, "
 "Linux users can choose from a dozen different command line shells and "
@@ -357,9 +352,9 @@ msgstr ""
 "hành khác, không quen với ý kiến có khả năng thay đổi dòng lệnh hay môi "
 "trường đồ họa."
 
+#. Tag: para
 #: welcome.xml:213
 #, no-c-format
-#. Tag: para
 msgid ""
 "Linux is also less likely to crash, better able to run more than one program "
 "at the same time, and more secure than many operating systems. With these "
@@ -372,27 +367,15 @@ msgstr ""
 "điều hành lớn lên nhanh nhất trong thị trường trình phục vụ. Gần đây hơn, "
 "Linux cũng mới ưa chuộng với người dùng kinh doanh và ở nhà."
 
+#. Tag: title
 #: welcome.xml:231
 #, no-c-format
-#. Tag: title
-#| msgid "What is Debian GNU/Linux?"
 msgid "What is &debian; GNU/Linux?"
 msgstr "&debian; GNU/Linux là gì vậy?"
 
+#. Tag: para
 #: welcome.xml:232
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The combination of Debian's philosophy and methodology and the GNU tools, "
-#| "the Linux kernel, and other important free software, form a unique "
-#| "software distribution called Debian GNU/Linux. This distribution is made "
-#| "up of a large number of software <emphasis>packages</emphasis>. Each "
-#| "package in the distribution contains executables, scripts, documentation, "
-#| "and configuration information, and has a <emphasis>maintainer</emphasis> "
-#| "who is primarily responsible for keeping the package up-to-date, tracking "
-#| "bug reports, and communicating with the upstream author(s) of the "
-#| "packaged software. Our extremely large user base, combined with our bug "
-#| "tracking system ensures that problems are found and fixed quickly."
 msgid ""
 "The combination of &debian;'s philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
@@ -407,41 +390,32 @@ msgid ""
 msgstr ""
 "Kết hợp triết lý và phương pháp luận của &debian; với những công cụ GNU, hạt "
 "nhân Linux, và phần mềm tự do quan trọng khác, các điều này thành lập một "
-"bản phát hành phần mềm duy nhất được gọi là &debian; GNU/Linux. Bản phát hành "
-"này gồm có rất nhiều <emphasis>gói</emphasis> phần mềm. Trong bản phát hành "
-"này, mỗi gói chứa chương trình chạy được, tập lệnh, tài liệu hướng dẫn và "
-"thông tin cấu hình, cũng có một <emphasis>nhà bảo trì</emphasis> nhận trách "
-"nhiệm chính cập nhật gói đó, theo dõi thông báo lỗi, và liên lạc với tác giả "
-"gốc của phần mềm đã đóng gói. Cơ bản người dùng rất lớn của chúng tôi, cùng "
-"với hệ thống theo dõi lỗi, bảo đảm các sự khó được tìm và sửa nhanh."
+"bản phát hành phần mềm duy nhất được gọi là &debian; GNU/Linux. Bản phát "
+"hành này gồm có rất nhiều <emphasis>gói</emphasis> phần mềm. Trong bản phát "
+"hành này, mỗi gói chứa chương trình chạy được, tập lệnh, tài liệu hướng dẫn "
+"và thông tin cấu hình, cũng có một <emphasis>nhà bảo trì</emphasis> nhận "
+"trách nhiệm chính cập nhật gói đó, theo dõi thông báo lỗi, và liên lạc với "
+"tác giả gốc của phần mềm đã đóng gói. Cơ bản người dùng rất lớn của chúng "
+"tôi, cùng với hệ thống theo dõi lỗi, bảo đảm các sự khó được tìm và sửa "
+"nhanh."
 
+#. Tag: para
 #: welcome.xml:246
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian's attention to detail allows us to produce a high-quality, stable, "
-#| "and scalable distribution. Installations can be easily configured to "
-#| "serve many roles, from stripped-down firewalls to desktop scientific "
-#| "workstations to high-end network servers."
 msgid ""
 "&debian;'s attention to detail allows us to produce a high-quality, stable, "
 "and scalable distribution. Installations can be easily configured to serve "
 "many roles, from stripped-down firewalls to desktop scientific workstations "
 "to high-end network servers."
 msgstr ""
-"Tập trung &debian; với chi tiết có kết quả là một bản phát hành có chất lượng "
-"cao, ổn định, và có khả năng co giãn. Có thể cấu hình dễ dàng bản cài đặt để "
-"thực hiện nhiều nhiệm vụ, từ bức tường lửa độc lập, đến máy trăm khoá học để "
-"bàn, đến máy phục vụ mạng lớp cao."
+"Tập trung &debian; với chi tiết có kết quả là một bản phát hành có chất "
+"lượng cao, ổn định, và có khả năng co giãn. Có thể cấu hình dễ dàng bản cài "
+"đặt để thực hiện nhiều nhiệm vụ, từ bức tường lửa độc lập, đến máy trăm khoá "
+"học để bàn, đến máy phục vụ mạng lớp cao."
 
+#. Tag: para
 #: welcome.xml:253
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian is especially popular among advanced users because of its "
-#| "technical excellence and its deep commitment to the needs and "
-#| "expectations of the Linux community. Debian also introduced many features "
-#| "to Linux that are now commonplace."
 msgid ""
 "&debian; is especially popular among advanced users because of its technical "
 "excellence and its deep commitment to the needs and expectations of the "
@@ -450,16 +424,12 @@ msgid ""
 msgstr ""
 "&debian; nối tiếng nhất trong những người dùng cấp cao vì nó có kỹ thuật rất "
 "tốt, cam kết năng nổ với các sự cần và sự mong đợi của cộng đồng Linux. "
-"&debian; cũng đã giới thiệu vào Linux nhiều tính năng đã trở thành thường dụng."
+"&debian; cũng đã giới thiệu vào Linux nhiều tính năng đã trở thành thường "
+"dụng."
 
+#. Tag: para
 #: welcome.xml:260
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For example, Debian was the first Linux distribution to include a package "
-#| "management system for easy installation and removal of software. It was "
-#| "also the first Linux distribution that could be upgraded without "
-#| "requiring reinstallation."
 msgid ""
 "For example, &debian; was the first Linux distribution to include a package "
 "management system for easy installation and removal of software. It was also "
@@ -470,36 +440,22 @@ msgstr ""
 "gói để cài đặt và gỡ bỏ phần mềm một cách dễ dàng. Nó cũng là bản phát hành "
 "Linux thứ nhất có khả năng nâng cấp mà không cần cài đặt lại."
 
+#. Tag: para
 #: welcome.xml:267
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian continues to be a leader in Linux development. Its development "
-#| "process is an example of just how well the Open Source development model "
-#| "can work &mdash; even for very complex tasks such as building and "
-#| "maintaining a complete operating system."
 msgid ""
 "&debian; continues to be a leader in Linux development. Its development "
 "process is an example of just how well the Open Source development model can "
 "work &mdash; even for very complex tasks such as building and maintaining a "
 "complete operating system."
 msgstr ""
-"&debian; tiếp tục dẫn đường phát triển Linux. Tiến trình phát triển của nó là "
-"thông lệ xuất sắc của mẫu phát triển Nguồn Mở &mdash; ngay cả cho công việc "
-"rất phức tạp như xây dựng và bảo trì một hệ điều hành hoàn toàn."
+"&debian; tiếp tục dẫn đường phát triển Linux. Tiến trình phát triển của nó "
+"là thông lệ xuất sắc của mẫu phát triển Nguồn Mở &mdash; ngay cả cho công "
+"việc rất phức tạp như xây dựng và bảo trì một hệ điều hành hoàn toàn."
 
+#. Tag: para
 #: welcome.xml:274
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The feature that most distinguishes Debian from other Linux distributions "
-#| "is its package management system. These tools give the administrator of a "
-#| "Debian system complete control over the packages installed on that "
-#| "system, including the ability to install a single package or "
-#| "automatically update the entire operating system. Individual packages can "
-#| "also be protected from being updated. You can even tell the package "
-#| "management system about software you have compiled yourself and what "
-#| "dependencies it fulfills."
 msgid ""
 "The feature that most distinguishes &debian; from other Linux distributions "
 "is its package management system. These tools give the administrator of a "
@@ -509,24 +465,16 @@ msgid ""
 "being updated. You can even tell the package management system about "
 "software you have compiled yourself and what dependencies it fulfills."
 msgstr ""
-"Tính năng khác biệt &debian; nhiều nhất với các bản phát hành Linux khác là hệ "
-"thống quản lý gói. Những công cụ này cho quản trị hệ thống &debian; khả năng "
-"điều khiển hoàn toàn mọi gói được cài đặt vào hệ thống đó, gồm khả năng cài "
-"đặt một gói riêng hoặc cập nhật tự động toàn bộ hệ điều hành. Cũng có thể "
-"bảo vệ gói riêng chống cập nhật. Bạn ngay cả có khả năng báo hệ thống quản "
-"lý gói biết về phần mềm tự biên dịch và cách phụ thuộc nào nó thỏa."
+"Tính năng khác biệt &debian; nhiều nhất với các bản phát hành Linux khác là "
+"hệ thống quản lý gói. Những công cụ này cho quản trị hệ thống &debian; khả "
+"năng điều khiển hoàn toàn mọi gói được cài đặt vào hệ thống đó, gồm khả năng "
+"cài đặt một gói riêng hoặc cập nhật tự động toàn bộ hệ điều hành. Cũng có "
+"thể bảo vệ gói riêng chống cập nhật. Bạn ngay cả có khả năng báo hệ thống "
+"quản lý gói biết về phần mềm tự biên dịch và cách phụ thuộc nào nó thỏa."
 
+#. Tag: para
 #: welcome.xml:285
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "To protect your system against <quote>Trojan horses</quote> and other "
-#| "malevolent software, Debian's servers verify that uploaded packages come "
-#| "from their registered Debian maintainers. Debian packagers also take "
-#| "great care to configure their packages in a secure manner. When security "
-#| "problems in shipped packages do appear, fixes are usually available very "
-#| "quickly. With Debian's simple update options, security fixes can be "
-#| "downloaded and installed automatically across the Internet."
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
 "malevolent software, &debian;'s servers verify that uploaded packages come "
@@ -538,22 +486,15 @@ msgid ""
 msgstr ""
 "Để bảo vệ hệ thống của bạn chống <quote>vi rút Trojan</quote> và phần mềm "
 "hiểm độc khác, máy phục vụ &debian; kiểm tra mỗi gói được tải lên từ nhà bảo "
-"trì &debian; đã đăng ký của nó. Người đóng gói &debian; cũng rất cẩn thận để cấu "
-"hình gói một cách bảo mật. Khi lỗi bảo mật xuất hiện trong gói đã phát hành, "
-"thường cung cấp rất nhanh cách sửa. Với những tùy chọn cập nhật đơn giản của "
-"&debian;, cách sửa bảo mật có thể được tải về và cài đặt tự động qua Mạng."
+"trì &debian; đã đăng ký của nó. Người đóng gói &debian; cũng rất cẩn thận để "
+"cấu hình gói một cách bảo mật. Khi lỗi bảo mật xuất hiện trong gói đã phát "
+"hành, thường cung cấp rất nhanh cách sửa. Với những tùy chọn cập nhật đơn "
+"giản của &debian;, cách sửa bảo mật có thể được tải về và cài đặt tự động "
+"qua Mạng."
 
+#. Tag: para
 #: welcome.xml:295
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The primary, and best, method of getting support for your Debian GNU/"
-#| "Linux system and communicating with Debian Developers is through the many "
-#| "mailing lists maintained by the Debian Project (there are more than &num-"
-#| "of-debian-maillists; at this writing). The easiest way to subscribe to "
-#| "one or more of these lists is visit <ulink url=\"&url-debian-lists-"
-#| "subscribe;\"> Debian's mailing list subscription page</ulink> and fill "
-#| "out the form you'll find there."
 msgid ""
 "The primary, and best, method of getting support for your &debian; GNU/Linux "
 "system and communicating with &debian; Developers is through the many "
@@ -564,138 +505,122 @@ msgid ""
 "find there."
 msgstr ""
 "Phương pháp chính và tốt nhất để được sự hỗ trợ cho hệ thống &debian; GNU/"
-"Linux của bạn, cũng để liên lạc với Nhà Phát Triển &debian; là bằng những hộp "
-"thư chung do Dự Án &debian; bảo trì (có hơn &num-of-debian-maillists; hộp thư "
-"vào lúc viết câu này). Cách dễ nhất để đăng ký tham gia một hay nhiều hộp "
-"thư chung này là thăm trang đăng ký hộp thư chung &debian; (<ulink url=\"&url-"
-"debian-lists-subscribe;\">Debian's mailing list subscription page</ulink>) "
-"rồi điền vào đơn tại đó."
+"Linux của bạn, cũng để liên lạc với Nhà Phát Triển &debian; là bằng những "
+"hộp thư chung do Dự Án &debian; bảo trì (có hơn &num-of-debian-maillists; "
+"hộp thư vào lúc viết câu này). Cách dễ nhất để đăng ký tham gia một hay "
+"nhiều hộp thư chung này là thăm trang đăng ký hộp thư chung &debian; (<ulink "
+"url=\"&url-debian-lists-subscribe;\">Debian's mailing list subscription "
+"page</ulink>) rồi điền vào đơn tại đó."
 
+#. Tag: title
 #: welcome.xml:315
 #, no-c-format
-#. Tag: title
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "&debian; GNU/kFreeBSD là gì vậy?"
 
+#. Tag: para
 #: welcome.xml:317
 #, no-c-format
-#. Tag: para
 msgid ""
 "&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
-msgstr "&debian; GNU/kFreeBSD là một hệ thống &debian; GNU chứa hạt nhân kFreeBSD."
+msgstr ""
+"&debian; GNU/kFreeBSD là một hệ thống &debian; GNU chứa hạt nhân kFreeBSD."
 
+#. Tag: para
 #: welcome.xml:321
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
 "amd64 architectures, although ports to other architectures is possible."
 msgstr ""
-"Bản chuyển &debian; này hiện thời chỉ được phát triển cho hai kiến trúc i386 và amd64, dù có thể tạo bản chuyển sang kiến trúc khác."
+"Bản chuyển &debian; này hiện thời chỉ được phát triển cho hai kiến trúc i386 "
+"và amd64, dù có thể tạo bản chuyển sang kiến trúc khác."
 
+#. Tag: para
 #: welcome.xml:326
 #, no-c-format
-#. Tag: para
 msgid ""
 "Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
-msgstr "Ghi chú rằng &debian; GNU/kFreeBSD không phải là một hệ thống Linux (kiểu BSD là UNIX), do đó một số thông tin về hệ thống Linux có thể không thích hợp với nó."
+msgstr ""
+"Ghi chú rằng &debian; GNU/kFreeBSD không phải là một hệ thống Linux (kiểu "
+"BSD là UNIX), do đó một số thông tin về hệ thống Linux có thể không thích "
+"hợp với nó."
 
+#. Tag: para
 #: welcome.xml:331
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
 "kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
-"Để tìm thêm thông tin, xem trang bản chuyển &debian; GNU/kFreeBSD (<ulink url=\"http://www.debian.org/ports/kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink>) và hộp thư chung <email>debian-bsd@lists.debian.org</email>"
+"Để tìm thêm thông tin, xem trang bản chuyển &debian; GNU/kFreeBSD (<ulink "
+"url=\"http://www.debian.org/ports/kfreebsd-gnu/\"> &debian; GNU/kFreeBSD "
+"ports page</ulink>) và hộp thư chung <email>debian-bsd@lists.debian.org</"
+"email>"
 
+#. Tag: title
 #: welcome.xml:350
 #, no-c-format
-#. Tag: title
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/Hurd?"
 msgstr "&debian; GNU/Hurd là gì vậy?"
 
+#. Tag: para
 #: welcome.xml:352
 #, no-c-format
-#. Tag: para
 msgid ""
 "&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set "
 "of servers running on top of the GNU Mach microkernel."
-msgstr "&debian; GNU/Hurd là một hệ thống &debian; GNU chứa GNU Hurd — một tập hợp các trình phục vụ đang chạy bên trên hạt nhân vi GNU Mach."
+msgstr ""
+"&debian; GNU/Hurd là một hệ thống &debian; GNU chứa GNU Hurd — một tập hợp "
+"các trình phục vụ đang chạy bên trên hạt nhân vi GNU Mach."
 
+#. Tag: para
 #: welcome.xml:357
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
 "is continuing. The Hurd is currently only being developed for the i386 "
 "architecture, although ports to other architectures will be made once the "
 "system becomes more stable."
 msgstr ""
-"Hurd còn không hoàn toàn, cũng không thích hợp với sử dụng hằng ngày, nhưng mà sự phát triển vẫn tiếp tục. Hurd hiện thời chỉ được phát triển cho kiến trúc i386, dù bản chuyển sang kiến trúc khác sẽ được tạo một khi hệ thống ổn định hơn."
+"Hurd còn không hoàn toàn, cũng không thích hợp với sử dụng hằng ngày, nhưng "
+"mà sự phát triển vẫn tiếp tục. Hurd hiện thời chỉ được phát triển cho kiến "
+"trúc i386, dù bản chuyển sang kiến trúc khác sẽ được tạo một khi hệ thống ổn "
+"định hơn."
 
+#. Tag: para
 #: welcome.xml:365
 #, no-c-format
-#. Tag: para
 msgid ""
 "Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
-msgstr "Ghi chú rằng &debian; GNU/Hurd không phải là một hệ thống Linux, do đó một số thông tin về hệ thống Linux có thể không thích hợp với nó."
+msgstr ""
+"Ghi chú rằng &debian; GNU/Hurd không phải là một hệ thống Linux, do đó một "
+"số thông tin về hệ thống Linux có thể không thích hợp với nó."
 
+#. Tag: para
 #: welcome.xml:370
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
 "\"> &debian; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Để tìm thêm thông tin, xem trang bản chuyển &debian; GNU/Hurd (<ulink url="
-"\"http://www.debian.org/ports/hurd/\">&debian; GNU/Hurd ports page</ulink>) và "
-"hộp thư chung <email>debian-hurd@lists.debian.org</email>."
+"\"http://www.debian.org/ports/hurd/\">&debian; GNU/Hurd ports page</ulink>) "
+"và hộp thư chung <email>debian-hurd@lists.debian.org</email>."
 
+#. Tag: title
 #: welcome.xml:387
 #, no-c-format
-#. Tag: title
-#| msgid "Getting Debian"
 msgid "Getting &debian;"
 msgstr "Lấy &debian;"
 
+#. Tag: para
 #: welcome.xml:389
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For information on how to download &debian-gnu; from the Internet or from "
-#| "whom official Debian CDs can be purchased, see the <ulink url=\"&url-"
-#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-#| "debian-mirrors;\">list of Debian mirrors</ulink> contains a full set of "
-#| "official Debian mirrors, so you can easily find the nearest one."
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
 "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
@@ -703,36 +628,34 @@ msgid ""
 "debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
 "official &debian; mirrors, so you can easily find the nearest one."
 msgstr ""
-"Để tìm thông tin về cách tải &debian-gnu; xuống Internet hoặc từ họ có thể mua "
-"đĩa CD &debian; chính thức, xem trang bản phát hành (<ulink url=\"&url-debian-"
-"distrib;\">distribution web page</ulink>). Danh sách các máy nhân bản &debian; "
-"(<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</ulink>) chứa bộ "
-"đầy đủ các máy nhân bản &debian; chính thức, để cho bạn tìm dễ dàng máy gần nhất chỗ "
-"mình."
+"Để tìm thông tin về cách tải &debian-gnu; xuống Internet hoặc từ họ có thể "
+"mua đĩa CD &debian; chính thức, xem trang bản phát hành (<ulink url=\"&url-"
+"debian-distrib;\">distribution web page</ulink>). Danh sách các máy nhân bản "
+"&debian; (<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</"
+"ulink>) chứa bộ đầy đủ các máy nhân bản &debian; chính thức, để cho bạn tìm "
+"dễ dàng máy gần nhất chỗ mình."
 
+#. Tag: para
 #: welcome.xml:398
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Debian can be upgraded after installation very easily. The installation "
-#| "procedure will help set up the system so that you can make those upgrades "
-#| "once installation is complete, if need be."
 msgid ""
 "&debian; can be upgraded after installation very easily. The installation "
 "procedure will help set up the system so that you can make those upgrades "
 "once installation is complete, if need be."
 msgstr ""
-"Rất dễ dàng nâng cấp &debian; sau khi cài đặt. Thủ tục cài đặt sẽ giúp đỡ thiết lập hệ thống để cho bạn nâng cấp được một khi cài đặt hoàn toàn, nếu cần thiết."
+"Rất dễ dàng nâng cấp &debian; sau khi cài đặt. Thủ tục cài đặt sẽ giúp đỡ "
+"thiết lập hệ thống để cho bạn nâng cấp được một khi cài đặt hoàn toàn, nếu "
+"cần thiết."
 
+#. Tag: title
 #: welcome.xml:413
 #, no-c-format
-#. Tag: title
 msgid "Getting the Newest Version of This Document"
 msgstr "Lấy phiên bản mới nhất của tài liệu này"
 
+#. Tag: para
 #: welcome.xml:415
 #, no-c-format
-#. Tag: para
 msgid ""
 "This document is constantly being revised. Be sure to check the <ulink url="
 "\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
@@ -747,20 +670,15 @@ msgstr ""
 "sàng từ trang Sổ Tay Cài Đặt chính thức <ulink url=\"&url-install-manual;"
 "\">official Install Manual pages</ulink>."
 
+#. Tag: title
 #: welcome.xml:433
 #, no-c-format
-#. Tag: title
 msgid "Organization of This Document"
 msgstr "Cấu trúc của tài liệu này"
 
+#. Tag: para
 #: welcome.xml:435
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "This document is meant to serve as a manual for first-time Debian users. "
-#| "It tries to make as few assumptions as possible about your level of "
-#| "expertise. However, we do assume that you have a general understanding of "
-#| "how the hardware in your computer works."
 msgid ""
 "This document is meant to serve as a manual for first-time &debian; users. "
 "It tries to make as few assumptions as possible about your level of "
@@ -772,25 +690,23 @@ msgstr ""
 "chúng tôi có phải giả sử là bạn có kiến thức chung về hoạt động của các phần "
 "cứng của máy tính của mình."
 
+#. Tag: para
 #: welcome.xml:442
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Expert users may also find interesting reference information in this "
-#| "document, including minimum installation sizes, details about the "
-#| "hardware supported by the Debian installation system, and so on. We "
-#| "encourage expert users to jump around in the document."
 msgid ""
 "Expert users may also find interesting reference information in this "
 "document, including minimum installation sizes, details about the hardware "
 "supported by the &debian; installation system, and so on. We encourage "
 "expert users to jump around in the document."
 msgstr ""
-"Trong tài liệu này, người dùng thành thạo cũng tìm được thông tin tham chiếu hay, gồm có kích cỡ cài đặt tối thiểu, chi tiết về phần cứng được hỗ trợ bởi hệ thống cài đặt &debian;, v.v.. Chúng tôi khuyên người dùng thành thạo nhảy giữa các đoạn lựa chọn trong tài liệu này."
+"Trong tài liệu này, người dùng thành thạo cũng tìm được thông tin tham chiếu "
+"hay, gồm có kích cỡ cài đặt tối thiểu, chi tiết về phần cứng được hỗ trợ bởi "
+"hệ thống cài đặt &debian;, v.v.. Chúng tôi khuyên người dùng thành thạo nhảy "
+"giữa các đoạn lựa chọn trong tài liệu này."
 
+#. Tag: para
 #: welcome.xml:449
 #, no-c-format
-#. Tag: para
 msgid ""
 "In general, this manual is arranged in a linear fashion, walking you through "
 "the installation process from start to finish. Here are the steps in "
@@ -801,9 +717,9 @@ msgstr ""
 "trình cài đặt từ đầu đến cuối. Đây là những bước cài đặt &debian-gnu;, và "
 "tiết đoạn tài liệu tương ứng với mỗi bước:"
 
+#. Tag: para
 #: welcome.xml:457
 #, no-c-format
-#. Tag: para
 msgid ""
 "Determine whether your hardware meets the requirements for using the "
 "installation system, in <xref linkend=\"hardware-req\"/>."
@@ -811,14 +727,9 @@ msgstr ""
 "Quyết định nếu phần cứng có thỏa tiêu chuẩn sử dụng hệ thống cài đặt chưa, "
 "trong <xref linkend=\"hardware-req\"/>."
 
+#. Tag: para
 #: welcome.xml:463
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Backup your system, perform any necessary planning and hardware "
-#| "configuration prior to installing Debian, in <xref linkend=\"preparing\"/"
-#| ">. If you are preparing a multi-boot system, you may need to create "
-#| "partitionable space on your hard disk for Debian to use."
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
 "configuration prior to installing &debian;, in <xref linkend=\"preparing\"/"
@@ -830,9 +741,9 @@ msgstr ""
 "bị một hệ thống đa khởi động thì bạn có thể cần phải tạo sức chứa phân vùng "
 "được trên phần cứng cho &debian; dùng."
 
+#. Tag: para
 #: welcome.xml:471
 #, no-c-format
-#. Tag: para
 msgid ""
 "In <xref linkend=\"install-methods\"/>, you will obtain the necessary "
 "installation files for your method of installation."
@@ -840,9 +751,9 @@ msgstr ""
 "Trong <xref linkend=\"install-methods\"/>, bạn sẽ giành những tập tin cài "
 "đặt cần thiết cho phương pháp cài đặt đã chọn."
 
+#. Tag: para
 #: welcome.xml:477
 #, no-c-format
-#. Tag: para
 msgid ""
 "describes booting into the installation system. This chapter also discusses "
 "troubleshooting procedures in case you have problems with this step."
@@ -851,18 +762,9 @@ msgstr ""
 "thủ tục giải đáp thắc mắc trong trường hợp bạn gặp khó khăn thực hiện bước "
 "này."
 
+#. Tag: para
 #: welcome.xml:484
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a Debian server (if you "
-#| "are not installing from a CD), partitioning your hard drives and "
-#| "installation of a base system, then selection and installation of tasks. "
-#| "(Some background about setting up the partitions for your Debian system "
-#| "is explained in <xref linkend=\"partitioning\"/>.)"
 msgid ""
 "Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
 "This involves choosing your language, configuring peripheral driver modules, "
@@ -876,39 +778,35 @@ msgstr ""
 "Thực hiện việc cài đặt thật tùy theo <xref linkend=\"d-i-intro\"/>. Tiến "
 "trình này đòi hỏi cần phải chọn ngôn ngữ của bạn, cấu hình mô-đun điều khiển "
 "ngoại vi, cấu hình sự kết nối mạng để lấy được các tập tin cài đặt còn lại "
-"từ máy phục vụ &debian; (nếu bạn không cài đặt từ đĩa CD), phân vùng đĩa cứng "
-"và cài đặt hệ thống cơ bản, rồi chọn và cài đặt công việc. (Một phần thông "
-"tin bối cảnh về cách thiết lập phân vùng cho hệ thống &debian; được giải thích "
-"trong <xref linkend=\"partitioning\"/>.)"
+"từ máy phục vụ &debian; (nếu bạn không cài đặt từ đĩa CD), phân vùng đĩa "
+"cứng và cài đặt hệ thống cơ bản, rồi chọn và cài đặt công việc. (Một phần "
+"thông tin bối cảnh về cách thiết lập phân vùng cho hệ thống &debian; được "
+"giải thích trong <xref linkend=\"partitioning\"/>.)"
 
+#. Tag: para
 #: welcome.xml:497
 #, no-c-format
-#. Tag: para
 msgid ""
 "Boot into your newly installed base system, from <xref linkend=\"boot-new\"/"
 ">."
 msgstr ""
 "Khởi động vào hệ thống cơ bản mới cài đặt, từ <xref linkend=\"boot-new\"/>."
 
+#. Tag: para
 #: welcome.xml:505
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Once you've got your system installed, you can read <xref linkend=\"post-"
-#| "install\"/>. That chapter explains where to look to find more information "
-#| "about Unix and Debian, and how to replace your kernel."
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
 "install\"/>. That chapter explains where to look to find more information "
 "about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "Một khi cài đặt xong hệ thống, bạn đọc <xref linkend=\"post-install\"/>. "
-"Chương này giải thích nơi cần tìm thông tin thêm về UNIX và &debian;, và cách "
-"thay thế hạt nhân."
+"Chương này giải thích nơi cần tìm thông tin thêm về UNIX và &debian;, và "
+"cách thay thế hạt nhân."
 
+#. Tag: para
 #: welcome.xml:515
 #, no-c-format
-#. Tag: para
 msgid ""
 "Finally, information about this document and how to contribute to it may be "
 "found in <xref linkend=\"administrivia\"/>."
@@ -916,15 +814,15 @@ msgstr ""
 "Cuối cùng, thông tin về tài liệu này và cách đóng góp cho nó, nằm trong "
 "<xref linkend=\"administrivia\"/>."
 
+#. Tag: title
 #: welcome.xml:525
 #, no-c-format
-#. Tag: title
 msgid "Your Documentation Help is Welcome"
 msgstr "Mời bạn giúp đỡ tạo tài liệu hướng dẫn"
 
+#. Tag: para
 #: welcome.xml:527
 #, no-c-format
-#. Tag: para
 msgid ""
 "Any help, suggestions, and especially, patches, are greatly appreciated. "
 "Working versions of this document can be found at <ulink url=\"&url-d-i-"
@@ -936,9 +834,9 @@ msgstr ""
 "<ulink url=\"&url-d-i-alioth-manual;\"></ulink>. Trang đó hiển thị danh sách "
 "các kiến trúc và ngôn ngữ cho đó tài liệu này được công bố."
 
+#. Tag: para
 #: welcome.xml:534
 #, no-c-format
-#. Tag: para
 msgid ""
 "Source is also available publicly; look in <xref linkend=\"administrivia\"/> "
 "for more information concerning how to contribute. We welcome suggestions, "
@@ -952,26 +850,15 @@ msgstr ""
 "guide</classname>, nhưng trước hết kiểm tra nếu lỗi đó đã được thông báo "
 "chưa)."
 
+#. Tag: title
 #: welcome.xml:550
 #, no-c-format
-#. Tag: title
 msgid "About Copyrights and Software Licenses"
 msgstr "Về tác quyền và giấy phép phần mềm"
 
+#. Tag: para
 #: welcome.xml:553
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "We're sure that you've read some of the licenses that come with most "
-#| "commercial software &mdash; they usually say that you can only use one "
-#| "copy of the software on a single computer. This system's license isn't "
-#| "like that at all. We encourage you to put a copy of &debian-gnu; on every "
-#| "computer in your school or place of business. Lend your installation "
-#| "media to your friends and help them install it on their computers! You "
-#| "can even make thousands of copies and <emphasis>sell</emphasis> them "
-#| "&mdash; albeit with a few restrictions. Your freedom to install and use "
-#| "the system comes directly from Debian being based on <emphasis>free "
-#| "software</emphasis>."
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
 "commercial software &mdash; they usually say that you can only use one copy "
@@ -993,9 +880,9 @@ msgstr ""
 "&mdash; dù với một số điều kiện. Quyền cài đặt và sử dụng hệ thống này dựa "
 "trực tiếp vào cơ bản <emphasis>phần mềm tự do</emphasis> của &debian;."
 
+#. Tag: para
 #: welcome.xml:566
 #, no-c-format
-#. Tag: para
 msgid ""
 "Calling software <emphasis>free</emphasis> doesn't mean that the software "
 "isn't copyrighted, and it doesn't mean that CDs containing that software "
@@ -1013,18 +900,9 @@ msgstr ""
 "thích ứng và sửa đổi phần mềm đó, cũng phát hành kết quả của sự cố gắng của "
 "họ."
 
+#. Tag: para
 #: welcome.xml:577
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "The Debian project, as a pragmatic concession to its users, does make "
-#| "some packages available that do not meet our criteria for being free. "
-#| "These packages are not part of the official distribution, however, and "
-#| "are only available from the <userinput>contrib</userinput> or "
-#| "<userinput>non-free</userinput> areas of Debian mirrors or on third-party "
-#| "CD-ROMs; see the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, "
-#| "under <quote>The Debian FTP archives</quote>, for more information about "
-#| "the layout and contents of the archives."
 msgid ""
 "The &debian; project, as a pragmatic concession to its users, does make some "
 "packages available that do not meet our criteria for being free. These "
@@ -1040,24 +918,13 @@ msgstr ""
 "phải thuộc về bản phát hành chính thức, cũng chỉ sẵn sàng từ phần "
 "<userinput>đóng góp</userinput> (contrib) hay <userinput>khác tự do</"
 "userinput> (non-free) của máy nhân bản &debian; hay trên đĩa CD-ROM nhóm ba; "
-"xem Hỏi Đáp Debian  (<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>), dưới "
-"Kho FTP Debian (<quote>The Debian FTP archives</quote>), để tìm thêm thông tin về bố trí và nội dung của kho đó."
+"xem Hỏi Đáp Debian  (<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>), "
+"dưới Kho FTP Debian (<quote>The Debian FTP archives</quote>), để tìm thêm "
+"thông tin về bố trí và nội dung của kho đó."
 
+#. Tag: para
 #: welcome.xml:591
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "Many of the programs in the system are licensed under the <emphasis>GNU</"
-#| "emphasis> <emphasis>General Public License</emphasis>, often simply "
-#| "referred to as <quote>the GPL</quote>. The GPL requires you to make the "
-#| "<emphasis>source code</emphasis> of the programs available whenever you "
-#| "distribute a binary copy of the program; that provision of the license "
-#| "ensures that any user will be able to modify the software. Because of "
-#| "this provision, the source code<footnote> <para> For information on how "
-#| "to locate, unpack, and build binaries from Debian source packages, see "
-#| "the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under "
-#| "<quote>Basics of the Debian Package Management System</quote>. </para> </"
-#| "footnote> for all such programs is available in the Debian system."
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
 "emphasis> <emphasis>General Public License</emphasis>, often simply referred "
@@ -1084,15 +951,9 @@ msgstr ""
 "quote>).</para></footnote> cho mọi chương trình như vậy có sẵn trong hệ "
 "thống &debian;."
 
+#. Tag: para
 #: welcome.xml:610
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "There are several other forms of copyright statements and software "
-#| "licenses used on the programs in Debian. You can find the copyrights and "
-#| "licenses for every package installed on your system by looking in the "
-#| "file <filename>/usr/share/doc/<replaceable>package-name</replaceable>/"
-#| "copyright </filename> once you've installed a package on your system."
 msgid ""
 "There are several other forms of copyright statements and software licenses "
 "used on the programs in &debian;. You can find the copyrights and licenses "
@@ -1100,30 +961,28 @@ msgid ""
 "usr/share/doc/<replaceable>package-name</replaceable>/copyright </filename> "
 "once you've installed a package on your system."
 msgstr ""
-"Có vài kiểu khác nhau của lời tuyên bố tác quyền và giấy phép phần mềm được áp "
-"dụng cho chương trình của &debian;. Bạn có thể tìm tác quyền và giấy phép dành "
-"cho mỗi gói được cài đặt vào hệ thống, bằng cách xem tập tin <filename>/usr/"
-"share/doc/<replaceable>tên_gói</replaceable>/copyright </filename> một khi cài đặt gói đó vào hệ thống."
+"Có vài kiểu khác nhau của lời tuyên bố tác quyền và giấy phép phần mềm được "
+"áp dụng cho chương trình của &debian;. Bạn có thể tìm tác quyền và giấy phép "
+"dành cho mỗi gói được cài đặt vào hệ thống, bằng cách xem tập tin <filename>/"
+"usr/share/doc/<replaceable>tên_gói</replaceable>/copyright </filename> một "
+"khi cài đặt gói đó vào hệ thống."
 
+#. Tag: para
 #: welcome.xml:620
 #, no-c-format
-#. Tag: para
-#| msgid ""
-#| "For more information about licenses and how Debian determines whether "
-#| "software is free enough to be included in the main distribution, see the "
-#| "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgid ""
 "For more information about licenses and how &debian; determines whether "
 "software is free enough to be included in the main distribution, see the "
 "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgstr ""
-"Để tìm thông tin thêm về giấy phép và cách &debian; quyết định nếu phần mềm là "
-"đủ tự do để được bao gồm trong bản phát hành chính, xem Chỉ Dẫn Phần Mềm Tự "
-"Do Debian (<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>)."
+"Để tìm thông tin thêm về giấy phép và cách &debian; quyết định nếu phần mềm "
+"là đủ tự do để được bao gồm trong bản phát hành chính, xem Chỉ Dẫn Phần Mềm "
+"Tự Do Debian (<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</"
+"ulink>)."
 
+#. Tag: para
 #: welcome.xml:626
 #, no-c-format
-#. Tag: para
 msgid ""
 "The most important legal notice is that this software comes with "
 "<emphasis>no warranties</emphasis>. The programmers who have created this "
diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index b7877a68d..f674e7b53 100644
--- a/po/zh_CN/administrivia.po
+++ b/po/zh_CN/administrivia.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-26 19:59+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -26,18 +26,21 @@ msgstr "关于本文档"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This manual was created for Sarge's debian-installer, based on the Woody "
-#| "installation manual for boot-floppies, which was based on earlier Debian "
-#| "installation manuals, and on the Progeny distribution manual which was "
-#| "released under GPL in 2003."
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
-msgstr "本手册是为 Sarge 版 debian-installer 创建，基于 Woody 版的软盘安装手册，而那份手册又是基于更早版本的 &debian; 安装手册和 2003 年 GPL 协议下的 Progeny 分发手册。"
+msgstr ""
+"本手册是为 Sarge 版 debian-installer 创建，基于 Woody 版的软盘安装手册，而那"
+"份手册又是基于更早版本的 &debian; 安装手册和 2003 年 GPL 协议下的 Progeny 分"
+"发手册。"
 
 #. Tag: para
 #: administrivia.xml:18
@@ -182,9 +185,9 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Many, many Debian users and developers contributed to this document. "
+#| "Many, many &debian; users and developers contributed to this document. "
 #| "Particular note must be made of Michael Schmitz (m68k support), Frank "
 #| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 #| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
@@ -192,14 +195,19 @@ msgstr ""
 #| "edits and text. We have to thank Pascal Le Bail for useful information "
 #| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
 "(SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous "
 "edits and text. We have to thank Pascal Le Bail for useful information about "
 "booting from USB memory sticks."
-msgstr "有许许多多的 &debian; 用户和开发人员为本文档做出了贡献。特别要感谢 Michael Schmitz (m68k 支持)、Frank Neumann (<ulink url=\"&url-m68k-old-amiga-install;\">Amiga 安装手册</ulink>的最初作者)、Arto Astala、Eric Delaunay/Ben Collins (SPARC 信息)、Tapio Lehtonen 和 Stéphane Bortzmeyer 做了大量的编辑和文字处理。我们还要感谢 Pascal Le Bail 提供了从 U 盘上引导的相关信息。"
+msgstr ""
+"有许许多多的 &debian; 用户和开发人员为本文档做出了贡献。特别要感谢 Michael "
+"Schmitz (m68k 支持)、Frank Neumann (<ulink url=\"&url-m68k-old-amiga-install;"
+"\">Amiga 安装手册</ulink>的最初作者)、Arto Astala、Eric Delaunay/Ben Collins "
+"(SPARC 信息)、Tapio Lehtonen 和 Stéphane Bortzmeyer 做了大量的编辑和文字处"
+"理。我们还要感谢 Pascal Le Bail 提供了从 U 盘上引导的相关信息。"
 
 #. Tag: para
 #: administrivia.xml:124
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index 7400d4c83..ce3eb4f49 100644
--- a/po/zh_CN/bookinfo.po
+++ b/po/zh_CN/bookinfo.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-26 20:01+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -21,27 +21,24 @@ msgstr "&debian-gnu; 安装手册"
 #. Tag: para
 #: bookinfo.xml:8
 #, no-c-format
-#| msgid ""
-#| "This document contains installation instructions for the &debian-gnu; "
-#| "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
-#| "title; (<quote>&architecture;</quote>) architecture. It also contains "
-#| "pointers to more information and information on how to make the most of "
-#| "your new Debian system."
 msgid ""
 "This document contains installation instructions for the &debian-gnu; "
 "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
 "title; (<quote>&architecture;</quote>) architecture. It also contains "
 "pointers to more information and information on how to make the most of your "
 "new &debian; system."
-msgstr "本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 &arch-title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于如何构建您的新 &debian; 系统，以及指向更多信息的链接。"
+msgstr ""
+"本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 "
+"&arch-title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于"
+"如何构建您的新 &debian; 系统，以及指向更多信息的链接。"
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This installation guide is based on an earlier manual written for the old "
-#| "Debian installation system (the <quote>boot-floppies</quote>), and has "
-#| "been updated to document the new Debian installer. However, for "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
 #| "&architecture;, the manual has not been fully updated and fact checked "
 #| "for the new installer. There may remain parts of the manual that are "
 #| "incomplete or outdated or that still document the boot-floppies "
@@ -51,15 +48,22 @@ msgstr "本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quo
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
-msgstr "本安装指南是基于一份为旧版 &debian; 安装系统(<quote>boot-floppies</quote>) 而撰写的手册，并针对新的 &debian; 安装系统进行了增补和修订。但是，对于 &architecture; 体系结构，本手册尚未针对新版的安装程序进行完整的更新和实际检测。这使得本手册中可能会存在少量不完整或过时的、或者仍然在讲述 boot-floppies 安装程序的内容。本手册的新版本，也许会更好的用于本体系，您可以通过 Internet 在 <ulink url=\"&url-d-i;\">&d-i; 主页</ulink> 找到它。您还可以在那里找到另外一些翻译版。"
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
+msgstr ""
+"本安装指南是基于一份为旧版 &debian; 安装系统(<quote>boot-floppies</quote>) 而"
+"撰写的手册，并针对新的 &debian; 安装系统进行了增补和修订。但是，对于 "
+"&architecture; 体系结构，本手册尚未针对新版的安装程序进行完整的更新和实际检"
+"测。这使得本手册中可能会存在少量不完整或过时的、或者仍然在讲述 boot-floppies "
+"安装程序的内容。本手册的新版本，也许会更好的用于本体系，您可以通过 Internet "
+"在 <ulink url=\"&url-d-i;\">&d-i; 主页</ulink> 找到它。您还可以在那里找到另外"
+"一些翻译版。"
 
 #. Tag: para
 #: bookinfo.xml:30
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 642437156..6778ae3c4 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -97,19 +97,17 @@ msgstr "从 CD 光盘上引导"
 #: boot-installer.xml:70 boot-installer.xml:340 boot-installer.xml:811
 #: boot-installer.xml:1469 boot-installer.xml:1831
 #, no-c-format
-#| msgid ""
-#| "The easiest route for most people will be to use a set of Debian CDs. If "
-#| "you have a CD set, and if your machine supports booting directly off the "
-#| "CD, great! Simply <phrase arch=\"x86\"> configure your system for booting "
-#| "off a CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> "
-#| "insert your CD, reboot, and proceed to the next chapter."
 msgid ""
 "The easiest route for most people will be to use a set of &debian; CDs. If "
 "you have a CD set, and if your machine supports booting directly off the CD, "
 "great! Simply <phrase arch=\"x86\"> configure your system for booting off a "
 "CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> insert "
 "your CD, reboot, and proceed to the next chapter."
-msgstr "对于大多数人来说，最快的途径是使用一套 &debian; CD 光盘套件。如果您有此套件，并且如果您的机器支持直接 CD 引导，太棒了！只需要<phrase arch=\"x86\">配置您的系统可以用 CD 启动，参见 <xref linkend=\"boot-dev-select\"/>, </phrase>插入您的 CD，重启，然后继续下一章。"
+msgstr ""
+"对于大多数人来说，最快的途径是使用一套 &debian; CD 光盘套件。如果您有此套件，"
+"并且如果您的机器支持直接 CD 引导，太棒了！只需要<phrase arch=\"x86\">配置您的"
+"系统可以用 CD 启动，参见 <xref linkend=\"boot-dev-select\"/>, </phrase>插入您"
+"的 CD，重启，然后继续下一章。"
 
 # index.docbook:542, index.docbook:595, index.docbook:968, index.docbook:1787, index.docbook:2035, index.docbook:2389
 #. Tag: para
@@ -132,19 +130,16 @@ msgstr ""
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
 #, no-c-format
-#| msgid ""
-#| "Even if you cannot boot from CD-ROM, you can probably install the Debian "
-#| "system components and any packages you want from CD-ROM. Simply boot "
-#| "using a different media, such as floppies. When it's time to install the "
-#| "operating system, base system, and any additional packages, point the "
-#| "installation system at the CD-ROM drive."
 msgid ""
 "Even if you cannot boot from CD-ROM, you can probably install the &debian; "
 "system components and any packages you want from CD-ROM. Simply boot using a "
 "different media, such as floppies. When it's time to install the operating "
 "system, base system, and any additional packages, point the installation "
 "system at the CD-ROM drive."
-msgstr "即便您不能从 CD-ROM 引导，依然可以安装 CD-ROM 上面的 &debian; 系统组件和所有软件包。这只要使用不同的媒介引导，比如软盘。当安装操作系统、基础系统和任意附加的软件包时，只需将安装系统指向 CD-ROM 驱动器即可。"
+msgstr ""
+"即便您不能从 CD-ROM 引导，依然可以安装 CD-ROM 上面的 &debian; 系统组件和所有"
+"软件包。这只要使用不同的媒介引导，比如软盘。当安装操作系统、基础系统和任意附"
+"加的软件包时，只需将安装系统指向 CD-ROM 驱动器即可。"
 
 # index.docbook:558, index.docbook:611, index.docbook:984, index.docbook:1803, index.docbook:2051, index.docbook:2405
 #. Tag: para
@@ -226,30 +221,6 @@ msgstr "通过网络使用 Linux/Unix"
 #. Tag: para
 #: boot-installer.xml:150
 #, no-c-format
-#| msgid ""
-#| "You can use <command>upslug2</command> from any Linux or Unix machine to "
-#| "upgrade the machine via the network. This software is packaged for "
-#| "Debian. First, you have to put your NSLU2 in upgrade mode: <orderedlist> "
-#| "<listitem><para> Disconnect any disks and/or devices from the USB ports. "
-#| "</para></listitem> <listitem><para> Power off the NSLU2 </para></"
-#| "listitem> <listitem><para> Press and hold the reset button (accessible "
-#| "through the small hole on the back just above the power input). </para></"
-#| "listitem> <listitem><para> Press and release the power button to power on "
-#| "the NSLU2. </para></listitem> <listitem><para> Wait for 10 seconds "
-#| "watching the ready/status LED. After 10 seconds it will change from amber "
-#| "to red. Immediately release the reset button. </para></listitem> "
-#| "<listitem><para> The NSLU2 ready/status LED will flash alternately red/"
-#| "green (there is a 1 second delay before the first green). The NSLU2 is "
-#| "now in upgrade mode. </para></listitem> </orderedlist> See the <ulink url="
-#| "\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux "
-#| "pages</ulink> if you have problems with this. Once your NSLU2 is in "
-#| "upgrade mode, you can flash the new image: <informalexample><screen>\n"
-#| "sudo upslug2 -i di-nslu2.bin\n"
-#| "</screen></informalexample> Note that the tool also shows the MAC address "
-#| "of your NSLU2, which may come in handy to configure your DHCP server. "
-#| "After the whole image has been written and verified, the system will "
-#| "automatically reboot. Make sure you connect your USB disk again now, "
-#| "otherwise the installer won't be able to find it."
 msgid ""
 "You can use <command>upslug2</command> from any Linux or Unix machine to "
 "upgrade the machine via the network. This software is packaged for &debian;. "
@@ -275,9 +246,23 @@ msgid ""
 "reboot. Make sure you connect your USB disk again now, otherwise the "
 "installer won't be able to find it."
 msgstr ""
-"您可以从任一 Linux 或 Unix 机器上使用 <command>upslug2</command> 通过网络来升级机器。&debian; 下有该软件包。首先，您必须将 NSLU2 置于升级模式： <orderedlist> <listitem><para> 去除所有连接在 USB 口上的磁盘和/或设备。</para></listitem> <listitem><para> 关闭 NSLU2 电源 </para></listitem> <listitem><para> 按住复位按钮 (位于后面电源输入上方的小孔)。 </para></listitem> <listitem><para> 按下和松开开关键打开 NSLU2。 </para></listitem> <listitem><para> 等待 10 秒监视就绪/状态 LED。 10 秒钟后它会从琥珀色变成红色。立即松开复位按钮。 </para></listitem> <listitem><para> NSLU2 就绪/状态 LED 将会红/绿交替闪烁 (在首次出现绿色时会有 1 秒钟的延迟)。NSLU2 现在处于升级模式。</para></listitem> </orderedlist> 如果您遇到问题，请参考 <ulink url=\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux pages</ulink>。一旦 NSLU2 处于升级模式，您就可以刷人新的映像：<informalexample><screen>\n"
+"您可以从任一 Linux 或 Unix 机器上使用 <command>upslug2</command> 通过网络来升"
+"级机器。&debian; 下有该软件包。首先，您必须将 NSLU2 置于升级模式： "
+"<orderedlist> <listitem><para> 去除所有连接在 USB 口上的磁盘和/或设备。</"
+"para></listitem> <listitem><para> 关闭 NSLU2 电源 </para></listitem> "
+"<listitem><para> 按住复位按钮 (位于后面电源输入上方的小孔)。 </para></"
+"listitem> <listitem><para> 按下和松开开关键打开 NSLU2。 </para></listitem> "
+"<listitem><para> 等待 10 秒监视就绪/状态 LED。 10 秒钟后它会从琥珀色变成红"
+"色。立即松开复位按钮。 </para></listitem> <listitem><para> NSLU2 就绪/状态 "
+"LED 将会红/绿交替闪烁 (在首次出现绿色时会有 1 秒钟的延迟)。NSLU2 现在处于升级"
+"模式。</para></listitem> </orderedlist> 如果您遇到问题，请参考 <ulink url="
+"\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux "
+"pages</ulink>。一旦 NSLU2 处于升级模式，您就可以刷人新的映像："
+"<informalexample><screen>\n"
 "sudo upslug2 -i di-nslu2.bin\n"
-"</screen></informalexample> 注意，该工具还会显示 NSLU2 的 MAC 地址，它可以用来配置 DHCP 服务器。整个映像写入和检验后，系统将自动重启。确保 USB 磁盘再次连接，否则将无法找到安装程序。"
+"</screen></informalexample> 注意，该工具还会显示 NSLU2 的 MAC 地址，它可以用"
+"来配置 DHCP 服务器。整个映像写入和检验后，系统将自动重启。确保 USB 磁盘再次连"
+"接，否则将无法找到安装程序。"
 
 #. Tag: title
 #: boot-installer.xml:211
@@ -324,14 +309,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:245
 #, no-c-format
-#| msgid ""
-#| "To boot the SS4000-E, use your serial nullmodem cable and the ribbon "
-#| "cable to connect to the serial port of the SS4000-E, and reboot the "
-#| "machine. You need to use a serial terminal application to communicate "
-#| "with the machine; a good option on a Debian GNU/Linux is to use the "
-#| "<command>cu</command> program, in the package of the same name. Assuming "
-#| "the serial port on your computer is to be found on <filename>/dev/ttyS0</"
-#| "filename>, use the following command line:"
 msgid ""
 "To boot the SS4000-E, use your serial nullmodem cable and the ribbon cable "
 "to connect to the serial port of the SS4000-E, and reboot the machine. You "
@@ -340,7 +317,11 @@ msgid ""
 "program, in the package of the same name. Assuming the serial port on your "
 "computer is to be found on <filename>/dev/ttyS0</filename>, use the "
 "following command line:"
-msgstr "要启动 SS4000-E，请使用您的串行 nullmodem 线和 ribbon 线连接到 SS4000-E 的串口，然后重新启动机器。您需要用一个串行终端程序与此机器通讯； &debian; GNU/Linux 上可以使用 <command>cu</command> 程序，软件包和该程序同名。假设您计算机上的串口是 <filename>/dev/ttyS0</filename>，请使用下列命令行："
+msgstr ""
+"要启动 SS4000-E，请使用您的串行 nullmodem 线和 ribbon 线连接到 SS4000-E 的串"
+"口，然后重新启动机器。您需要用一个串行终端程序与此机器通讯； &debian; GNU/"
+"Linux 上可以使用 <command>cu</command> 程序，软件包和该程序同名。假设您计算机"
+"上的串口是 <filename>/dev/ttyS0</filename>，请使用下列命令行："
 
 #. Tag: screen
 #: boot-installer.xml:257
@@ -541,7 +522,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:465
 #, no-c-format
-#| msgid "Booting from CD-ROM"
 msgid "Booting from DOS"
 msgstr "从 DOS 引导"
 
@@ -564,9 +544,11 @@ msgid ""
 "disk as explained in <xref linkend=\"files-loadlin\"/>, and change the "
 "current drive to it if needed."
 msgstr ""
-"如果您可以使用安装 CD, 请切换到 CD-ROM 驱动器，例如. <informalexample><screen>\n"
+"如果您可以使用安装 CD, 请切换到 CD-ROM 驱动器，例如. "
+"<informalexample><screen>\n"
 "d:\n"
-"</screen></informalexample> ，或者确认您已依照 <xref linkend=\"files-loadlin\"/> 指引准备好了硬盘, 然后切换到该磁盘。"
+"</screen></informalexample> ，或者确认您已依照 <xref linkend=\"files-loadlin"
+"\"/> 指引准备好了硬盘, 然后切换到该磁盘。"
 
 #. Tag: para
 #: boot-installer.xml:481
@@ -583,9 +565,11 @@ msgid ""
 msgstr ""
 "进入您选择的 flavor 子目录，如, <informalexample><screen>\n"
 "cd \\&x86-install-dir;\n"
-"</screen></informalexample> 如果您希望使用图形安装程序，请进入 <filename>gtk</filename> 子目录。<informalexample><screen>\n"
+"</screen></informalexample> 如果您希望使用图形安装程序，请进入 "
+"<filename>gtk</filename> 子目录。<informalexample><screen>\n"
 "cd gtk\n"
-"</screen></informalexample> 然后，执行 <command>install.bat</command>。内核将会加载并运行安装程序。"
+"</screen></informalexample> 然后，执行 <command>install.bat</command>。内核将"
+"会加载并运行安装程序。"
 
 #. Tag: title
 #: boot-installer.xml:499
@@ -922,20 +906,6 @@ msgstr "引导界面"
 #. Tag: para
 #: boot-installer.xml:715
 #, no-c-format
-#| msgid ""
-#| "When the installer boots, you should be presented with a friendly "
-#| "graphical screen showing the Debian logo and a menu: "
-#| "<informalexample><screen>\n"
-#| "Installer boot menu\n"
-#| "\n"
-#| "Install\n"
-#| "Graphical install\n"
-#| "Advanced options       >\n"
-#| "Help\n"
-#| "\n"
-#| "Press ENTER to boot or TAB to edit a menu entry\n"
-#| "</screen></informalexample> Depending on the installation method you are "
-#| "using, the <quote>Graphical install</quote> option may not be available."
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
 "screen showing the &debian; logo and a menu: <informalexample><screen>\n"
@@ -950,7 +920,8 @@ msgid ""
 "</screen></informalexample> Depending on the installation method you are "
 "using, the <quote>Graphical install</quote> option may not be available."
 msgstr ""
-"安装程序引导后，您应该看到友好的图形界面显示出 &debian; 图标和一个菜单：<informalexample><screen>\n"
+"安装程序引导后，您应该看到友好的图形界面显示出 &debian; 图标和一个菜单："
+"<informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -959,7 +930,8 @@ msgstr ""
 "Help\n"
 "\n"
 "Press ENTER to boot or TAB to edit a menu entry\n"
-"</screen></informalexample> 由于您采用的安装方式不同，<quote>Graphical install</quote> 选项可能不会出现。"
+"</screen></informalexample> 由于您采用的安装方式不同，<quote>Graphical "
+"install</quote> 选项可能不会出现。"
 
 #. Tag: para
 #: boot-installer.xml:725
@@ -1093,17 +1065,6 @@ msgstr "CD 的内容"
 #. Tag: para
 #: boot-installer.xml:848
 #, no-c-format
-#| msgid ""
-#| "There are three basic variations of Debian Install CDs. The "
-#| "<emphasis>Business Card</emphasis> CD has a minimal installation that "
-#| "will fit on the small form factor CD media. It requires a network "
-#| "connection in order to install the rest of the base installation and make "
-#| "a usable system. The <emphasis>Network Install</emphasis> CD has all of "
-#| "the packages for a base install but requires a network connection to a "
-#| "Debian mirror site in order to install the extra packages one would want "
-#| "for a complete system . The set of Debian CDs can install a complete "
-#| "system from the wide range of packages without needing access to the "
-#| "network."
 msgid ""
 "There are three basic variations of &debian; Install CDs. The "
 "<emphasis>Business Card</emphasis> CD has a minimal installation that will "
@@ -1114,7 +1075,13 @@ msgid ""
 "order to install the extra packages one would want for a complete system . "
 "The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
-msgstr "有三种基本的 &debian; 安装光盘 CD 衍生品：<emphasis>名片式(Business Card)</emphasis> CD 有一个微型的安装程序，并且可以储存在一小张 CD 介质上。它需要借助网络连接来安装基本系统的其他部分，才能建立起一个可用的系统。<emphasis>网络安装(Network Install)</emphasis> CD 光盘具有基本系统需的所有包，但是它还是需要网络连接到 &debian; 的镜像，安装其他的软件包建立一个完整的系统。&debian; CD 光盘套件，则可以不使用网络就能安装大量软件包，建立完整的系统。"
+msgstr ""
+"有三种基本的 &debian; 安装光盘 CD 衍生品：<emphasis>名片式(Business Card)</"
+"emphasis> CD 有一个微型的安装程序，并且可以储存在一小张 CD 介质上。它需要借助"
+"网络连接来安装基本系统的其他部分，才能建立起一个可用的系统。<emphasis>网络安"
+"装(Network Install)</emphasis> CD 光盘具有基本系统需的所有包，但是它还是需要"
+"网络连接到 &debian; 的镜像，安装其他的软件包建立一个完整的系统。&debian; CD "
+"光盘套件，则可以不使用网络就能安装大量软件包，建立完整的系统。"
 
 #. Tag: para
 #: boot-installer.xml:864
@@ -1130,25 +1097,29 @@ msgid ""
 "means that the system disk on an IA-64 system has an additional disk "
 "partition dedicated to EFI instead of the simple MBR or boot block on more "
 "conventional systems."
-msgstr "IA-64 使用 Intel 最新的可拓展固件界面(Extensible Firmware Interface (EFI))。与传统的 x86 BIOS 只了解分区表和主引导记录(MBR)而不知道其他引导设备的特点不同，EFI 可以对 FAT16 和 FAT32 格式的硬盘分区进行读写操作。这个特点简化了通常很难以理解的系统启动过程。系统 boot loader 以及 EFI 固件支持一个完全的文件系统，来保存引导一个机器所需要得所有文件。这意味着在一个 IA-64 系统上的系统磁盘，具有一个附加的专门为 EFI 服务的磁盘分区，而不是像传统系统上只是简单的 MBR 或者引导块记录。"
+msgstr ""
+"IA-64 使用 Intel 最新的可拓展固件界面(Extensible Firmware Interface (EFI))。"
+"与传统的 x86 BIOS 只了解分区表和主引导记录(MBR)而不知道其他引导设备的特点不"
+"同，EFI 可以对 FAT16 和 FAT32 格式的硬盘分区进行读写操作。这个特点简化了通常"
+"很难以理解的系统启动过程。系统 boot loader 以及 EFI 固件支持一个完全的文件系"
+"统，来保存引导一个机器所需要得所有文件。这意味着在一个 IA-64 系统上的系统磁"
+"盘，具有一个附加的专门为 EFI 服务的磁盘分区，而不是像传统系统上只是简单的 "
+"MBR 或者引导块记录。"
 
 #. Tag: para
 #: boot-installer.xml:880
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer CD contains a small EFI partition where the "
-#| "<command>ELILO</command> bootloader, its configuration file, the "
-#| "installer's kernel, and initial filesystem (initrd) are located. The "
-#| "running system also contains an EFI partition where the necessary files "
-#| "for booting the system reside. These files are readable from the EFI "
-#| "Shell as described below."
 msgid ""
 "The &debian; Installer CD contains a small EFI partition where the "
 "<command>ELILO</command> bootloader, its configuration file, the installer's "
 "kernel, and initial filesystem (initrd) are located. The running system also "
 "contains an EFI partition where the necessary files for booting the system "
 "reside. These files are readable from the EFI Shell as described below."
-msgstr "&debian; CD 包含了一个小型版本的 EFI 分区来放置 <command>ELILO</command>，它的配置文件，安装程序内核以及初始的文件系统(initrd)。运行的系统同时也包含了一个 EFI 分区用于放置引导系统所需要的必要文件。这些文件可以从 EFI Shell 读出，说明如下。"
+msgstr ""
+"&debian; CD 包含了一个小型版本的 EFI 分区来放置 <command>ELILO</command>，它"
+"的配置文件，安装程序内核以及初始的文件系统(initrd)。运行的系统同时也包含了一"
+"个 EFI 分区用于放置引导系统所需要的必要文件。这些文件可以从 EFI Shell 读出，"
+"说明如下。"
 
 #. Tag: para
 #: boot-installer.xml:889
@@ -1288,15 +1259,13 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:986
 #, no-c-format
-#| msgid ""
-#| "These steps start the Debian boot loader which will display a menu page "
-#| "for you to select a boot kernel and options. Proceed to selecting the "
-#| "boot kernel and options."
 msgid ""
 "These steps start the &debian; boot loader which will display a menu page "
 "for you to select a boot kernel and options. Proceed to selecting the boot "
 "kernel and options."
-msgstr "这些步骤启动的 &debian; boot loader 会显示一个菜单页用于选择启动内核和选项。进入选择启动内核和选项。"
+msgstr ""
+"这些步骤启动的 &debian; boot loader 会显示一个菜单页用于选择启动内核和选项。"
+"进入选择启动内核和选项。"
 
 #. Tag: title
 #: boot-installer.xml:996
@@ -1307,17 +1276,15 @@ msgstr "选项 2: 从 EFI Shell 启动"
 #. Tag: para
 #: boot-installer.xml:997
 #, no-c-format
-#| msgid ""
-#| "If, for some reason, option 1 is not successful, reboot the machine and "
-#| "when the EFI Boot Manager screen appears there should be one option "
-#| "called <command>EFI Shell [Built-in]</command>. Boot the Debian Installer "
-#| "CD with the following steps:"
 msgid ""
 "If, for some reason, option 1 is not successful, reboot the machine and when "
 "the EFI Boot Manager screen appears there should be one option called "
 "<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
-msgstr "某些情况下，选项 1 无法成功，重新启动机器然后在 EFI Boot Manager 画面出现的时候会有一个选项称为 <command>EFI Shell [Built-in]</command>。可以通过如下步骤来引导 &debian; 安装程序 CD :"
+msgstr ""
+"某些情况下，选项 1 无法成功，重新启动机器然后在 EFI Boot Manager 画面出现的时"
+"候会有一个选项称为 <command>EFI Shell [Built-in]</command>。可以通过如下步骤"
+"来引导 &debian; 安装程序 CD :"
 
 #. Tag: para
 #: boot-installer.xml:1008
@@ -1387,19 +1354,16 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1049
 #, no-c-format
-#| msgid ""
-#| "As with option 1, these steps start the Debian boot loader which will "
-#| "display a menu page for you to select a boot kernel and options. You can "
-#| "also enter the shorter <command>fs<replaceable>n</replaceable>:elilo</"
-#| "command> command at the shell prompt. Proceed to selecting the boot "
-#| "kernel and options."
 msgid ""
 "As with option 1, these steps start the &debian; boot loader which will "
 "display a menu page for you to select a boot kernel and options. You can "
 "also enter the shorter <command>fs<replaceable>n</replaceable>:elilo</"
 "command> command at the shell prompt. Proceed to selecting the boot kernel "
 "and options."
-msgstr "与选项 1 相同，这些步骤也会启动 &debian; boot loader，显示一个菜单页供选择启动内核和参数。您可在 shell 提示符下输入 <command>fs<replaceable>n</replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
+msgstr ""
+"与选项 1 相同，这些步骤也会启动 &debian; boot loader，显示一个菜单页供选择启"
+"动内核和参数。您可在 shell 提示符下输入 <command>fs<replaceable>n</"
+"replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
 
 #. Tag: title
 #: boot-installer.xml:1063
@@ -1544,15 +1508,13 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1156
 #, no-c-format
-#| msgid ""
-#| "Press <command>ENTER</command>. This will load and start the kernel. The "
-#| "kernel will display its usual initialization messages followed by the "
-#| "first screen of the Debian Installer."
 msgid ""
 "Press <command>ENTER</command>. This will load and start the kernel. The "
 "kernel will display its usual initialization messages followed by the first "
 "screen of the &debian; Installer."
-msgstr "按下 <command>ENTER</command>。会加载并启动内核。内核在 &ebian; 安装程序的第一个屏幕显示常规的初始化信息。"
+msgstr ""
+"按下 <command>ENTER</command>。会加载并启动内核。内核在 &ebian; 安装程序的第"
+"一个屏幕显示常规的初始化信息。"
 
 #. Tag: para
 #: boot-installer.xml:1165 boot-installer.xml:1301
@@ -1710,19 +1672,16 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1292
 #, no-c-format
-#| msgid ""
-#| "The boot loader will display its prompt after it has downloaded and "
-#| "processed its configuration file. At this point, the installation "
-#| "proceeds with the same steps as a CD install. Select a boot option as in "
-#| "above and when the kernel has completed installing itself from the "
-#| "network, it will start the Debian Installer."
 msgid ""
 "The boot loader will display its prompt after it has downloaded and "
 "processed its configuration file. At this point, the installation proceeds "
 "with the same steps as a CD install. Select a boot option as in above and "
 "when the kernel has completed installing itself from the network, it will "
 "start the &debian; Installer."
-msgstr "在下载并且处理配置文件后，boot loader 将显示它的提示符。从这里开始，安装过程将和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到的引导选项，它将开始 &debian; 安装程序。"
+msgstr ""
+"在下载并且处理配置文件后，boot loader 将显示它的提示符。从这里开始，安装过程"
+"将和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到"
+"的引导选项，它将开始 &debian; 安装程序。"
 
 # index.docbook:1899, index.docbook:1946
 #. Tag: title
@@ -1734,15 +1693,6 @@ msgstr "SGI TFTP 引导"
 #. Tag: para
 #: boot-installer.xml:1319
 #, no-c-format
-#| msgid ""
-#| "After entering the command monitor use <informalexample><screen>\n"
-#| "bootp():\n"
-#| "</screen></informalexample> on SGI machines to boot linux and to begin "
-#| "installation of the Debian Software. In order to make this work you may "
-#| "have to unset the <envar>netaddr</envar> environment variable. Type "
-#| "<informalexample><screen>\n"
-#| "unsetenv netaddr\n"
-#| "</screen></informalexample> in the command monitor to do this."
 msgid ""
 "After entering the command monitor use <informalexample><screen>\n"
 "bootp():\n"
@@ -1755,7 +1705,9 @@ msgid ""
 msgstr ""
 "SGI 上引导 linux 要在进入命令监视器后使用 <informalexample><screen>\n"
 "bootp():\n"
-"</screen></informalexample> 来开始 &debian; 软件的安装。为了让它运行，您可能必须取消 <envar>netaddr</envar> 环境变量的设置。通过命令监视器上输入 <informalexample><screen>\n"
+"</screen></informalexample> 来开始 &debian; 软件的安装。为了让它运行，您可能"
+"必须取消 <envar>netaddr</envar> 环境变量的设置。通过命令监视器上输入 "
+"<informalexample><screen>\n"
 "unsetenv netaddr\n"
 "</screen></informalexample> 可以达到此目的。"
 
@@ -1921,19 +1873,17 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1512
 #, no-c-format
-#| msgid ""
-#| "OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
-#| "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
-#| "software version of this driver is not available. All OldWorld systems "
-#| "have floppy drives, so use the floppy drive to launch the installer, and "
-#| "then point the installer to the CD for the needed files."
 msgid ""
 "OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
 "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
 "software version of this driver is not available. All OldWorld systems have "
 "floppy drives, so use the floppy drive to launch the installer, and then "
 "point the installer to the CD for the needed files."
-msgstr "OldWorld Powermacs 不能从一张 &debian; CD 上引导，因为 OldWorld 计算机需要在 CD 上安装一个 MacOSROM CD 引导驱动程序但是目前还没有自由的版本。所有的 OldWorld 系统具有软盘驱动程序，因此可以使用软盘驱动程序来启动安装程序，然后让安装程序 从 CD 上选择所需要的文件。"
+msgstr ""
+"OldWorld Powermacs 不能从一张 &debian; CD 上引导，因为 OldWorld 计算机需要在 "
+"CD 上安装一个 MacOSROM CD 引导驱动程序但是目前还没有自由的版本。所有的 "
+"OldWorld 系统具有软盘驱动程序，因此可以使用软盘驱动程序来启动安装程序，然后让"
+"安装程序 从 CD 上选择所需要的文件。"
 
 #. Tag: para
 #: boot-installer.xml:1521
@@ -2021,27 +1971,6 @@ msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
 #. Tag: para
 #: boot-installer.xml:1588
 #, no-c-format
-#| msgid ""
-#| "You will have already placed the <filename>vmlinux</filename>, "
-#| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
-#| "<filename>yaboot.conf</filename> files at the root level of your HFS "
-#| "partition in <xref linkend=\"files-newworld\"/>. You will now have to "
-#| "boot into OpenFirmware (see <xref linkend=\"invoking-openfirmware\"/>). "
-#| "At the prompt, type <informalexample><screen>\n"
-#| "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-#| "</screen></informalexample> replacing <replaceable>x</replaceable> with "
-#| "the partition number of the HFS partition where the kernel and yaboot "
-#| "files were placed, followed by a &enterkey;. On some machines, you may "
-#| "need to use <userinput>ide0:</userinput> instead of <userinput>hd:</"
-#| "userinput>. In a few more seconds you will see a yaboot prompt "
-#| "<informalexample><screen>\n"
-#| "boot:\n"
-#| "</screen></informalexample> At yaboot's <prompt>boot:</prompt> prompt, "
-#| "type either <userinput>install</userinput> or <userinput>install "
-#| "video=ofonly</userinput> followed by a &enterkey;. The "
-#| "<userinput>video=ofonly</userinput> argument is for maximum "
-#| "compatibility; you can try it if <userinput>install</userinput> doesn't "
-#| "work. The Debian installation program should start."
 msgid ""
 "You will have already placed the <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -2062,11 +1991,22 @@ msgid ""
 "argument is for maximum compatibility; you can try it if <userinput>install</"
 "userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
-"您应该已经将 <filename>vmlinux</filename>、 <filename>initrd.gz</filename>、 <filename>yaboot</filename> 和 <filename>yaboot.conf</filename> 文件在 HFS 分区的根层次放置好了 <xref linkend=\"files-newworld\"/>。现在必须引导进入 Open Firmware (参阅 <xref linkend=\"invoking-openfirmware\"/>)。在提示符下，输入： <informalexample><screen>\n"
+"您应该已经将 <filename>vmlinux</filename>、 <filename>initrd.gz</filename>、 "
+"<filename>yaboot</filename> 和 <filename>yaboot.conf</filename> 文件在 HFS 分"
+"区的根层次放置好了 <xref linkend=\"files-newworld\"/>。现在必须引导进入 Open "
+"Firmware (参阅 <xref linkend=\"invoking-openfirmware\"/>)。在提示符下，输"
+"入： <informalexample><screen>\n"
 "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-"</screen></informalexample> 用放置内核和 yaboot 文件的 HFS 分区号来替换 <replaceable>x</replaceable>, 然后按下 &enterkey;。在某些机器上，您也许需要时用 <userinput>ide0:</userinput> 来替换 <userinput>hd:</userinput>，在接下来的几秒钟内，将会看到一个提示符 <informalexample><screen>\n"
+"</screen></informalexample> 用放置内核和 yaboot 文件的 HFS 分区号来替换 "
+"<replaceable>x</replaceable>, 然后按下 &enterkey;。在某些机器上，您也许需要时"
+"用 <userinput>ide0:</userinput> 来替换 <userinput>hd:</userinput>，在接下来的"
+"几秒钟内，将会看到一个提示符 <informalexample><screen>\n"
 "boot:\n"
-"</screen></informalexample> 在 yaboot 的 <prompt>boot:</prompt> 提示符下，输入 <userinput>install</userinput> 或者 <userinput>install video=ofonly</userinput> 然后按下 &enterkey;。<userinput>video=ofonly</userinput> 参数是用于最大可能性的兼容性；您可以在 <userinput>install</userinput> 不工作的情况下尝试使用它。&debian; 安装程序将会启动。"
+"</screen></informalexample> 在 yaboot 的 <prompt>boot:</prompt> 提示符下，输"
+"入 <userinput>install</userinput> 或者 <userinput>install video=ofonly</"
+"userinput> 然后按下 &enterkey;。<userinput>video=ofonly</userinput> 参数是用"
+"于最大可能性的兼容性；您可以在 <userinput>install</userinput> 不工作的情况下"
+"尝试使用它。&debian; 安装程序将会启动。"
 
 # index.docbook:700, index.docbook:2176
 #. Tag: title
@@ -2611,7 +2551,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:2082
 #, no-c-format
-#| msgid "Debian Installer Parameters"
 msgid "&debian; Installer Parameters"
 msgstr "&debian; 安装程序的参数"
 
@@ -2800,15 +2739,13 @@ msgstr "INSTALL_MEDIA_DEV"
 #. Tag: para
 #: boot-installer.xml:2205
 #, no-c-format
-#| msgid ""
-#| "The value of the parameter is the path to the device to load the Debian "
-#| "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
-#| "userinput>"
 msgid ""
 "The value of the parameter is the path to the device to load the &debian; "
 "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
 "userinput>"
-msgstr "参数的值是装入 &debian; 安装程序的设备路径，例如：<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
+msgstr ""
+"参数的值是装入 &debian; 安装程序的设备路径，例如："
+"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
 
 #. Tag: para
 #: boot-installer.xml:2211
@@ -2974,18 +2911,16 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 #. Tag: para
 #: boot-installer.xml:2314
 #, no-c-format
-#| msgid ""
-#| "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
-#| "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. "
-#| "Note that this support is currently experimental. Additional information "
-#| "can be found on the <ulink url=\"&url-d-i-wiki;\">Debian Installer Wiki</"
-#| "ulink>."
 msgid ""
 "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
 "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. Note "
 "that this support is currently experimental. Additional information can be "
 "found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
-msgstr "设为 <userinput>true</userinput> 可以打开安装程序中对 Serial ATA RAID (也称为 ATA RAID、BIOS RAID 或 fake RAID)磁盘的支持。注意，这种支持当前是实验性的。更多的信息可以在 <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink> 找到。"
+msgstr ""
+"设为 <userinput>true</userinput> 可以打开安装程序中对 Serial ATA RAID (也称"
+"为 ATA RAID、BIOS RAID 或 fake RAID)磁盘的支持。注意，这种支持当前是实验性"
+"的。更多的信息可以在 <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</"
+"ulink> 找到。"
 
 #. Tag: term
 #: boot-installer.xml:2325
@@ -3310,13 +3245,6 @@ msgstr "mirror/protocol (protocol)"
 #. Tag: para
 #: boot-installer.xml:2525
 #, no-c-format
-#| msgid ""
-#| "By default the installer will use the http protocol to download files "
-#| "from Debian mirrors and changing that to ftp is not possible during "
-#| "installations at normal priority. By setting this parameter to "
-#| "<userinput>ftp</userinput>, you can force the installer to use that "
-#| "protocol instead. Note that you cannot select an ftp mirror from a list, "
-#| "you have to enter the hostname manually."
 msgid ""
 "By default the installer will use the http protocol to download files from "
 "&debian; mirrors and changing that to ftp is not possible during "
@@ -3324,7 +3252,10 @@ msgid ""
 "<userinput>ftp</userinput>, you can force the installer to use that protocol "
 "instead. Note that you cannot select an ftp mirror from a list, you have to "
 "enter the hostname manually."
-msgstr "默认情况下，安装程序会使用 http 协议从 &debian; 镜像下载文件，在普通优先级下不能修改协议为 ftp。设置该参数为 <userinput>ftp</userinput>，您可以强制安装程序使用该协议。注意，必须手动输入主机名，而不是从列表中选择 ftp 镜像。"
+msgstr ""
+"默认情况下，安装程序会使用 http 协议从 &debian; 镜像下载文件，在普通优先级下"
+"不能修改协议为 ftp。设置该参数为 <userinput>ftp</userinput>，您可以强制安装程"
+"序使用该协议。注意，必须手动输入主机名，而不是从列表中选择 ftp 镜像。"
 
 #. Tag: term
 #: boot-installer.xml:2538
@@ -3770,13 +3701,11 @@ msgstr "软盘的可靠性"
 #. Tag: para
 #: boot-installer.xml:2819
 #, no-c-format
-#| msgid ""
-#| "The biggest problem for people using floppy disks to install Debian seems "
-#| "to be floppy disk reliability."
 msgid ""
 "The biggest problem for people using floppy disks to install &debian; seems "
 "to be floppy disk reliability."
-msgstr "对于用软盘安装 &debian; 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
+msgstr ""
+"对于用软盘安装 &debian; 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
 #. Tag: para
 #: boot-installer.xml:2824
@@ -4227,14 +4156,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:3104
 #, no-c-format
-#| msgid ""
-#| "If you have a working Debian system, the easiest way to send an "
-#| "installation report is to install the <classname>installation-report</"
-#| "classname> and <classname>reportbug</classname> packages "
-#| "(<command>aptitude install installation-report reportbug</command>), "
-#| "configure <classname>reportbug</classname> as explained in <xref linkend="
-#| "\"mail-outgoing\"/>, and run the command <command>reportbug installation-"
-#| "reports</command>."
 msgid ""
 "If you have a working &debian; system, the easiest way to send an "
 "installation report is to install the <classname>installation-report</"
@@ -4243,7 +4164,13 @@ msgid ""
 "<classname>reportbug</classname> as explained in <xref linkend=\"mail-"
 "outgoing\"/>, and run the command <command>reportbug installation-reports</"
 "command>."
-msgstr "如果您有一个可以运转的 &debian; 系统，发送安装报告最简单的方法是安装 <classname>installation-report</classname> 和 <classname>reportbug</classname> 软件包(<command>aptitude install installation-report reportbug</command>)，配置 <classname>reportbug</classname> 的说明参阅 <xref linkend=\"mail-outgoing\"/>，然后执行 <command>reportbug installation-reports</command> 命令。"
+msgstr ""
+"如果您有一个可以运转的 &debian; 系统，发送安装报告最简单的方法是安装 "
+"<classname>installation-report</classname> 和 <classname>reportbug</"
+"classname> 软件包(<command>aptitude install installation-report reportbug</"
+"command>)，配置 <classname>reportbug</classname> 的说明参阅 <xref linkend="
+"\"mail-outgoing\"/>，然后执行 <command>reportbug installation-reports</"
+"command> 命令。"
 
 #. Tag: para
 #: boot-installer.xml:3114
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index aa5b7d933..6a29d91cf 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -15,7 +15,6 @@ msgstr ""
 #. Tag: title
 #: boot-new.xml:5
 #, no-c-format
-#| msgid "Booting Into Your New Debian System"
 msgid "Booting Into Your New &debian; System"
 msgstr "启动进入新的 &debian; 系统"
 
@@ -38,13 +37,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:13
 #, no-c-format
-#| msgid ""
-#| "If you did a default installation, the first thing you should see when "
-#| "you boot the system is the menu of the <classname>grub</classname> or "
-#| "possibly the <classname>lilo</classname> bootloader. The first choices in "
-#| "the menu will be for your new Debian system. If you had any other "
-#| "operating systems on your computer (like Windows) that were detected by "
-#| "the installation system, those will be listed lower down in the menu."
 msgid ""
 "If you did a default installation, the first thing you should see when you "
 "boot the system is the menu of the <classname>grub</classname><phrase arch="
@@ -53,18 +45,15 @@ msgid ""
 "had any other operating systems on your computer (like Windows) that were "
 "detected by the installation system, those will be listed lower down in the "
 "menu."
-msgstr "如果您使用了默认安装，引导系统后首先看到的是 <classname>grub</classname> <phrase arch=\"x86\">或者是 <classname>lilo</classname> bootloader</phrase>菜单。菜单中的首选项将是新的 &debian; 系统。假如您的计算机上有其他的操作系统(如 Windows)，它们将被安装系统检测到，并列入菜单的下方。"
+msgstr ""
+"如果您使用了默认安装，引导系统后首先看到的是 <classname>grub</classname> "
+"<phrase arch=\"x86\">或者是 <classname>lilo</classname> bootloader</phrase>菜"
+"单。菜单中的首选项将是新的 &debian; 系统。假如您的计算机上有其他的操作系统"
+"(如 Windows)，它们将被安装系统检测到，并列入菜单的下方。"
 
 #. Tag: para
 #: boot-new.xml:23
 #, no-c-format
-#| msgid ""
-#| "If the system fails to start up correctly, don't panic. If the "
-#| "installation was successful, chances are good that there is only a "
-#| "relatively minor problem that is preventing the system from booting "
-#| "Debian. In most cases such problems can be fixed without having to repeat "
-#| "the installation. One available option to fix boot problems is to use the "
-#| "installer's built-in rescue mode (see <xref linkend=\"rescue\"/>)."
 msgid ""
 "If the system fails to start up correctly, don't panic. If the installation "
 "was successful, chances are good that there is only a relatively minor "
@@ -72,23 +61,14 @@ msgid ""
 "such problems can be fixed without having to repeat the installation. One "
 "available option to fix boot problems is to use the installer's built-in "
 "rescue mode (see <xref linkend=\"rescue\"/>)."
-msgstr "如果系统无法正确启动，请勿惊慌。如果安装成功，还不错，只是出了一点儿小问题没法让系统引导 &debian;。多数情况下不需重新安装就能修复。修复引导问题的一种方法是使用安装程序内置的 rescue 模式(参阅 <xref linkend=\"rescue\"/>)。"
+msgstr ""
+"如果系统无法正确启动，请勿惊慌。如果安装成功，还不错，只是出了一点儿小问题没"
+"法让系统引导 &debian;。多数情况下不需重新安装就能修复。修复引导问题的一种方法"
+"是使用安装程序内置的 rescue 模式(参阅 <xref linkend=\"rescue\"/>)。"
 
 #. Tag: para
 #: boot-new.xml:32
 #, no-c-format
-#| msgid ""
-#| "If you are new to Debian and &arch-kernel;, you may need some help from "
-#| "more experienced users. <phrase arch=\"x86\">For direct on-line help you "
-#| "can try the IRC channels #debian or #debian-boot on the OFTC network. "
-#| "Alternatively you can contact the <ulink url=\"&url-list-subscribe;"
-#| "\">debian-user mailing list</ulink>.</phrase> <phrase arch=\"not-"
-#| "x86\">For less common architectures like &arch-title;, your best option "
-#| "is to ask on the <ulink url=\"&url-list-subscribe;\">debian-&arch-"
-#| "listname; mailing list</ulink>.</phrase> You can also file an "
-#| "installation report as described in <xref linkend=\"submit-bug\"/>. "
-#| "Please make sure that you describe your problem clearly and include any "
-#| "messages that are displayed and may help others to diagnose the issue."
 msgid ""
 "If you are new to &debian; and &arch-kernel;, you may need some help from "
 "more experienced users. <phrase arch=\"x86\">For direct on-line help you can "
@@ -101,7 +81,15 @@ msgid ""
 "linkend=\"submit-bug\"/>. Please make sure that you describe your problem "
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
-msgstr "假如您刚接触 &debian; 和 &arch-kernel;，可能需要从有经验的用户那里得到一些帮助。<phrase arch=\"x86\">直接的在线帮助，可以通过 OFTC network 上的 #debian 或 #debian-boot IRC 频道。另一种选择是 <ulink url=\"&url-list-subscribe;\">debian-user mailing list</ulink>。</phrase> <phrase arch=\"not-x86\">对于不常见的体系，比如 &arch-title;，最适合的方式是在 <ulink url=\"&url-list-subscribe;\">debian-&arch-listname; mailing list</ulink> 上请教。</phrase> 您也可以写下安装报告，详情参见 <xref linkend=\"submit-bug\"/>。请确保问题描述清楚，并包括显示的任何信息，以助于分析问题。"
+msgstr ""
+"假如您刚接触 &debian; 和 &arch-kernel;，可能需要从有经验的用户那里得到一些帮"
+"助。<phrase arch=\"x86\">直接的在线帮助，可以通过 OFTC network 上的 #debian "
+"或 #debian-boot IRC 频道。另一种选择是 <ulink url=\"&url-list-subscribe;"
+"\">debian-user mailing list</ulink>。</phrase> <phrase arch=\"not-x86\">对于"
+"不常见的体系，比如 &arch-title;，最适合的方式是在 <ulink url=\"&url-list-"
+"subscribe;\">debian-&arch-listname; mailing list</ulink> 上请教。</phrase> 您"
+"也可以写下安装报告，详情参见 <xref linkend=\"submit-bug\"/>。请确保问题描述清"
+"楚，并包括显示的任何信息，以助于分析问题。"
 
 #. Tag: para
 #: boot-new.xml:48
@@ -529,15 +517,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:321
 #, no-c-format
-#| msgid ""
-#| "Documentation accompanying programs you have installed can be found in "
-#| "<filename>/usr/share/doc/</filename>, under a subdirectory named after "
-#| "the program (or, more precise, the Debian package that contains the "
-#| "program). However, more extensive documentation is often packaged "
-#| "separately in special documentation packages that are mostly not "
-#| "installed by default. For example, documentation about the package "
-#| "management tool <command>apt</command> can be found in the packages "
-#| "<classname>apt-doc</classname> or <classname>apt-howto</classname>."
 msgid ""
 "Documentation accompanying programs you have installed can be found in "
 "<filename>/usr/share/doc/</filename>, under a subdirectory named after the "
@@ -547,7 +526,12 @@ msgid ""
 "example, documentation about the package management tool <command>apt</"
 "command> can be found in the packages <classname>apt-doc</classname> or "
 "<classname>apt-howto</classname>."
-msgstr "已安装程序相关的文档可以在 <filename>/usr/share/doc/</filename> 里找到，位于该程序名的子目录下(或者，更准确地说，包含该程序的 &debian; 软件包名)。但范围更广的文档会单独放在一个特殊的文档软件包内，默认并不安装。例如，关于软件包管理工具 <command>apt</command> 的文档放在 <classname>apt-doc</classname> 或 <classname>apt-howto</classname> 软件包内。"
+msgstr ""
+"已安装程序相关的文档可以在 <filename>/usr/share/doc/</filename> 里找到，位于"
+"该程序名的子目录下(或者，更准确地说，包含该程序的 &debian; 软件包名)。但范围"
+"更广的文档会单独放在一个特殊的文档软件包内，默认并不安装。例如，关于软件包管"
+"理工具 <command>apt</command> 的文档放在 <classname>apt-doc</classname> 或 "
+"<classname>apt-howto</classname> 软件包内。"
 
 #. Tag: para
 #: boot-new.xml:332
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 45f570d00..c67f8a70c 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 22:10+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -21,15 +21,13 @@ msgstr "系统需求"
 #. Tag: para
 #: hardware.xml:7
 #, no-c-format
-#| msgid ""
-#| "This section contains information about what hardware you need to get "
-#| "started with Debian. You will also find links to further information "
-#| "about hardware supported by GNU and &arch-kernel;."
 msgid ""
 "This section contains information about what hardware you need to get "
 "started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
-msgstr "本章包括运行 &debian; 所需硬件的信息。您还能找到更多有关 GNU 和 &arch-kernel; 所支持硬件的信息的链接。"
+msgstr ""
+"本章包括运行 &debian; 所需硬件的信息。您还能找到更多有关 GNU 和 &arch-"
+"kernel; 所支持硬件的信息的链接。"
 
 #. Tag: title
 #: hardware.xml:20
@@ -40,14 +38,6 @@ msgstr "支持的硬件"
 #. Tag: para
 #: hardware.xml:21
 #, no-c-format
-#| msgid ""
-#| "Debian does not impose hardware requirements beyond the requirements of "
-#| "the Linux kernel and the GNU tool-sets. Therefore, any architecture or "
-#| "platform to which the Linux kernel, libc, <command>gcc</command>, etc. "
-#| "have been ported, and for which a Debian port exists, can run Debian. "
-#| "Please refer to the Ports pages at <ulink url=\"&url-ports;\"></ulink> "
-#| "for more details on &arch-title; architecture systems which have been "
-#| "tested with &debian-gnu;."
 msgid ""
 "&debian; does not impose hardware requirements beyond the requirements of "
 "the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
@@ -56,7 +46,11 @@ msgid ""
 "exists, can run &debian;. Please refer to the Ports pages at <ulink url="
 "\"&url-ports;\"></ulink> for more details on &arch-title; architecture "
 "systems which have been tested with &debian-gnu;."
-msgstr "&debian; 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此，任何被移植了 Linux 内核、libc、<command>gcc</command> 等，并拥有对应的 &debian; 移植版的硬件体系或平台都可以运行 &debian;。请参考移植页面 <ulink url=\"&url-ports;\"></ulink> 以了解更多已被 &debian-gnu; 测试过的 &arch-title; 体系。"
+msgstr ""
+"&debian; 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此，任何被移"
+"植了 Linux 内核、libc、<command>gcc</command> 等，并拥有对应的 &debian; 移植"
+"版的硬件体系或平台都可以运行 &debian;。请参考移植页面 <ulink url=\"&url-"
+"ports;\"></ulink> 以了解更多已被 &debian-gnu; 测试过的 &arch-title; 体系。"
 
 #. Tag: para
 #: hardware.xml:32
@@ -78,13 +72,12 @@ msgstr "支持的体系"
 #. Tag: para
 #: hardware.xml:42
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Linux &release; supports eleven major architectures and "
-#| "several variations of each architecture known as <quote>flavors</quote>."
 msgid ""
 "&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
-msgstr "&debian; GNU/Linux &release; 支持十一种主要的体系和一些称为 <quote>flavors</quote> 的衍生品种。"
+msgstr ""
+"&debian; GNU/Linux &release; 支持十一种主要的体系和一些称为 <quote>flavors</"
+"quote> 的衍生品种。"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
@@ -95,7 +88,6 @@ msgstr "体系"
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
 #, no-c-format
-#| msgid "Debian Designation"
 msgid "&debian; Designation"
 msgstr "&debian; 命名"
 
@@ -462,18 +454,16 @@ msgstr "kfreebsd-amd64"
 #. Tag: para
 #: hardware.xml:196
 #, no-c-format
-#| msgid ""
-#| "This document covers installation for the <emphasis>&arch-title;</"
-#| "emphasis> architecture. If you are looking for information on any of the "
-#| "other Debian-supported architectures take a look at the <ulink url="
-#| "\"http://www.debian.org/ports/\">Debian-Ports</ulink> pages."
 msgid ""
 "This document covers installation for the <emphasis>&arch-title;</emphasis> "
 "architecture using the <emphasis>&arch-kernel;</emphasis> kernel. If you are "
 "looking for information on any of the other &debian;-supported architectures "
 "take a look at the <ulink url=\"http://www.debian.org/ports/\">&debian;-"
 "Ports</ulink> pages."
-msgstr "本文档主要讲述的是 <emphasis>&arch-title;</emphasis> 体系下的安装。如果您在寻找其他 &debian; 所支持的体系的信息，请访问 <ulink url=\"http://www.debian.org/ports/\">&debian;-Ports</ulink> 网页。"
+msgstr ""
+"本文档主要讲述的是 <emphasis>&arch-title;</emphasis> 体系下的安装。如果您在寻"
+"找其他 &debian; 所支持的体系的信息，请访问 <ulink url=\"http://www.debian."
+"org/ports/\">&debian;-Ports</ulink> 网页。"
 
 #. Tag: para
 #: hardware.xml:206
@@ -493,15 +483,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:216
 #, no-c-format
-#| msgid ""
-#| "This is the first official release of &debian-gnu; for the &arch-title; "
-#| "architecture. We feel that it has proven itself sufficiently to be "
-#| "released. However, because it has not had the exposure (and hence testing "
-#| "by users) that some other architectures have had, you may encounter a few "
-#| "bugs. Use our <ulink url=\"&url-bts;\">Bug Tracking System</ulink> to "
-#| "report any problems; make sure to mention the fact that the bug is on the "
-#| "&arch-title; platform. It can be necessary to use the <ulink url=\"&url-"
-#| "list-subscribe;\">debian-&arch-listname; mailing list</ulink> as well."
 msgid ""
 "This is the first official release of &debian-gnu; for the &arch-title; "
 "architecture. We feel that it has proven itself sufficiently to be released. "
@@ -512,7 +493,13 @@ msgid ""
 "platform using the <emphasis>&arch-kernel;</emphasis> kernel. It can be "
 "necessary to use the <ulink url=\"&url-list-subscribe;\">debian-&arch-"
 "listname; mailing list</ulink> as well."
-msgstr "此为第一个 &arch-title; 体系的 &debian-gnu; 正式发布版。我们认为它已经达到了可发布的质量要求。但是，由于它没有像其他体系那样得到足够的曝光(经过用户测试)，您可能会遇到一些 bug。请使用我们的 <ulink url=\"&url-bts;\">Bug 跟踪系统</ulink> 来报告问题，并注明该 bug 是在 &arch-title; 平台上使用 <emphasis>&arch-kernel;</emphasis> 内核产生的。当然，您也可以用 <ulink url=\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
+msgstr ""
+"此为第一个 &arch-title; 体系的 &debian-gnu; 正式发布版。我们认为它已经达到了"
+"可发布的质量要求。但是，由于它没有像其他体系那样得到足够的曝光(经过用户测"
+"试)，您可能会遇到一些 bug。请使用我们的 <ulink url=\"&url-bts;\">Bug 跟踪系统"
+"</ulink> 来报告问题，并注明该 bug 是在 &arch-title; 平台上使用 "
+"<emphasis>&arch-kernel;</emphasis> 内核产生的。当然，您也可以用 <ulink url="
+"\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
 
 # index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
 #. Tag: title
@@ -549,30 +536,27 @@ msgstr "AMD64 和 Intel EM64T 处理器都获得支持。"
 #. Tag: para
 #: hardware.xml:277
 #, no-c-format
-#| msgid ""
-#| "Each distinct ARM architecture requires its own kernel. Because of this "
-#| "the standard Debian distribution only supports installation on a number "
-#| "of the most common platforms. The Debian userland however may be used by "
-#| "<emphasis>any</emphasis> ARM CPU."
 msgid ""
 "Each distinct ARM architecture requires its own kernel. Because of this the "
 "standard &debian; distribution only supports installation on a number of the "
 "most common platforms. The &debian; userland however may be used by "
 "<emphasis>any</emphasis> ARM CPU."
-msgstr "每种 ARM 体系要求使用各自的内核，正因为如此，&debian; 标准发布版只支持安装到一些最常见的系统上。但 &debian; userland 仍然可以用在<emphasis>任何</emphasis> ARM CPU 上。"
+msgstr ""
+"每种 ARM 体系要求使用各自的内核，正因为如此，&debian; 标准发布版只支持安装到"
+"一些最常见的系统上。但 &debian; userland 仍然可以用在<emphasis>任何</"
+"emphasis> ARM CPU 上。"
 
 #. Tag: para
 #: hardware.xml:286
 #, no-c-format
-#| msgid ""
-#| "Most ARM CPUs may be run in either endian mode (big or little). However, "
-#| "the majority of current system implementation uses little-endian mode. "
-#| "Debian currently only supports little-endian ARM systems."
 msgid ""
 "Most ARM CPUs may be run in either endian mode (big or little). However, the "
 "majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
-msgstr "大多数的 ARM CPU 可以运行在(big 或 little)任一 endian 模式下。但是当前绝大多少系统的实现都是使用 little-endian 模式。&debian; 现在也仅支持 little-endian ARM 系统。"
+msgstr ""
+"大多数的 ARM CPU 可以运行在(big 或 little)任一 endian 模式下。但是当前绝大多"
+"少系统的实现都是使用 little-endian 模式。&debian; 现在也仅支持 little-endian "
+"ARM 系统。"
 
 #. Tag: para
 #: hardware.xml:294
@@ -589,14 +573,6 @@ msgstr "IOP32x"
 #. Tag: para
 #: hardware.xml:302
 #, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing. Debian currently supports the IOP32x "
-#| "platform, featuring the IOP 80219 and 32x chips commonly found in Network "
-#| "Attached Storage (NAS) devices. Debian explicitly supports two such "
-#| "devices: the <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> "
-#| "from IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</"
-#| "ulink>."
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing. &debian; currently supports the IOP32x "
@@ -604,7 +580,12 @@ msgid ""
 "Attached Storage (NAS) devices. &debian; explicitly supports two such "
 "devices: the <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> from "
 "IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
-msgstr "Intel I/O Processor (IOP) 产品线可以在一些数据存储和处理的产品中找到。&debian; 当前支持 IOP32x 平台，IOP 80219 和 32x 芯片通常在 Network Attached Storage (NAS) 设备上找到。&debian; 明确支持两种设备：IO-Data 的 <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> 和 <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>。"
+msgstr ""
+"Intel I/O Processor (IOP) 产品线可以在一些数据存储和处理的产品中找到。"
+"&debian; 当前支持 IOP32x 平台，IOP 80219 和 32x 芯片通常在 Network Attached "
+"Storage (NAS) 设备上找到。&debian; 明确支持两种设备：IO-Data 的 <ulink url="
+"\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> 和 <ulink url=\"&url-arm-"
+"cyrius-n2100;\">Thecus N2100</ulink>。"
 
 #. Tag: term
 #: hardware.xml:315
@@ -689,13 +670,12 @@ msgstr "<term>Versatile</term>"
 #. Tag: para
 #: hardware.xml:363
 #, no-c-format
-#| msgid ""
-#| "The Versatile platform is emulated by QEMU and is therefore a nice way to "
-#| "test and run Debian on ARM if you don't have the hardware."
 msgid ""
 "The Versatile platform is emulated by QEMU and is therefore a nice way to "
 "test and run &debian; on ARM if you don't have the hardware."
-msgstr "Versatile 平台由 QEMU 模拟，如果您没有硬件设备，用它来测试运行在 ARM 上的 &debian; 是一个不错的方法。"
+msgstr ""
+"Versatile 平台由 QEMU 模拟，如果您没有硬件设备，用它来测试运行在 ARM 上的 "
+"&debian; 是一个不错的方法。"
 
 #. Tag: para
 #: hardware.xml:382
@@ -729,24 +709,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:417
 #, no-c-format
-#| msgid ""
-#| "However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run "
-#| "on 386 or earlier processors. Despite the architecture name \"i386\", "
-#| "support for actual 80386 processors (and their clones) was dropped with "
-#| "the Sarge (r3.1) release of Debian<footnote> <para> We have long tried to "
-#| "avoid this, but in the end it was necessary due a unfortunate series of "
-#| "issues with the compiler and the kernel, starting with an bug in the C++ "
-#| "ABI provided by GCC. You should still be able to run Debian GNU/Linux on "
-#| "actual 80386 processors if you compile your own kernel and compile all "
-#| "packages from source, but that is beyond the scope of this manual. </"
-#| "para> </footnote>. (No version of Linux has ever supported the 286 or "
-#| "earlier chips in the series.) All i486 and later processors are still "
-#| "supported<footnote> <para> Many Debian packages will actually run "
-#| "slightly faster on modern computers as a positive side effect of dropping "
-#| "support for these old chips. The i486, introduced in 1989, has three "
-#| "opcodes (bswap, cmpxchg, and xadd) which the i386, introduced in 1986, "
-#| "did not have. Previously, these could not be easily used by most Debian "
-#| "packages; now they can. </para> </footnote>."
 msgid ""
 "However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
 "on 386 or earlier processors. Despite the architecture name \"i386\", "
@@ -765,7 +727,19 @@ msgid ""
 "which the i386, introduced in 1986, did not have. Previously, these could "
 "not be easily used by most &debian; packages; now they can. </para> </"
 "footnote>."
-msgstr "然而，&debian; GNU/Linux &releasename; 将<emphasis>不能</emphasis>运行在 386 或更早的处理器上。尽管体系命名为 \"i386\"，&debian; 的 Sarge (r3.1) 版已经<emphasis>放弃</emphasis>对真正的 80386 处理器(以及它们的克隆)的支持<footnote> <para> 我们已经尽力避免，但由于编译器和内核的一系列因素，起因是 GCC 提供的 C++ ABI 的 bug，最终只能如此。如果您自己动手从源码编译内核和所有的软件包，仍然可以将 &debian; GNU/Linux 运行在真正的 80386 处理器上，这部分内容超出了本手册的范畴。</para> </footnote>。(Linux 从来没有任何版本支持 286 或更早的芯片。) 所有的 i486 和后续的处理器仍然支持<footnote> <para> 许多 &debian; 软件包在新的计算机上可以运行地稍微快一点，但另一方面却舍弃了对旧芯片的支持。1989 年发布的 i486 有三个 opcode (bswap、cmpxchg 和 xadd)，然而 1986 年发布的 i386 却没有。过去多数 &debian; 软件包不能使用它们，现在没有这个问题了。</para> </footnote>。"
+msgstr ""
+"然而，&debian; GNU/Linux &releasename; 将<emphasis>不能</emphasis>运行在 386 "
+"或更早的处理器上。尽管体系命名为 \"i386\"，&debian; 的 Sarge (r3.1) 版已经"
+"<emphasis>放弃</emphasis>对真正的 80386 处理器(以及它们的克隆)的支持"
+"<footnote> <para> 我们已经尽力避免，但由于编译器和内核的一系列因素，起因是 "
+"GCC 提供的 C++ ABI 的 bug，最终只能如此。如果您自己动手从源码编译内核和所有的"
+"软件包，仍然可以将 &debian; GNU/Linux 运行在真正的 80386 处理器上，这部分内容"
+"超出了本手册的范畴。</para> </footnote>。(Linux 从来没有任何版本支持 286 或更"
+"早的芯片。) 所有的 i486 和后续的处理器仍然支持<footnote> <para> 许多 "
+"&debian; 软件包在新的计算机上可以运行地稍微快一点，但另一方面却舍弃了对旧芯片"
+"的支持。1989 年发布的 i486 有三个 opcode (bswap、cmpxchg 和 xadd)，然而 1986 "
+"年发布的 i386 却没有。过去多数 &debian; 软件包不能使用它们，现在没有这个问题"
+"了。</para> </footnote>。"
 
 #. Tag: para
 #: hardware.xml:450
@@ -790,32 +764,17 @@ msgstr "I/O 总线"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "系统总线作为主板的一部分用于 CPU 和诸如存储设备之类的周边设备通讯。您的计算机"
-"必须使用 ISA、EISA、PCI、PCIe、PCI-X 或者 VESA Local Bus(VLB, 有时称为 VL 总线)。近"
-"年来出售的个人电脑都会使用里面的一种。"
+"必须使用 ISA、EISA、PCI、PCIe、PCI-X 或者 VESA Local Bus(VLB, 有时称为 VL 总"
+"线)。近年来出售的个人电脑都会使用里面的一种。"
 
 #. Tag: para
 #: hardware.xml:484
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
-#| "Indigo 2 and Challenge S. Since these machines are very similar, whenever "
-#| "this document refers to the SGI Indy, the Indigo 2 and Challenge S are "
-#| "meant as well. </para></listitem> <listitem><para> SGI IP32: this "
-#| "platform is generally known as SGI O2. </para></listitem> "
-#| "<listitem><para> MIPS Malta: this platform is emulated by QEMU and is "
-#| "therefore a nice way to test and run Debian on MIPS if you don't have the "
-#| "hardware. </para></listitem> </itemizedlist> Complete information "
-#| "regarding supported mips/mipsel machines can be found at the <ulink url="
-#| "\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. In the following, only "
-#| "the systems supported by the Debian installer will be covered. If you are "
-#| "looking for support for other subarchitectures, please contact the <ulink "
-#| "url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
@@ -831,22 +790,30 @@ msgid ""
 "installer will be covered. If you are looking for support for other "
 "subarchitectures, please contact the <ulink url=\"&url-list-subscribe;\"> "
 "debian-&arch-listname; mailing list</ulink>."
-msgstr "&arch-title; 上的 &debian; 支持以下平台：<itemizedlist> <listitem><para> SGI IP22： 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近似，在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></listitem> <listitem><para> SGI IP32：该平台常被称为 SGI O2。</para></listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设备，这是用来测试 MIPS 上 &debian; 的好方法。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 &debian; 安装程序所支持的系统。如果您在寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
+msgstr ""
+"&arch-title; 上的 &debian; 支持以下平台：<itemizedlist> <listitem><para> SGI "
+"IP22： 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近"
+"似，在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></"
+"listitem> <listitem><para> SGI IP32：该平台常被称为 SGI O2。</para></"
+"listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设"
+"备，这是用来测试 MIPS 上 &debian; 的好方法。</para></listitem> </"
+"itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-"
+"mips;\">Linux-MIPS homepage</ulink>。以下只涉及 &debian; 安装程序所支持的系"
+"统。如果您在寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;"
+"\"> debian-&arch-listname; mailing list</ulink>。"
 
 #. Tag: para
 #: hardware.xml:519
 #, no-c-format
-#| msgid ""
-#| "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 "
-#| "and R5000 processors are supported by the Debian installation system on "
-#| "big endian MIPS. On SGI IP32, currently only systems based on the R5000 "
-#| "are supported."
 msgid ""
 "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
 "R5000 processors are supported by the &debian; installation system on big "
 "endian MIPS. On SGI IP32, currently only systems based on the R5000 are "
 "supported."
-msgstr "&debian; 安装系统支持 big endian MIPS 上的 SGI IP22、SGI Indy、Indigo 2 和具有 R4000、R4400、R4600 和 R5000 处理器的 Challenge S。对于 SGI IP32，当前只支持 R5000。"
+msgstr ""
+"&debian; 安装系统支持 big endian MIPS 上的 SGI IP22、SGI Indy、Indigo 2 和具"
+"有 R4000、R4400、R4600 和 R5000 处理器的 Challenge S。对于 SGI IP32，当前只支"
+"持 R5000。"
 
 #. Tag: para
 #: hardware.xml:525
@@ -862,19 +829,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:542
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-#| "covered here. This includes the Cobalt RaQ, Qube2 and RaQ2, and the "
-#| "Gateway Microserver. </para></listitem> <listitem><para> MIPS Malta: this "
-#| "platform is emulated by QEMU and is therefore a nice way to test and run "
-#| "Debian on MIPS if you don't have the hardware. </para></listitem> </"
-#| "itemizedlist> Complete information regarding supported mips/mipsel "
-#| "machines can be found at the <ulink url=\"&url-linux-mips;\">Linux-MIPS "
-#| "homepage</ulink>. In the following, only the systems supported by the "
-#| "Debian installer will be covered. If you are looking for support for "
-#| "other subarchitectures, please contact the <ulink url=\"&url-list-"
-#| "subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -888,7 +842,16 @@ msgid ""
 "covered. If you are looking for support for other subarchitectures, please "
 "contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; "
 "mailing list</ulink>."
-msgstr "&arch-title; 上的 &debian; 支持以下平台： <itemizedlist> <listitem><para> Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt RaQ、Qube2 和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设备，使用它来测试运行在 MIPS 上的 &debian; 是个不错的方法。</para></listitem> </itemizedlist> 有关支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 &debian; 安装程序所支持的系统。如果您寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
+msgstr ""
+"&arch-title; 上的 &debian; 支持以下平台： <itemizedlist> <listitem><para> "
+"Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt RaQ、Qube2 "
+"和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS "
+"Malta：该平台由 QEMU 模拟，如果您没有硬件设备，使用它来测试运行在 MIPS 上的 "
+"&debian; 是个不错的方法。</para></listitem> </itemizedlist> 有关支持 mips/"
+"mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</"
+"ulink>。以下只涉及 &debian; 安装程序所支持的系统。如果您寻找其它子系统的支"
+"持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; "
+"mailing list</ulink>。"
 
 #. Tag: title
 #: hardware.xml:570
@@ -935,9 +898,6 @@ msgstr "内核变种"
 #. Tag: para
 #: hardware.xml:618
 #, no-c-format
-#| msgid ""
-#| "There are two flavours of the powerpc kernel in Debian, based on the CPU "
-#| "type:"
 msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
@@ -1012,17 +972,15 @@ msgstr "Power Macintosh (pmac) 子体系"
 #. Tag: para
 #: hardware.xml:688
 #, no-c-format
-#| msgid ""
-#| "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
-#| "example) made a series of Macintosh computers based on the PowerPC "
-#| "processor. For purposes of architecture support, they are categorized as "
-#| "NuBus (not supported by Debian), OldWorld, and NewWorld."
 msgid ""
 "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
 "example) made a series of Macintosh computers based on the PowerPC "
 "processor. For purposes of architecture support, they are categorized as "
 "NuBus (not supported by &debian;), OldWorld, and NewWorld."
-msgstr "Apple (以及其它一些制造商 &mdash; 比如 Power Computing) 生产了一系列基于 PowerPC 处理器 的 Macintosh 计算机。为体系支持的目的，它们被划分为 NuBus(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
+msgstr ""
+"Apple (以及其它一些制造商 &mdash; 比如 Power Computing) 生产了一系列基于 "
+"PowerPC 处理器 的 Macintosh 计算机。为体系支持的目的，它们被划分为 NuBus"
+"(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
 
 #. Tag: para
 #: hardware.xml:695
@@ -1447,17 +1405,6 @@ msgstr "Nubus PowerMac 子体系 (不支持)"
 #. Tag: para
 #: hardware.xml:952
 #, no-c-format
-#| msgid ""
-#| "NuBus systems are not currently supported by Debian/powerpc. The "
-#| "monolithic Linux/PPC kernel architecture does not have support for these "
-#| "machines; instead, one must use the MkLinux Mach microkernel, which "
-#| "Debian does not yet support. These include the following: <itemizedlist> "
-#| "<listitem><para> Power Macintosh 6100, 7100, 8100 </para></listitem> "
-#| "<listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-#| "<listitem><para> Powerbook 1400, 2300, and 5300 </para></listitem> "
-#| "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
-#| "itemizedlist> A linux kernel for these machines and limited support is "
-#| "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgid ""
 "NuBus systems are not currently supported by &debian;/powerpc. The "
 "monolithic Linux/PPC kernel architecture does not have support for these "
@@ -1469,7 +1416,15 @@ msgid ""
 "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
 "itemizedlist> A linux kernel for these machines and limited support is "
 "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
-msgstr "NuBus 系统现在还不被 &debian;/powerpc 支持。单内核的 Linux/PPC 内核体系不支持这些机器；而必须使用 MkLinux Mach 微内核，而它未被 &debian; 支持。它们包括： <itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></listitem> <listitem><para> Performa 5200, 6200, 6300 </para></listitem> <listitem><para> Powerbook 1400, 2300 和 5300 </para></listitem> <listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </itemizedlist> 对这些机器提供有限支持的 linux 内核位于 <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>"
+msgstr ""
+"NuBus 系统现在还不被 &debian;/powerpc 支持。单内核的 Linux/PPC 内核体系不支持"
+"这些机器；而必须使用 MkLinux Mach 微内核，而它未被 &debian; 支持。它们包括： "
+"<itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></"
+"listitem> <listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
+"<listitem><para> Powerbook 1400, 2300 和 5300 </para></listitem> "
+"<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
+"itemizedlist> 对这些机器提供有限支持的 linux 内核位于 <ulink url=\"http://"
+"nubus-pmac.sourceforge.net/\"></ulink>"
 
 #. Tag: title
 #: hardware.xml:989
@@ -1529,32 +1484,26 @@ msgstr "S/390 与 zSeries 机器类型"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
 msgstr ""
-"有关 S/390 和 zSeries 机器支持的完整信息参见 IBM 的 Redbook <ulink url="
-"\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for "
-"IBM eServer zSeries and S/390: Distributions</ulink> 第 2.1 章节，或者 "
-"<ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/index.html"
-"\">developerWorks 网站上的 zSeries 页面</ulink>。简而言之，G5、Multiprise "
-"3000、G6 以及所有的 zSeries 都可以得到完整的支持；Multiprise 2000、G3 和 G4 "
-"机器使用 IEEE 浮点模拟来支持，因此会降低性能。"
 
 # index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU 和主板支持"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1566,13 +1515,13 @@ msgstr ""
 "sun4m、sun4u 或 sun4v。下面说明包括哪些机器，以及每个获得支持的级别。"
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1585,26 +1534,24 @@ msgstr ""
 "SPARCstation page</ulink>。"
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
-#| msgid ""
-#| "The last Debian release to support sparc32 was Etch, but even then only "
-#| "for sun4m systems. Support for the other 32-bits subarchitectures had "
-#| "already been discontinued after earlier releases."
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
 "already been discontinued after earlier releases."
-msgstr "支持 sparc32 的最新 &debian; 发布版本是 Etch，但也仅针对 sun4m 系统。其它的 32 位子体系在上一版本后已经停止支持。"
+msgstr ""
+"支持 sparc32 的最新 &debian; 发布版本是 Etch，但也仅针对 sun4m 系统。其它的 "
+"32 位子体系在上一版本后已经停止支持。"
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1620,13 +1567,13 @@ msgstr ""
 "到 UP 和 SMP 配置中。"
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1639,7 +1586,7 @@ msgstr ""
 "smp 内核。"
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1649,13 +1596,13 @@ msgstr ""
 "持而得不到支持。"
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "便携机"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1670,21 +1617,14 @@ msgstr ""
 
 # index.docbook:1624, index.docbook:1649, index.docbook:1672
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "多处理器"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image has been "
-#| "compiled with SMP support. The standard kernel is also usable on non-SMP "
-#| "systems, but has a slight overhead which will cause a small reduction in "
-#| "performance. For normal system use this will hardly be noticable."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1692,18 +1632,15 @@ msgid ""
 "standard kernel is also usable on non-SMP systems, but has a slight overhead "
 "which will cause a small reduction in performance. For normal system use "
 "this will hardly be noticable."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已经加入了 SMP 功能。标准内核也可以在非 SMP 系统下使用，只不过多些系统开销降低了一些性能。在普通系统中使用时几乎不会察觉。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已"
+"经加入了 SMP 功能。标准内核也可以在非 SMP 系统下使用，只不过多些系统开销降低"
+"了一些性能。在普通系统中使用时几乎不会察觉。"
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, no-c-format
-#| msgid ""
-#| "In order to optimize the kernel for single CPU systems, you'll have to "
-#| "replace the standard Debian kernel. <phrase arch=\"linux-any\">You can "
-#| "find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. "
-#| "At this time (kernel version &kernelversion;) the way you disable SMP is "
-#| "to deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
 "replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can "
@@ -1711,18 +1648,16 @@ msgid ""
 "this time (kernel version &kernelversion;) the way you disable SMP is to "
 "deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
 "section;</quote> section of the kernel config.</phrase>"
-msgstr "为了给单 CPU 系统优化内核，您需要替换标准的 &debian; 内核。<phrase arch=\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)，禁止 SMP 选项的方法是在内核配置的 <quote>&smp-config-section;</quote> 中取消选择 <quote>&smp-config-option;</quote>。</phrase>"
+msgstr ""
+"为了给单 CPU 系统优化内核，您需要替换标准的 &debian; 内核。<phrase arch="
+"\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前"
+"(内核版本 &kernelversion;)，禁止 SMP 选项的方法是在内核配置的 <quote>&smp-"
+"config-section;</quote> 中取消选择 <quote>&smp-config-option;</quote>。</"
+"phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image has been "
-#| "compiled with <firstterm>SMP-alternatives</firstterm> support. This means "
-#| "that the kernel will detect the number of processors (or processor cores) "
-#| "and will automatically deactivate SMP on uniprocessor systems."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1730,47 +1665,38 @@ msgid ""
 "alternatives</firstterm> support. This means that the kernel will detect the "
 "number of processors (or processor cores) and will automatically deactivate "
 "SMP on uniprocessor systems."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已经加入了 <firstterm>SMP-alternatives</firstterm> 支持。也就是内核可以侦测处理器的数量(或者处理器核心数)，并在单处理器系统上自动关闭 SMP 的功能。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已"
+"经加入了 <firstterm>SMP-alternatives</firstterm> 支持。也就是内核可以侦测处理"
+"器的数量(或者处理器核心数)，并在单处理器系统上自动关闭 SMP 的功能。"
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
-#| msgid ""
-#| "The 486 flavour of the Debian kernel image packages for &arch-title; is "
-#| "not compiled with SMP support."
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr "&arch-title; 的 486 &debian; 内核映像软件包没有支持 SMP 。"
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. However, the standard Debian &release; kernel image does "
-#| "not support SMP. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. However, the "
 "standard &debian; &release; kernel image does not support SMP. This should "
 "not prevent installation, since the standard, non-SMP kernel should boot on "
 "SMP systems; the kernel will simply use the first CPU."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。但是，标准的 &debian; &release; 内核映像并不支持 SMP。这不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。但是，标准的 &debian; &release; 内核映像并不"
+"支持 SMP。这不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内"
+"核只使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
-#| msgid ""
-#| "In order to take advantage of multiple processors, you'll have to replace "
-#| "the standard Debian kernel. <phrase arch=\"linux-any\">You can find a "
-#| "discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At "
-#| "this time (kernel version &kernelversion;) the way you enable SMP is to "
-#| "select <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
 "the standard &debian; kernel.<phrase arch=\"linux-any\"> You can find a "
@@ -1778,19 +1704,15 @@ msgid ""
 "time (kernel version &kernelversion;) the way you enable SMP is to select "
 "<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</"
 "quote> section of the kernel config.</phrase>"
-msgstr "为了使用多 CPU 的优势，您必须替换标准的 &debian; 内核。<phrase arch=\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)启用 SMP 的方法是在内核配置的 <quote>&smp-config-section;</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
+msgstr ""
+"为了使用多 CPU 的优势，您必须替换标准的 &debian; 内核。<phrase arch=\"linux-"
+"any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版"
+"本 &kernelversion;)启用 SMP 的方法是在内核配置的 <quote>&smp-config-section;"
+"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture, and is supported by a precompiled Debian kernel image. "
-#| "Depending on your install media, this SMP-capable kernel may or may not "
-#| "be installed by default. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture, and is supported "
@@ -1798,10 +1720,14 @@ msgid ""
 "this SMP-capable kernel may or may not be installed by default. This should "
 "not prevent installation, since the standard, non-SMP kernel should boot on "
 "SMP systems; the kernel will simply use the first CPU."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用，并且有一个预编译的 &debian; 内核映象已经开启这项功能。支持 SMP 的内核默认是否被安装，取决于您的安装介质。这并不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用，并且有一个预编译的 &debian; 内核映象已经开启"
+"这项功能。支持 SMP 的内核默认是否被安装，取决于您的安装介质。这并不会影响安"
+"装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1812,68 +1738,70 @@ msgstr ""
 "一个合适的内核软件包。"
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, no-c-format
-#| msgid ""
-#| "You can also build your own customized kernel to support SMP. <phrase "
-#| "arch=\"linux-any\">You can find a discussion of how to do this in <xref "
-#| "linkend=\"kernel-baking\"/>. At this time (kernel version "
-#| "&kernelversion;) the way you enable SMP is to select <quote>&smp-config-"
-#| "option;</quote> in the <quote>&smp-config-section;</quote> section of the "
-#| "kernel config.</phrase>"
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
 "\"linux-any\"> You can find a discussion of how to do this in <xref linkend="
 "\"kernel-baking\"/>. At this time (kernel version &kernelversion;) the way "
 "you enable SMP is to select <quote>&smp-config-option;</quote> in the "
 "<quote>&smp-config-section;</quote> section of the kernel config.</phrase>"
-msgstr "您可以自己定制内核来支持 SMP。<phrase arch=\"linux-any\">可以在 <xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)启用 SMP 的方法是在内核配置的 <quote>&smp-config-section;</quote> 中选择 <quote>&smp-config-option;</quote>。</phrase>"
+msgstr ""
+"您可以自己定制内核来支持 SMP。<phrase arch=\"linux-any\">可以在 <xref "
+"linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)启"
+"用 SMP 的方法是在内核配置的 <quote>&smp-config-section;</quote> 中选择 "
+"<quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "图形卡支持"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在不使"
 "用 X11 支持的情况下，您也可以用古老的 CGA、MDA 或 HGA 工作。注意，在本文所述"
 "的安装过程中并不会使用 X11 图形界面。"
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
-#| msgid ""
-#| "Debian's support for graphical interfaces is determined by the underlying "
-#| "support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards "
-#| "work under X.Org. Details on supported graphics buses, cards, monitors, "
-#| "and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-#| "Debian &release; ships with X.Org version &x11ver;."
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
-msgstr "&debian; 对显卡的支持决定于 X.Org 的 X11 系统。大多数 AGP、PCI、PCIe 和 PCI-X 视频卡都能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持情况，见 <ulink url=\"&url-xorg;\"></ulink>。&debian; &release; 包含 X.Org &x11ver; 版。"
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
+msgstr ""
+"&debian; 对显卡的支持决定于 X.Org 的 X11 系统。大多数 AGP、PCI、PCIe 和 PCI-"
+"X 视频卡都能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持"
+"情况，见 <ulink url=\"&url-xorg;\"></ulink>。&debian; &release; 包含 X.Org "
+"&x11ver; 版。"
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1892,7 +1820,7 @@ msgstr ""
 "卡。"
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1915,13 +1843,13 @@ msgstr ""
 "自动激活串口控制台。"
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "网络连接硬件"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1935,7 +1863,7 @@ msgstr ""
 "phrase> <phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1943,61 +1871,61 @@ msgid ""
 msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡："
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "支持的网络设备有："
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) 和 ESCON connection (实际或模拟)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet 和 OSA-Express Fast Ethernet (non-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "QDIO 模式的 OSA-Express，HiperSockets 和 Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2015,19 +1943,19 @@ msgstr ""
 "址获得。"
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN 虽也获得支持，不过不能在安装阶段使用。"
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "无线网卡"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2042,7 +1970,7 @@ msgstr ""
 "linkend=\"loading-firmware\"/> 了解如何在安装过程中加载固件的更多信息。"
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2053,7 +1981,7 @@ msgstr ""
 "作，但是却不能在安装过程中使用。"
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2064,7 +1992,7 @@ msgstr ""
 "健壮的加密方法，在安装时就无法使用。"
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2080,15 +2008,8 @@ msgstr ""
 "件，并手动配置网络。"
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
-#| msgid ""
-#| "In some cases the driver you need may not be available as a Debian "
-#| "package. You will then have to look if there is source code available in "
-#| "the internet and compile the driver yourself. How to do this is outside "
-#| "the scope of this manual. <phrase arch=\"x86\">If no Linux driver is "
-#| "available, your last resort is to use the <classname>ndiswrapper</"
-#| "classname> package, which allows you to use a Windows driver.</phrase>"
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
 "package. You will then have to look if there is source code available in the "
@@ -2096,16 +2017,20 @@ msgid ""
 "scope of this manual. <phrase arch=\"x86\">If no Linux driver is available, "
 "your last resort is to use the <classname>ndiswrapper</classname> package, "
 "which allows you to use a Windows driver.</phrase>"
-msgstr "有些情况下，您需要的驱动程序不包含在 &debian; 软件包里面。必须在互联网上寻找它们的源码，并自己动手编译驱动程序。该如何做已经超出了本手册的范围。<phrase arch=\"x86\">如果没有 Linux 驱动程序，最后的手段是用 <classname>ndiswrapper</classname> 软件包，它让您使用 Windows 的驱动程序。</phrase>"
+msgstr ""
+"有些情况下，您需要的驱动程序不包含在 &debian; 软件包里面。必须在互联网上寻找"
+"它们的源码，并自己动手编译驱动程序。该如何做已经超出了本手册的范围。<phrase "
+"arch=\"x86\">如果没有 Linux 驱动程序，最后的手段是用 <classname>ndiswrapper</"
+"classname> 软件包，它让您使用 Windows 的驱动程序。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "&arch-title; 的一些已知问题"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2113,13 +2038,13 @@ msgid ""
 msgstr "有些特定的网卡事项需要在此提及。"
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip 和 dfme 驱动程序之间的冲突"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2135,7 +2060,7 @@ msgstr ""
 "如果使用不正确的驱动程序，网卡可能不工作，或者工作不正常。"
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2148,7 +2073,7 @@ msgstr ""
 "\"module-blacklist\"/> 将错误的驱动模块加入黑名单，以阻止这种情况发生。"
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2165,13 +2090,13 @@ msgstr ""
 "之后错误的模块可能还会加载。"
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2180,13 +2105,13 @@ msgstr ""
 "<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "盲文点触设备(Braille Display)"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2203,13 +2128,13 @@ msgstr ""
 "的 <classname>brltty</classname> 版本是 &brlttyver; 。"
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "硬件语音合成(Hardware Speech Synthesis)"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2228,13 +2153,13 @@ msgstr ""
 "gnu; &release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。"
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "外围设备与其他硬件"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2245,7 +2170,7 @@ msgstr ""
 "设备。然而，在安装系统的时候，并不需要其中的大部分设备。"
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2255,7 +2180,7 @@ msgstr ""
 "\"hardware-issues\"/>)。"
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2266,7 +2191,7 @@ msgstr ""
 "Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2277,7 +2202,7 @@ msgstr ""
 "通过 NFS、HTTP、FTP 从网络上取得。"
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2285,13 +2210,13 @@ msgid ""
 msgstr "Cobalt RaQ 不支持外加设备，但 Qube 有一个 PCI 插槽。"
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "需要固件的设备"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2306,7 +2231,7 @@ msgstr ""
 "说很常见，但有些 USB 设备甚至是硬盘控制器也需要加载固件(firmware)。"
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2321,7 +2246,7 @@ msgstr ""
 "gnu; 可以合法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2337,30 +2262,27 @@ msgstr ""
 "息。"
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "特别为 GNU/&arch-kernel; 采购硬件"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
-#| msgid ""
-#| "There are several vendors, who ship systems with Debian or other "
-#| "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-"
-#| "installed</ulink>. You might pay more for the privilege, but it does buy "
-#| "a level of peace of mind, since you can be sure that the hardware is well-"
-#| "supported by GNU/Linux."
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
 "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-installed</"
 "ulink>. You might pay more for the privilege, but it does buy a level of "
 "peace of mind, since you can be sure that the hardware is well-supported by "
 "GNU/Linux."
-msgstr "现在有一些经销商，他们出售的系统是<ulink url=\"&url-pre-installed;\">预装</ulink> &debian; 或者是其他的 GNU/Linux。您或许会多花一些钱，但是买来一份安心，因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
+msgstr ""
+"现在有一些经销商，他们出售的系统是<ulink url=\"&url-pre-installed;\">预装</"
+"ulink> &debian; 或者是其他的 GNU/Linux。您或许会多花一些钱，但是买来一份安"
+"心，因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2374,7 +2296,7 @@ msgstr ""
 "<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2390,13 +2312,13 @@ msgstr ""
 "&arch-kernel; 友好的硬件销售商。"
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "避免专有或封闭的硬件"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2408,7 +2330,7 @@ msgstr ""
 "不公开的契约才能接触文档，以阻止我们发布 &arch-kernel; 驱动程序源代码。"
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2422,13 +2344,13 @@ msgstr ""
 "识到自由软件社区也是一个重要的市场。"
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Windows 专用硬件"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2450,7 +2372,7 @@ msgstr ""
 "等功能的保留内嵌处理器的设备昂贵。"
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2482,14 +2404,8 @@ msgstr ""
 "能下降。"
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, no-c-format
-#| msgid ""
-#| "You can help improve this situation by encouraging these manufacturers to "
-#| "release the documentation and other resources necessary for us to program "
-#| "their hardware, but the best strategy is simply to avoid this sort of "
-#| "hardware until it is listed as working in the <ulink url=\"&url-hardware-"
-#| "howto;\">Linux Hardware Compatibility HOWTO</ulink>."
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
 "release the documentation and other resources necessary for us to program "
@@ -2497,24 +2413,21 @@ msgid ""
 "hardware<phrase arch=\"linux-any\"> until it is listed as working in the "
 "<ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
 "ulink></phrase>."
-msgstr "您可以帮助改变这种状况，要求制造商发布相应的文档和资料，让我们可以编写他们硬件的程序，但最好还是避免使用这些硬件<phrase arch=\"linux-any\">，直到它们被列入 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink></phrase>。"
+msgstr ""
+"您可以帮助改变这种状况，要求制造商发布相应的文档和资料，让我们可以编写他们硬"
+"件的程序，但最好还是避免使用这些硬件<phrase arch=\"linux-any\">，直到它们被列"
+"入 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
+"ulink></phrase>。"
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "安装介质"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
-#| msgid ""
-#| "This section will help you determine which different media types you can "
-#| "use to install Debian. For example, if you have a floppy disk drive on "
-#| "your machine, it can be used to install Debian. There is a whole chapter "
-#| "devoted to media, <xref linkend=\"install-methods\"/>, which lists the "
-#| "advantages and disadvantages of each media type. You may want to refer "
-#| "back to this page once you reach that section."
 msgid ""
 "This section will help you determine which different media types you can use "
 "to install &debian;. For example, if you have a floppy disk drive on your "
@@ -2522,16 +2435,20 @@ msgid ""
 "devoted to media, <xref linkend=\"install-methods\"/>, which lists the "
 "advantages and disadvantages of each media type. You may want to refer back "
 "to this page once you reach that section."
-msgstr "本章将助您选则安装 &debian; 所采用的介质。例如，您的电脑上有一个软驱，它就可以用来安装 &debian;。有一整章专门用于说明介质：<xref linkend=\"install-methods\"/>，里面列出了每种类型的优缺点。当您阅读那一章的时候，可能要返回参考本页。"
+msgstr ""
+"本章将助您选则安装 &debian; 所采用的介质。例如，您的电脑上有一个软驱，它就可"
+"以用来安装 &debian;。有一整章专门用于说明介质：<xref linkend=\"install-"
+"methods\"/>，里面列出了每种类型的优缺点。当您阅读那一章的时候，可能要返回参考"
+"本页。"
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "软盘"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2542,19 +2459,19 @@ msgstr ""
 "(1440 千字节)软驱。"
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "用于 CHRP 的软盘支持已经被停止。"
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2567,7 +2484,7 @@ msgstr ""
 "IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2585,7 +2502,7 @@ msgstr ""
 "installer\"/>。"
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2596,7 +2513,7 @@ msgstr ""
 "\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2606,13 +2523,13 @@ msgstr ""
 "获得支持。"
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2630,13 +2547,13 @@ msgstr ""
 "固件上选择 <quote>System installation</quote> 项。"
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2647,7 +2564,7 @@ msgstr ""
 "安装程序。"
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2657,21 +2574,14 @@ msgstr ""
 "(UFS slices)进行安装。"
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "U 盘"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
-#| msgid ""
-#| "Many Debian boxes need their floppy and/or CD-ROM drives only for setting "
-#| "up the system and for rescue purposes. If you operate some servers, you "
-#| "will probably already have thought about omitting those drives and using "
-#| "an USB memory stick for installing and (when necessary) for recovering "
-#| "the system. This is also useful for small systems which have no room for "
-#| "unnecessary drives."
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
 "up the system and for rescue purposes. If you operate some servers, you will "
@@ -2679,16 +2589,19 @@ msgid ""
 "memory stick for installing and (when necessary) for recovering the system. "
 "This is also useful for small systems which have no room for unnecessary "
 "drives."
-msgstr "许多 &debian; 机器只在设置系统和急救用途时才需要软盘和 CD-ROM 驱动器。如果使用过服务器，您也许已经想过怎么样省掉这些驱动器，而用 U 盘来安装和(在必需时)恢复系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
+msgstr ""
+"许多 &debian; 机器只在设置系统和急救用途时才需要软盘和 CD-ROM 驱动器。如果使"
+"用过服务器，您也许已经想过怎么样省掉这些驱动器，而用 U 盘来安装和(在必需时)恢"
+"复系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2705,7 +2618,7 @@ msgstr ""
 "用 ISDN 和 PPP。"
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2716,7 +2629,7 @@ msgstr ""
 "\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2726,13 +2639,13 @@ msgstr ""
 "择。"
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x 或 GNU 系统"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2747,22 +2660,14 @@ msgstr ""
 ">。"
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "受支持的存储系统"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
-#| msgid ""
-#| "The Debian boot disks contain a kernel which is built to maximize the "
-#| "number of systems it runs on. Unfortunately, this makes for a larger "
-#| "kernel, which includes many drivers that won't be used for your "
-#| "machine<phrase arch=\"linux-any\"> (see <xref linkend=\"kernel-baking\"/> "
-#| "to learn how to build your own kernel)</phrase>. Support for the widest "
-#| "possible range of devices is desirable in general, to ensure that Debian "
-#| "can be installed on the widest array of hardware."
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
 "number of systems it runs on. Unfortunately, this makes for a larger kernel, "
@@ -2771,25 +2676,28 @@ msgid ""
 "your own kernel)</phrase>. Support for the widest possible range of devices "
 "is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
-msgstr "&debian; 启动盘包括一个用于最大可能数量系统的内核。不幸的是，这将产生一个大内核，其中包括许多您的机器并不需要的驱动程序<phrase arch=\"linux-any\">(参考<xref linkend=\"kernel-baking\"/>学习如何创建自己的内核)</phrase>。在通常情况下，支持最大范围内的设备是一种较合适的设计，这将使得 &debian; 可以在尽可能多的硬件上安装。"
+msgstr ""
+"&debian; 启动盘包括一个用于最大可能数量系统的内核。不幸的是，这将产生一个大内"
+"核，其中包括许多您的机器并不需要的驱动程序<phrase arch=\"linux-any\">(参考"
+"<xref linkend=\"kernel-baking\"/>学习如何创建自己的内核)</phrase>。在通常情况"
+"下，支持最大范围内的设备是一种较合适的设计，这将使得 &debian; 可以在尽可能多"
+"的硬件上安装。"
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
-#| msgid ""
-#| "Generally, the Debian installation system includes support for floppies, "
-#| "IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, "
-#| "SATA and SCSI controllers and drives, USB, and FireWire. The supported "
-#| "file systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
 "IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, "
 "SATA and SCSI controllers and drives, USB, and FireWire. The supported file "
 "systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
-msgstr "通常，&debian; 安装系统支持软盘、IDE (也称为 PATA)驱动器、IDE 软盘、并口 IDE 驱动器、SATA 和 SCSI 控制器和驱动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
+msgstr ""
+"通常，&debian; 安装系统支持软盘、IDE (也称为 PATA)驱动器、IDE 软盘、并口 IDE "
+"驱动器、SATA 和 SCSI 控制器和驱动器、USB 和 FireWire。支持的文件系统有 FAT、"
+"Win-32 FAT 扩展(VFAT) 和 NTFS。"
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2804,7 +2712,7 @@ msgstr ""
 "HOWTO</ulink> 以获得更详细信息。"
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2826,7 +2734,7 @@ msgstr ""
 "以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2837,7 +2745,7 @@ msgstr ""
 "支持 CHRP 系统上的软盘。"
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2848,7 +2756,7 @@ msgstr ""
 "支持软驱。"
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2856,7 +2764,7 @@ msgid ""
 msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2868,13 +2776,13 @@ msgstr ""
 "持。"
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "内存与磁盘空间的需求"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2887,7 +2795,7 @@ msgstr ""
 "hardware-reqts\"/>。"
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2902,3 +2810,22 @@ msgstr ""
 "本界面需要更多的内存，并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
 "形界面两种方式之间选择，应选择普通方式。</para> </footnote>或磁盘空间上安装系"
 "统或许可行，但只针对有经验的用户。"
+
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "有关 S/390 和 zSeries 机器支持的完整信息参见 IBM 的 Redbook <ulink url="
+#~ "\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux "
+#~ "for IBM eServer zSeries and S/390: Distributions</ulink> 第 2.1 章节，或"
+#~ "者 <ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/"
+#~ "index.html\">developerWorks 网站上的 zSeries 页面</ulink>。简而言之，G5、"
+#~ "Multiprise 3000、G6 以及所有的 zSeries 都可以得到完整的支持；Multiprise "
+#~ "2000、G3 和 G4 机器使用 IEEE 浮点模拟来支持，因此会降低性能。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c022f10f6..c1b30c3d2 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:00+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -27,20 +27,6 @@ msgstr "官方的 &debian-gnu; 光盘套装"
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official Debian "
-#| "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-#| "debian-cd-vendors;\">CD vendors page</ulink>). You may also download the "
-#| "CD-ROM images from a Debian mirror and make your own set, if you have a "
-#| "fast network connection and a CD burner (see the <ulink url=\"&url-debian-"
-#| "cd;\">Debian CD page</ulink> for detailed instructions). If you have a "
-#| "Debian CD set and CDs are bootable on your machine, you can skip right to "
-#| "<xref linkend=\"boot-installer\"/>; much effort has been expended to "
-#| "ensure the files most people need are there on the CD. Although a full "
-#| "set of binary packages requires several CDs, it is unlikely you will need "
-#| "packages on the third CD and above. You may also consider using the DVD "
-#| "version, which saves a lot of space on your shelf and you avoid the CD "
-#| "shuffling marathon."
 msgid ""
 "By far the easiest way to install &debian-gnu; is from an Official &debian; "
 "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
@@ -54,23 +40,20 @@ msgid ""
 "packages requires several CDs, it is unlikely you will need packages on the "
 "third CD and above. You may also consider using the DVD version, which saves "
 "a lot of space on your shelf and you avoid the CD shuffling marathon."
-msgstr "目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD-ROM 套件。您可以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</ulink>)。如果您有快速的网络连接和光盘刻录机的话，也可以从 &debian; 镜像站点下载 CD-ROM 映像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;\">Debian CD 页</ulink>)。如果您有一套 &debian; 的 CD 套件并且能在机器上引导这些 CD 盘，可以直接跳至 <xref linkend=\"boot-installer\"/>。我们已经做了很多努力来确保 CD 中已经包含了大多数人所需要的文件。尽管一整套预编译的二进制软件包需要好几张 CD 盘，但是您可能不会用到第三张 CD 盘以后的内容。也可以考虑使用 DVD 版本，这将为您的书架节约很多光盘存放空间，并且可以避免马拉松式地切换 CD。"
+msgstr ""
+"目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD-ROM 套件。您可以从"
+"一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</"
+"ulink>)。如果您有快速的网络连接和光盘刻录机的话，也可以从 &debian; 镜像站点下"
+"载 CD-ROM 映像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;"
+"\">Debian CD 页</ulink>)。如果您有一套 &debian; 的 CD 套件并且能在机器上引导"
+"这些 CD 盘，可以直接跳至 <xref linkend=\"boot-installer\"/>。我们已经做了很多"
+"努力来确保 CD 中已经包含了大多数人所需要的文件。尽管一整套预编译的二进制软件"
+"包需要好几张 CD 盘，但是您可能不会用到第三张 CD 盘以后的内容。也可以考虑使用 "
+"DVD 版本，这将为您的书架节约很多光盘存放空间，并且可以避免马拉松式地切换 CD。"
 
 #. Tag: para
 #: install-methods.xml:30
 #, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the Debian network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
 msgid ""
 "If your machine doesn't support CD booting, but you do have a CD set, you "
 "can use an alternative strategy such as <phrase condition=\"supports-floppy-"
@@ -83,7 +66,15 @@ msgid ""
 "organization are identical. So when archive file paths are given below for "
 "particular files you need for booting, look for those files in the same "
 "directories and subdirectories on your CD."
-msgstr "如果您的机器不支持 CD 盘引导，但是您有一套 CD 光盘套件，可以使用其他的方法比如：<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、磁带仿真、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp\">网络引导，</phrase> 或者从 CD 中手工装载内核来初始化系统安装程序。CD 已经包含了通过其他方法引导所需要的文件; &debian; 的网络存档和 CD 的文件夹组织方式是一致的。因此如果后面有给出的用于引导的特定存档文件路径时，请在 CD 中同样的文件目录和子目录下查找它们。"
+msgstr ""
+"如果您的机器不支持 CD 盘引导，但是您有一套 CD 光盘套件，可以使用其他的方法比"
+"如：<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch="
+"\"s390\">磁带、磁带仿真、</phrase> <phrase condition=\"bootable-disk\">硬盘、"
+"</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase "
+"condition=\"supports-tftp\">网络引导，</phrase> 或者从 CD 中手工装载内核来初"
+"始化系统安装程序。CD 已经包含了通过其他方法引导所需要的文件; &debian; 的网络"
+"存档和 CD 的文件夹组织方式是一致的。因此如果后面有给出的用于引导的特定存档文"
+"件路径时，请在 CD 中同样的文件目录和子目录下查找它们。"
 
 #. Tag: para
 #: install-methods.xml:52
@@ -113,32 +104,28 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:83
 #, no-c-format
-#| msgid "Downloading Files from Debian Mirrors"
 msgid "Downloading Files from &debian; Mirrors"
 msgstr "从 &debian; 镜像服务器下载文件"
 
 #. Tag: para
 #: install-methods.xml:85
 #, no-c-format
-#| msgid ""
-#| "To find the nearest (and thus probably the fastest) mirror, see the "
-#| "<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</ulink>."
 msgid ""
 "To find the nearest (and thus probably the fastest) mirror, see the <ulink "
 "url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
-msgstr "选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-debian-mirrors;\">&debian; 镜像列表</ulink>。"
+msgstr ""
+"选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-"
+"debian-mirrors;\">&debian; 镜像列表</ulink>。"
 
 #. Tag: para
 #: install-methods.xml:90
 #, no-c-format
-#| msgid ""
-#| "When downloading files from a Debian mirror using FTP, be sure to "
-#| "download the files in <emphasis>binary</emphasis> mode, not text or "
-#| "automatic mode."
 msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
-msgstr "当使用 FTP 从 &debian; 镜像服务器下载文件的时候，请确认下载的文件是处于<emphasis>二进制</emphasis>模式，而不是文本或者自动模式。"
+msgstr ""
+"当使用 FTP 从 &debian; 镜像服务器下载文件的时候，请确认下载的文件是处于"
+"<emphasis>二进制</emphasis>模式，而不是文本或者自动模式。"
 
 #. Tag: title
 #: install-methods.xml:98
@@ -149,19 +136,17 @@ msgstr "在哪里能找到安装映像"
 #. Tag: para
 #: install-methods.xml:100
 #, no-c-format
-#| msgid ""
-#| "The installation images are located on each Debian mirror in the "
-#| "directory <ulink url=\"&url-debian-installer;images\">debian/dists/"
-#| "&releasename;/main/installer-&architecture;/current/images/</ulink> "
-#| "&mdash; the <ulink url=\"&url-debian-installer;images/MANIFEST"
-#| "\">MANIFEST</ulink> lists each image and its purpose."
 msgid ""
 "The installation images are located on each &debian; mirror in the directory "
 "<ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/"
 "installer-&architecture;/current/images/</ulink> &mdash; the <ulink url="
 "\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> lists each image "
 "and its purpose."
-msgstr "安装映像位于每一个 &debian; 镜像的 <ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/installer-&architecture;/current/images/</ulink> &mdash; <ulink url=\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
+msgstr ""
+"安装映像位于每一个 &debian; 镜像的 <ulink url=\"&url-debian-installer;images"
+"\">debian/dists/&releasename;/main/installer-&architecture;/current/images/</"
+"ulink> &mdash; <ulink url=\"&url-debian-installer;images/MANIFEST"
+"\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
 
 #. Tag: title
 #: install-methods.xml:113
@@ -210,15 +195,13 @@ msgstr "GLAN Tank 安装文件"
 #. Tag: para
 #: install-methods.xml:139
 #, no-c-format
-#| msgid ""
-#| "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &glantank-firmware-img;."
 msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
 "on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
-msgstr "GLAN Tank 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这些映象可以从 &glantank-firmware-img; 获得。"
+msgstr ""
+"GLAN Tank 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这"
+"些映象可以从 &glantank-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:149
@@ -229,15 +212,13 @@ msgstr "Kurobox Pro 安装文件"
 #. Tag: para
 #: install-methods.xml:150
 #, no-c-format
-#| msgid ""
-#| "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &kuroboxpro-firmware-img;."
 msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
 "disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
-msgstr "Kurobox Pro 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这些映象可以从 &kuroboxpro-firmware-img; 获得。"
+msgstr ""
+"Kurobox Pro 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。"
+"这些映象可以从 &kuroboxpro-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:160
@@ -360,7 +341,12 @@ msgid ""
 "mode. This is required because these images are raw representations of the "
 "disk; it is required to do a <emphasis>sector copy</emphasis> of the data "
 "from the file onto the floppy."
-msgstr "软盘映像是一些包含完整的 <emphasis>raw</emphasis> 格式软盘内容的文件。类似 <filename>boot.img</filename> 这样的软盘映像不能直接复制到软盘中。有一个特殊的程序可以将它们按 <emphasis>raw</emphasis> 模式写入软盘。这是一个必须的步骤，因为这些映像文件是一些原始的磁盘保存方式。所以需要把文件的数据<emphasis>按扇区复制</emphasis>到软盘中。"
+msgstr ""
+"软盘映像是一些包含完整的 <emphasis>raw</emphasis> 格式软盘内容的文件。类似 "
+"<filename>boot.img</filename> 这样的软盘映像不能直接复制到软盘中。有一个特殊"
+"的程序可以将它们按 <emphasis>raw</emphasis> 模式写入软盘。这是一个必须的步"
+"骤，因为这些映像文件是一些原始的磁盘保存方式。所以需要把文件的数据<emphasis>"
+"按扇区复制</emphasis>到软盘中。"
 
 #. Tag: para
 #: install-methods.xml:285
@@ -376,19 +362,16 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:291
 #, no-c-format
-#| msgid ""
-#| "Before you can create the floppies, you will first need to download them "
-#| "from one of the Debian mirrors, as explained in <xref linkend="
-#| "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
-#| "installation CD-ROM or DVD, the floppy images may also be included on the "
-#| "CD/DVD.</phrase>"
 msgid ""
 "Before you can create the floppies, you will first need to download them "
 "from one of the &debian; mirrors, as explained in <xref linkend="
 "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
 "installation CD-ROM or DVD, the floppy images may also be included on the CD/"
 "DVD.</phrase>"
-msgstr "制作软盘之前，您首先需要从 &debian; 镜像下载这些文件，见 <xref linkend=\"downloading-files\"/>。<phrase arch=\"i386\">如果您已经有了安装 CD-ROM 或 DVD，软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
+msgstr ""
+"制作软盘之前，您首先需要从 &debian; 镜像下载这些文件，见 <xref linkend="
+"\"downloading-files\"/>。<phrase arch=\"i386\">如果您已经有了安装 CD-ROM 或 "
+"DVD，软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:299
@@ -492,7 +475,8 @@ msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
 msgid ""
 "If you have access to an i386 or amd64 machine, you can use one of the "
 "following programs to copy images to floppies."
-msgstr "如果您能操作一台 i386 或 amd64 机器，可以使用如下方法之一往软盘复制映像文件。"
+msgstr ""
+"如果您能操作一台 i386 或 amd64 机器，可以使用如下方法之一往软盘复制映像文件。"
 
 #. Tag: para
 #: install-methods.xml:375
@@ -522,13 +506,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:389
 #, no-c-format
-#| msgid ""
-#| "These tools can be found on the Official Debian CD-ROMs under the "
-#| "<filename>/tools</filename> directory."
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
 "<filename>/tools</filename> directory."
-msgstr "这些工具可以在官方 &debian; 光盘中找到，位于 <filename>/tools</filename> 目录下。"
+msgstr ""
+"这些工具可以在官方 &debian; 光盘中找到，位于 <filename>/tools</filename> 目录"
+"下。"
 
 #. Tag: title
 #: install-methods.xml:402
@@ -539,15 +522,6 @@ msgstr "在 MacOS 上写磁盘映像"
 #. Tag: para
 #: install-methods.xml:403
 #, no-c-format
-#| msgid ""
-#| "An AppleScript, <application>Make Debian Floppy</application>, is "
-#| "available for burning floppies from the provided disk image files. It can "
-#| "be downloaded from <ulink url=\"ftp://ftp2.sourceforge.net/pub/"
-#| "sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink>. To use it, "
-#| "just unstuff it on your desktop, and then drag any floppy image file to "
-#| "it. You must have Applescript installed and enabled in your extensions "
-#| "manager. Disk Copy will ask you to confirm that you wish to erase the "
-#| "floppy and proceed to write the file image to it."
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
 "available for burning floppies from the provided disk image files. It can be "
@@ -557,7 +531,13 @@ msgid ""
 "Applescript installed and enabled in your extensions manager. Disk Copy will "
 "ask you to confirm that you wish to erase the floppy and proceed to write "
 "the file image to it."
-msgstr "这里有一个名为 <application>Make &debian; Floppy</application> 的 AppleSrcipt 可以用来从所提供的磁盘映像制作软盘。它可以从 <ulink url=\"ftp://ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink> 处下载。使用时只需要解压文件至桌面，然后向其拖入想刻录的映像文件。您必须已经安装了 Applescript 并在您的扩展管理器中开启它。Disk Copy 会要求您确认的确想要清空磁盘并写入磁盘映像。"
+msgstr ""
+"这里有一个名为 <application>Make &debian; Floppy</application> 的 "
+"AppleSrcipt 可以用来从所提供的磁盘映像制作软盘。它可以从 <ulink url=\"ftp://"
+"ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit"
+"\"></ulink> 处下载。使用时只需要解压文件至桌面，然后向其拖入想刻录的映像文"
+"件。您必须已经安装了 Applescript 并在您的扩展管理器中开启它。Disk Copy 会要求"
+"您确认的确想要清空磁盘并写入磁盘映像。"
 
 #. Tag: para
 #: install-methods.xml:414
@@ -581,17 +561,15 @@ msgstr "写磁盘映像：使用<command>Disk Copy</command>"
 #. Tag: para
 #: install-methods.xml:426
 #, no-c-format
-#| msgid ""
-#| "If you are creating the floppy image from files which were originally on "
-#| "the official &debian-gnu; CD, then the Type and Creator are already set "
-#| "correctly. The following <command>Creator-Changer</command> steps are "
-#| "only necessary if you downloaded the image files from a Debian mirror."
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
 "official &debian-gnu; CD, then the Type and Creator are already set "
 "correctly. The following <command>Creator-Changer</command> steps are only "
 "necessary if you downloaded the image files from a &debian; mirror."
-msgstr "假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 &debian; 镜像下载映像文件的情况。"
+msgstr ""
+"假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经"
+"设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 &debian; 镜像"
+"下载映像文件的情况。"
 
 #. Tag: para
 #: install-methods.xml:435
@@ -722,19 +700,15 @@ msgstr "为从 U 盘引导准备文件"
 #. Tag: para
 #: install-methods.xml:532
 #, no-c-format
-#| msgid ""
-#| "There are two installation methods possible when booting from USB stick. "
-#| "The first is to install completely from the network. The second is to "
-#| "also copy a CD image onto the USB stick and use that as a source for "
-#| "packages, possibly in combination with a mirror. This second method is "
-#| "the more common."
 msgid ""
 "There are two installation methods possible when booting from USB stick. The "
 "first is to only use the USB stick to boot the installer, and then install "
 "completely from the network. The second is to also copy a CD image onto the "
 "USB stick and use that as a source for packages, possibly in combination "
 "with a mirror."
-msgstr "从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序，然后完全通过网络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源，还可以结合其他镜像。"
+msgstr ""
+"从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序，然后完全通过网"
+"络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源，还可以结合其他镜像。"
 
 #. Tag: para
 #: install-methods.xml:540
@@ -772,11 +746,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:560
 #, no-c-format
-#| msgid ""
-#| "For the first installation method you'll need to download an installer "
-#| "image from the <filename>netboot</filename> directory (at the location "
-#| "mentioned in <xref linkend=\"where-files\"/>) and use the <quote>flexible "
-#| "way</quote> explained below to copy the files to the USB stick."
 msgid ""
 "To prepare a USB stick that only boots the installer, which then proceeds to "
 "install entirely from the network, you'll need to download the "
@@ -785,7 +754,11 @@ msgid ""
 "and write this file directly to the USB stick, overwriting its current "
 "contents. This method will work with very small USB sticks, only a few "
 "megabytes in size."
-msgstr "要制作一个仅启动安装程序的 U 盘，之后完全从网络安装，您需要从 <filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象(它位于 <xref linkend=\"where-files\"/>)，然后将该文件直接写入 U 盘，覆盖里面的内容。此方法适用于容量很小的 U 盘，它只需要几 M 的字节。"
+msgstr ""
+"要制作一个仅启动安装程序的 U 盘，之后完全从网络安装，您需要从 "
+"<filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象(它位"
+"于 <xref linkend=\"where-files\"/>)，然后将该文件直接写入 U 盘，覆盖里面的内"
+"容。此方法适用于容量很小的 U 盘，它只需要几 M 的字节。"
 
 #. Tag: para
 #: install-methods.xml:570
@@ -802,10 +775,14 @@ msgid ""
 "two partitions should now be visible on it. You should mount the second of "
 "the two partitions, and unpack the firmware onto it."
 msgstr ""
-"例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件可以写如到一个 U 盘里面: <informalexample><screen>\n"
+"例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件"
+"可以写如到一个 U 盘里面: <informalexample><screen>\n"
 "# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
 "# sync\n"
-"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上面。"
+"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件"
+"文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 "
+"U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上"
+"面。"
 
 #. Tag: screen
 #: install-methods.xml:582
@@ -826,18 +803,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:584
 #, no-c-format
-#| msgid ""
-#| "Installation images for the second installation method can be found in "
-#| "the <filename>hd-media</filename> directory and either the <quote>easy "
-#| "way</quote> or the <quote>flexible way</quote> can be used to copy the "
-#| "image to the USB stick. For this installation method you will also need "
-#| "to download a CD image. The installation image and the CD image must be "
-#| "based on the same release of &d-i;. If they do not match you are likely "
-#| "to get errors<footnote> <para> The error message that is most likely to "
-#| "be displayed is that no kernel modules can be found. This means that the "
-#| "version of the kernel module udebs included on the CD image is different "
-#| "from the version of the running kernel. </para> </footnote> during the "
-#| "installation."
 msgid ""
 "To prepare a USB stick that installs packages from a CD image included on "
 "the stick, use the installer images found in the <filename>hd-media</"
@@ -850,7 +815,13 @@ msgid ""
 "can be found. This means that the version of the kernel module udebs "
 "included on the CD image is different from the version of the running "
 "kernel. </para> </footnote> during the installation."
-msgstr "制作包含 CD 映象软件包的 U 盘，需要使用的安装映象放在 <filename>hd-media</filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与正在运行的内核不符。</para> </footnote>。"
+msgstr ""
+"制作包含 CD 映象软件包的 U 盘，需要使用的安装映象放在 <filename>hd-media</"
+"filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它"
+"复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该"
+"是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息"
+"大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与"
+"正在运行的内核不符。</para> </footnote>。"
 
 #. Tag: para
 #: install-methods.xml:604
@@ -871,19 +842,17 @@ msgstr "复制文件 &mdash; 轻松的途径"
 #. Tag: para
 #: install-methods.xml:613
 #, no-c-format
-#| msgid ""
-#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
-#| "which contains all the installer files (including the kernel) <phrase "
-#| "arch=\"x86\">as well as <classname>syslinux</classname> and its "
-#| "configuration file.</phrase> <phrase arch=\"powerpc\">as well as "
-#| "<classname>yaboot</classname> and its configuration file.</phrase>"
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
 "contains all the installer files (including the kernel) <phrase arch="
 "\"x86\">as well as <classname>syslinux</classname> and its configuration "
 "file</phrase> <phrase arch=\"powerpc\">as well as <classname>yaboot</"
 "classname> and its configuration file</phrase>."
-msgstr "有一个文件合集 <filename>hd-media/boot.img.gz</filename> 包含所有的安装程序文件(包括内核) <phrase arch=\"x86\">以及 <classname>syslinux</classname> 和对应的配置文件</phrase> <phrase arch=\"powerpc\">以及 <classname>yaboot</classname> 和对应的配置文件</phrase>。"
+msgstr ""
+"有一个文件合集 <filename>hd-media/boot.img.gz</filename> 包含所有的安装程序文"
+"件(包括内核) <phrase arch=\"x86\">以及 <classname>syslinux</classname> 和对应"
+"的配置文件</phrase> <phrase arch=\"powerpc\">以及 <classname>yaboot</"
+"classname> 和对应的配置文件</phrase>。"
 
 #. Tag: para
 #: install-methods.xml:622
@@ -934,15 +903,6 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 #. Tag: para
 #: install-methods.xml:646
 #, no-c-format
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
-#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
-#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a Debian netinst "
-#| "or businesscard ISO image to it. Unmount the stick (<userinput>umount /"
-#| "mnt</userinput>) and you are done."
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -952,7 +912,14 @@ msgid ""
 "filesystem</phrase> on it, and copy a &debian; netinst or businesscard ISO "
 "image to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
 "are done."
-msgstr "然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>)，</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>)，</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，复制 &debian; netinst 或 businesscard ISO 映象到里面。卸载 U 盘 (<userinput>umount /mnt</userinput>) 就完成了。"
+msgstr ""
+"然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
+"<replaceable>sdX</replaceable> /mnt</userinput>)，</phrase> <phrase arch="
+"\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</"
+"userinput>)，</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</"
+"phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，复制 &debian; "
+"netinst 或 businesscard ISO 映象到里面。卸载 U 盘 (<userinput>umount /mnt</"
+"userinput>) 就完成了。"
 
 #. Tag: title
 #: install-methods.xml:663
@@ -990,18 +957,6 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 #. Tag: para
 #: install-methods.xml:685
 #, no-c-format
-#| msgid ""
-#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
-#| "you probably won't have to repartition or reformat the stick. If you have "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition<footnote> <para> Don't "
-#| "forget to set the <quote>bootable</quote> bootable flag. </para> </"
-#| "footnote>, and then create the filesystem using: "
-#| "<informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> Debian package."
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -1014,9 +969,14 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> &debian; package."
 msgstr ""
-"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
+"化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
+"创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导"
+"标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</classname> 软件包中。"
+"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。"
+"<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</"
+"classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:704
@@ -1107,20 +1067,12 @@ msgstr ""
 "<quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序，您需要添加 "
-"<userinput>vga=788</userinput> 到第二行尾部。"
+"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>vga=788</"
+"userinput> 到第二行尾部。"
 
 #. Tag: para
 #: install-methods.xml:768
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image<footnote> <para> You can use either a businesscard, a "
-#| "netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
-#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
-#| "iso</filename></quote> image is not usable for this purpose. </para> </"
-#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
-#| "(<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1129,24 +1081,16 @@ msgid ""
 "filename></quote> image is not usable for this purpose. </para> </footnote> "
 "onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> 到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象"
+"<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 "
+"<xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
+"<filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> "
+"到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
 #: install-methods.xml:792
 #, no-c-format
-#| msgid ""
-#| "Most USB sticks do not come pre-configured in such a way that Open "
-#| "Firmware can boot from them, so you will need to repartition the stick. "
-#| "On Mac systems, run <userinput>mac-fdisk /dev/<replaceable>sdX</"
-#| "replaceable></userinput>, initialise a new partition map using the "
-#| "<userinput>i</userinput> command, and create a new partition of type "
-#| "Apple_Bootstrap using the <userinput>C</userinput> command. (Note that "
-#| "the first \"partition\" will always be the partition map itself.) Then "
-#| "type <informalexample><screen>\n"
-#| "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>hformat</command> command is "
-#| "contained in the <classname>hfsutils</classname> Debian package."
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
 "can boot from them, so you will need to repartition the stick. On Mac "
@@ -1161,9 +1105,15 @@ msgid ""
 "for your USB stick. The <command>hformat</command> command is contained in "
 "the <classname>hfsutils</classname> &debian; package."
 msgstr ""
-"绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></userinput>，用 <userinput>i</userinput> 命令初始化新的分区映射，然后使用 <userinput>C</userinput> 命令创建一个新的类型为 Apple_Bootstrap 的分区。(要注意的是第一个\"分区\"总是分区映射本身。) 然后键入 <informalexample><screen>\n"
+"绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘"
+"重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</"
+"replaceable></userinput>，用 <userinput>i</userinput> 命令初始化新的分区映"
+"射，然后使用 <userinput>C</userinput> 命令创建一个新的类型为 Apple_Bootstrap "
+"的分区。(要注意的是第一个\"分区\"总是分区映射本身。) 然后键入 "
+"<informalexample><screen>\n"
 "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-"</screen></informalexample> 注意使用正确的 U 盘设备名称。<command>hformat</command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
+"</screen></informalexample> 注意使用正确的 U 盘设备名称。<command>hformat</"
+"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:809
@@ -1287,17 +1237,15 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:878
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image (businesscard, netinst or full CD image; be sure to "
-#| "select one that fits) onto the stick. When you are done, unmount the USB "
-#| "memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
 "select one that fits) onto the stick. When you are done, unmount the USB "
 "memory stick (<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。然后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象"
+"(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。然后，卸"
+"载 U 盘 (<userinput>umount /mnt</userinput>)。"
 
 #. Tag: title
 #: install-methods.xml:893
@@ -1417,15 +1365,13 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:960
 #, no-c-format
-#| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
-#| "filename>."
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
 "on your hard drive (note that LILO can not boot from files on an NTFS file "
 "system), for instance to <filename>/boot/newinstall/</filename>."
-msgstr "将以下文件从 &debian; 存档中复制到硬盘中比较方便的地方，比如 <filename>/boot/newinstall/</filename>。"
+msgstr ""
+"将以下文件从 &debian; 存档中复制到硬盘中比较方便的地方，比如 <filename>/boot/"
+"newinstall/</filename>。"
 
 #. Tag: para
 #: install-methods.xml:968
@@ -1450,40 +1396,32 @@ msgstr "最后，要配置 bootloader，请进入 <xref linkend=\"boot-initrd\"/
 #. Tag: title
 #: install-methods.xml:990
 #, no-c-format
-#| msgid ""
-#| "Hard disk installer booting using <command>LILO</command> or "
-#| "<command>GRUB</command>"
 msgid "Hard disk installer booting using <command>loadlin</command>"
 msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
 
 #. Tag: para
 #: install-methods.xml:991
 #, no-c-format
-#| msgid ""
-#| "This section explains how to add to or even replace an existing linux "
-#| "installation using either <command>LILO</command> or <command>GRUB</"
-#| "command>."
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
 "installer from DOS using <command>loadlin</command>."
-msgstr "本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
+msgstr ""
+"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
 
 #. Tag: para
 #: install-methods.xml:996
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
+#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr "从 &debian; CD 映象复制下列文件到 <filename>c:\\</filename>。"
 
 #. Tag: para
 #: install-methods.xml:1001
 #, no-c-format
-#| msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
@@ -1491,7 +1429,6 @@ msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
 #. Tag: para
 #: install-methods.xml:1006
 #, no-c-format
-#| msgid "<filename>boot.msg</filename> (optional boot message)"
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (loadlin 工具)"
 
@@ -1504,16 +1441,6 @@ msgstr "在 OldWorld Macs 上引导硬盘安装程序"
 #. Tag: para
 #: install-methods.xml:1020
 #, no-c-format
-#| msgid ""
-#| "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
-#| "application> to launch Linux installation, but <application>miBoot</"
-#| "application> cannot easily be used for hard disk booting. "
-#| "<application>BootX</application>, launched from MacOS, supports booting "
-#| "from files placed on the hard disk. <application>BootX</application> can "
-#| "also be used to dual-boot MacOS and Linux after your Debian installation "
-#| "is complete. For the Performa 6360, it appears that <command>quik</"
-#| "command> cannot make the hard disk bootable. So <application>BootX</"
-#| "application> is required on that model."
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
 "application> to launch Linux installation, but <application>miBoot</"
@@ -1524,23 +1451,18 @@ msgid ""
 "complete. For the Performa 6360, it appears that <command>quik</command> "
 "cannot make the hard disk bootable. So <application>BootX</application> is "
 "required on that model."
-msgstr "<filename>boot-floppy-hfs</filename> 软盘使用 <application>miBoot</application> 来启动 Linux 安装，但是 <application>miBoot</application> 不易用于从硬盘引导。运行于 MacOS 的 <application>BootX</application> 支持从硬盘上的文件进行引导。<application>BootX</application> 也能在安装完 &debian; 后用于 MacOS 和 Linux 的双重引导。对于 Performa 6360 来说，<command>quik</command> 看上去不能让硬盘可引导。因此 <application>BootX</application> 对于该型号来说是必须的。"
+msgstr ""
+"<filename>boot-floppy-hfs</filename> 软盘使用 <application>miBoot</"
+"application> 来启动 Linux 安装，但是 <application>miBoot</application> 不易用"
+"于从硬盘引导。运行于 MacOS 的 <application>BootX</application> 支持从硬盘上的"
+"文件进行引导。<application>BootX</application> 也能在安装完 &debian; 后用于 "
+"MacOS 和 Linux 的双重引导。对于 Performa 6360 来说，<command>quik</command> "
+"看上去不能让硬盘可引导。因此 <application>BootX</application> 对于该型号来说"
+"是必须的。"
 
 #. Tag: para
 #: install-methods.xml:1033
 #, no-c-format
-#| msgid ""
-#| "Download and unstuff the <application>BootX</application> distribution, "
-#| "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
-#| "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-#| "directory on Debian http/ftp mirrors and official Debian CDs. Use "
-#| "<application>Stuffit Expander</application> to extract it from its "
-#| "archive. Within the package, there is an empty folder called "
-#| "<filename>Linux Kernels</filename>. Download <filename>linux.bin</"
-#| "filename> and <filename>ramdisk.image.gz</filename> from the "
-#| "<filename>disks-powerpc/current/powermac</filename> folder, and place "
-#| "them in the <filename>Linux Kernels</filename> folder. Then place the "
-#| "<filename>Linux Kernels</filename> folder in the active System Folder."
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
 "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
@@ -1553,7 +1475,17 @@ msgid ""
 "filename> folder, and place them in the <filename>Linux Kernels</filename> "
 "folder. Then place the <filename>Linux Kernels</filename> folder in the "
 "active System Folder."
-msgstr "请下载并且解压 <application>BootX</application> 发布版本。它可以从 <ulink url=\"&url-powerpc-bootx;\"></ulink>，或者 &debian; http/ftp 镜像以及官方 &debian; 光盘的 <filename>dists/woody/main/disks-powerpc/current/powermac</filename> 目录下得到。可以用 <application>Stuffit Expander</application> 来把它从打包档案中解开。在这个包中，有一个名为 <filename>Linux Kernels</filename> 的空文件夹。请下载 <filename>linux.bin</filename> 和 <filename>ramdisk.image.gz</filename> (位于 <filename>disks-powerpc/current/powermac</filename> 文件夹)，然后把他们放到 <filename>Linux Kernels</filename> 文件夹中，然后把 <filename>Linux Kernels</filename> 文件夹放到活动的系统文件夹中。"
+msgstr ""
+"请下载并且解压 <application>BootX</application> 发布版本。它可以从 <ulink "
+"url=\"&url-powerpc-bootx;\"></ulink>，或者 &debian; http/ftp 镜像以及官方 "
+"&debian; 光盘的 <filename>dists/woody/main/disks-powerpc/current/powermac</"
+"filename> 目录下得到。可以用 <application>Stuffit Expander</application> 来把"
+"它从打包档案中解开。在这个包中，有一个名为 <filename>Linux Kernels</"
+"filename> 的空文件夹。请下载 <filename>linux.bin</filename> 和 "
+"<filename>ramdisk.image.gz</filename> (位于 <filename>disks-powerpc/current/"
+"powermac</filename> 文件夹)，然后把他们放到 <filename>Linux Kernels</"
+"filename> 文件夹中，然后把 <filename>Linux Kernels</filename> 文件夹放到活动"
+"的系统文件夹中。"
 
 #. Tag: title
 #: install-methods.xml:1053
@@ -1582,17 +1514,15 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1065
 #, no-c-format
-#| msgid ""
-#| "<emphasis>Copy</emphasis> (not move) the following four files which you "
-#| "downloaded earlier from the Debian archives, onto the root level of your "
-#| "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
-#| "each file to the hard drive icon)."
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
 "downloaded earlier from the &debian; archives, onto the root level of your "
 "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
 "each file to the hard drive icon)."
-msgstr "<emphasis>复制</emphasis>(而非移动)您早先从 &debian; 存档下载的下列四个文件到您硬盘的根目录上(这个可以用按住 <keycap>option</keycap> 键然后拖动每个文件到硬盘图标的方法来完成)。"
+msgstr ""
+"<emphasis>复制</emphasis>(而非移动)您早先从 &debian; 存档下载的下列四个文件到"
+"您硬盘的根目录上(这个可以用按住 <keycap>option</keycap> 键然后拖动每个文件到"
+"硬盘图标的方法来完成)。"
 
 #. Tag: filename
 #: install-methods.xml:1075 install-methods.xml:1401
@@ -1703,13 +1633,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1152
 #, no-c-format
-#| msgid ""
-#| "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. "
-#| "There is an <classname>rbootd</classname> package available in Debian."
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
 "is an <classname>rbootd</classname> package available in &debian;."
-msgstr "一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。&debian; 里面有一个 <classname>rbootd</classname> 软件包。"
+msgstr ""
+"一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。&debian; 里面有一"
+"个 <classname>rbootd</classname> 软件包。"
 
 #. Tag: para
 #: install-methods.xml:1157
@@ -1974,37 +1903,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1273
 #, no-c-format
-#| msgid ""
-#| "To use CMU <command>bootpd</command>, you must first uncomment (or add) "
-#| "the relevant line in <filename>/etc/inetd.conf</filename>. On &debian-"
-#| "gnu;, you can run <userinput>update-inetd --enable bootps</userinput>, "
-#| "then <userinput>/etc/init.d/inetd reload</userinput> to do so. Just in "
-#| "case your BOOTP server does not run Debian, the line in question should "
-#| "look like: <informalexample><screen>\n"
-#| "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-#| "</screen></informalexample> Now, you must create an <filename>/etc/"
-#| "bootptab</filename> file. This has the same sort of familiar and cryptic "
-#| "format as the good old BSD <filename>printcap</filename>, "
-#| "<filename>termcap</filename>, and <filename>disktab</filename> files. See "
-#| "the <filename>bootptab</filename> manual page for more information. For "
-#| "CMU <command>bootpd</command>, you will need to know the hardware (MAC) "
-#| "address of the client. Here is an example <filename>/etc/bootptab</"
-#| "filename>: <informalexample><screen>\n"
-#| "client:\\\n"
-#| "  hd=/tftpboot:\\\n"
-#| "  bf=tftpboot.img:\\\n"
-#| "  ip=192.168.1.90:\\\n"
-#| "  sm=255.255.255.0:\\\n"
-#| "  sa=192.168.1.1:\\\n"
-#| "  ha=0123456789AB:\n"
-#| "</screen></informalexample> You will need to change at least the "
-#| "<quote>ha</quote> option, which specifies the hardware address of the "
-#| "client. The <quote>bf</quote> option specifies the file a client should "
-#| "retrieve via TFTP; see <xref linkend=\"tftp-images\"/> for more details. "
-#| "<phrase arch=\"mips\"> On SGI machines you can just enter the command "
-#| "monitor and type <userinput>printenv</userinput>. The value of the "
-#| "<userinput>eaddr</userinput> variable is the machine's MAC address. </"
-#| "phrase>"
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
 "relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you "
@@ -2036,9 +1934,20 @@ msgid ""
 "<userinput>printenv</userinput>. The value of the <userinput>eaddr</"
 "userinput> variable is the machine's MAC address. </phrase>"
 msgstr ""
-"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd.conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里，您可以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 <userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP 服务器不是运行在 &debian; 上，这行看起来应该像这样： <informalexample><screen>\n"
+"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd."
+"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里，"
+"您可以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 "
+"<userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP "
+"服务器不是运行在 &debian; 上，这行看起来应该像这样： "
+"<informalexample><screen>\n"
 "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 <filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件(MAC)地址。这里有一个示例 <filename>/etc/bootptab</filename>： <informalexample><screen>\n"
+"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</"
+"filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些"
+"文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 "
+"<filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获"
+"得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件(MAC)"
+"地址。这里有一个示例 <filename>/etc/bootptab</filename>： "
+"<informalexample><screen>\n"
 "client:\\\n"
 "  hd=/tftpboot:\\\n"
 "  bf=tftpboot.img:\\\n"
@@ -2046,7 +1955,12 @@ msgstr ""
 "  sm=255.255.255.0:\\\n"
 "  sa=192.168.1.1:\\\n"
 "  ha=0123456789AB:\n"
-"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 <userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 MAC 地址。</phrase>"
+"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客"
+"户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的"
+"文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase "
+"arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 "
+"<userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 "
+"MAC 地址。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:1306
@@ -2119,36 +2033,20 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1350
 #, no-c-format
-#| msgid ""
-#| "All <command>in.tftpd</command> alternatives available in Debian should "
-#| "log TFTP requests to the system logs by default. Some of them support a "
-#| "<userinput>-v</userinput> argument to increase verbosity. It is "
-#| "recommended to check these log messages in case of boot problems as they "
-#| "are a good starting point for diagnosing the cause of errors."
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
 "log TFTP requests to the system logs by default. Some of them support a "
 "<userinput>-v</userinput> argument to increase verbosity. It is recommended "
 "to check these log messages in case of boot problems as they are a good "
 "starting point for diagnosing the cause of errors."
-msgstr "&debian; 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
+msgstr ""
+"&debian; 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系"
+"统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导"
+"问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
 
 #. Tag: para
 #: install-methods.xml:1358
 #, no-c-format
-#| msgid ""
-#| "If you intend to install Debian on an SGI machine and your TFTP server is "
-#| "a GNU/Linux box running Linux 2.4, you'll need to set the following on "
-#| "your server: <informalexample><screen>\n"
-#| "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-#| "</screen></informalexample> to turn off Path MTU discovery, otherwise the "
-#| "SGI's PROM can't download the kernel. Furthermore, make sure TFTP packets "
-#| "are sent from a source port no greater than 32767, or the download will "
-#| "stall after the first packet. Again, it's Linux 2.4.X tripping this bug "
-#| "in the PROM, and you can avoid it by setting <informalexample><screen>\n"
-#| "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-#| "</screen></informalexample> to adjust the range of source ports the Linux "
-#| "TFTP server uses."
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
 "a GNU/Linux box running Linux 2.4, you'll need to set the following on your "
@@ -2163,11 +2061,16 @@ msgid ""
 "</screen></informalexample> to adjust the range of source ports the Linux "
 "TFTP server uses."
 msgstr ""
-"如果您想要在一台 SGI 上安装 &debian; 并且您的 TFTP 服务器是一台运行 Linux 2.4 的 GNU/Linux 机器，需要对服务器进行如下设置： <informalexample><screen>\n"
+"如果您想要在一台 SGI 上安装 &debian; 并且您的 TFTP 服务器是一台运行 Linux "
+"2.4 的 GNU/Linux 机器，需要对服务器进行如下设置： <informalexample><screen>\n"
 "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-"</screen></informalexample> 来关闭 Path MTU 查询，否则 SGI 的 PROM 不能下载内核。而且，您还要确保 TFTP 数据包是从一个不大于 32767 的端口送出，否则在第一包之后，下载将停止。重申一下，这是由于 Linux 2.4.X 触发了 PROM 里的一个 bug。您可以通过如下设置： <informalexample><screen>\n"
+"</screen></informalexample> 来关闭 Path MTU 查询，否则 SGI 的 PROM 不能下载内"
+"核。而且，您还要确保 TFTP 数据包是从一个不大于 32767 的端口送出，否则在第一包"
+"之后，下载将停止。重申一下，这是由于 Linux 2.4.X 触发了 PROM 里的一个 bug。您"
+"可以通过如下设置： <informalexample><screen>\n"
 "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-"</screen></informalexample> 调整 Linux TFTP 服务器使用的源端口范围以避开这个错误。"
+"</screen></informalexample> 调整 Linux TFTP 服务器使用的源端口范围以避开这个"
+"错误。"
 
 #. Tag: title
 #: install-methods.xml:1380
@@ -2329,41 +2232,35 @@ msgstr "自动化安装"
 #. Tag: para
 #: install-methods.xml:1591
 #, no-c-format
-#| msgid ""
-#| "For installing on multiple computers it's possible to do fully automatic "
-#| "installations. Debian packages intended for this include <classname>fai</"
-#| "classname> (which uses an install server), <classname>replicator</"
-#| "classname>, <classname>systemimager</classname>, <classname>autoinstall</"
-#| "classname>, and the Debian Installer itself."
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
 "installations. &debian; packages intended for this include <classname>fai-"
 "quickstart</classname> (which can use an install server) and the &debian; "
 "Installer itself. Have a look at the <ulink url=\"http://fai-project.org"
 "\">FAI home page</ulink> for detailed information."
-msgstr "要同时安装多台计算机，可以使用完全自动方式安装。这方面的 &debian; 软件包包括 <classname>fai-quickstart</classname> (可以用来安装服务器) 和 &debian; 安装程序自己。参阅 <ulink url=\"http://fai-project.org\">FAI home page</ulink> 了解更多细节。"
+msgstr ""
+"要同时安装多台计算机，可以使用完全自动方式安装。这方面的 &debian; 软件包包括 "
+"<classname>fai-quickstart</classname> (可以用来安装服务器) 和 &debian; 安装程"
+"序自己。参阅 <ulink url=\"http://fai-project.org\">FAI home page</ulink> 了解"
+"更多细节。"
 
 #. Tag: title
 #: install-methods.xml:1603
 #, no-c-format
-#| msgid "Automatic Installation Using the Debian Installer"
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "使用 &debian; 安装程序进行自动安装"
 
 #. Tag: para
 #: install-methods.xml:1604
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer supports automating installs via preconfiguration "
-#| "files. A preconfiguration file can be loaded from the network or from "
-#| "removable media, and used to fill in answers to questions asked during "
-#| "the installation process."
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
 "files. A preconfiguration file can be loaded from the network or from "
 "removable media, and used to fill in answers to questions asked during the "
 "installation process."
-msgstr "&debian; 安装程序支持使用预先配置的文件进行自动安装。预置文件可以从网络或移动介质上加载，并自动回答安装过程中的问题。"
+msgstr ""
+"&debian; 安装程序支持使用预先配置的文件进行自动安装。预置文件可以从网络或移动"
+"介质上加载，并自动回答安装过程中的问题。"
 
 #. Tag: para
 #: install-methods.xml:1611
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index a3042aff4..243f5add2 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -82,17 +82,16 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:47
 #, no-c-format
-#| msgid ""
-#| "Some installation methods require other images than CD images. <phrase "
-#| "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
-#| "page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
-#| "files\"/> explains how to find images on Debian mirrors."
 msgid ""
 "Some installation methods require other images than CD images. <phrase "
 "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
 "page</ulink> has links to other images. </phrase> <xref linkend=\"where-files"
 "\"/> explains how to find images on &debian; mirrors."
-msgstr "有些安装方法需要其它种类的映像而非 CD 的映像。<phrase condition=\"unofficial-build\"> <ulink url=\"&url-d-i;\">&d-i; 的主页</ulink> 上有到其它种类的映像的链接。</phrase> <xref linkend=\"where-files\"/> 会告诉您如何在 &debian; 的映像站点找到那些映像文件。"
+msgstr ""
+"有些安装方法需要其它种类的映像而非 CD 的映像。<phrase condition=\"unofficial-"
+"build\"> <ulink url=\"&url-d-i;\">&d-i; 的主页</ulink> 上有到其它种类的映像的"
+"链接。</phrase> <xref linkend=\"where-files\"/> 会告诉您如何在 &debian; 的映"
+"像站点找到那些映像文件。"
 
 #. Tag: para
 #: installation-howto.xml:57
@@ -154,15 +153,14 @@ msgstr "软盘"
 #. Tag: para
 #: installation-howto.xml:93
 #, no-c-format
-#| msgid ""
-#| "If you can't boot from CD, you can download floppy images to install "
-#| "Debian. You need the <filename>floppy/boot.img</filename>, the "
-#| "<filename>floppy/root.img</filename> and one or more of the driver disks."
 msgid ""
 "If you can't boot from CD, you can download floppy images to install "
 "&debian;. You need the <filename>floppy/boot.img</filename>, the "
 "<filename>floppy/root.img</filename> and one or more of the driver disks."
-msgstr "如果无法从 CD 启动，可以下载软盘映像文件，来安装 &debian;。这时，您需要 <filename>floppy/boot.img</filename> 和 <filename>floppy/root.img</filename>，也许还要一个或多个驱动盘。"
+msgstr ""
+"如果无法从 CD 启动，可以下载软盘映像文件，来安装 &debian;。这时，您需要 "
+"<filename>floppy/boot.img</filename> 和 <filename>floppy/root.img</"
+"filename>，也许还要一个或多个驱动盘。"
 
 #. Tag: para
 #: installation-howto.xml:99
@@ -226,28 +224,17 @@ msgstr "U 盘"
 #. Tag: para
 #: installation-howto.xml:132
 #, no-c-format
-#| msgid ""
-#| "It's also possible to install from removable USB storage devices. For "
-#| "example a USB keychain can make a handy Debian install medium that you "
-#| "can take with you anywhere."
 msgid ""
 "It's also possible to install from removable USB storage devices. For "
 "example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
-msgstr "我们也可以从移动 USB 存储设备来安装系统。比如说您带着一个 USB 的钥匙链走遍天涯海角的同时，它还可以成为方便趁手的 &debian; 安装介质。"
+msgstr ""
+"我们也可以从移动 USB 存储设备来安装系统。比如说您带着一个 USB 的钥匙链走遍天"
+"涯海角的同时，它还可以成为方便趁手的 &debian; 安装介质。"
 
 #. Tag: para
 #: installation-howto.xml:138
 #, no-c-format
-#| msgid ""
-#| "The easiest way to prepare your USB memory stick is to download "
-#| "<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the "
-#| "256 MB image from that file. Write this image directly to your memory "
-#| "stick, which must be at least 256 mb in size. Of course this will destroy "
-#| "anything already on the memory stick. Then mount the memory stick, which "
-#| "will now have a FAT filesystem on it. Next, download a Debian netinst CD "
-#| "image, and copy that file to the memory stick; any filename is ok as long "
-#| "as it ends in <literal>.iso</literal>."
 msgid ""
 "The easiest way to prepare your USB memory stick is to download <filename>hd-"
 "media/boot.img.gz</filename>, and use gunzip to extract the 256 MB image "
@@ -257,7 +244,14 @@ msgid ""
 "filesystem on it. Next, download a &debian; netinst CD image, and copy that "
 "file to the memory stick; any filename is ok as long as it ends in <literal>."
 "iso</literal>."
-msgstr "要把您的 U 盘做成安装盘，最简单的办法就是下载 <filename>hd-media/boot.img.gz</filename>，然后用 gunzip 把这个文件解压，生成 256 MB 的映像文件。再把生成的映像文件直接写到 U盘。对了，这个 U 盘的容量至少要有 256 mb。当然了，上面所说的操作会把 U 盘里的原有数据全部毁掉。以后再挂载这个 U 盘的话，它上面就不再是 FAT 文件系统了。写完 U 盘后，接着要下载一个 &debian; netinst CD 映像文件，再把这个映像复制到 U 盘里。哪个映像文件都可以用，只要它的文件名是 <literal>.iso</literal> 结尾的就行。"
+msgstr ""
+"要把您的 U 盘做成安装盘，最简单的办法就是下载 <filename>hd-media/boot.img."
+"gz</filename>，然后用 gunzip 把这个文件解压，生成 256 MB 的映像文件。再把生成"
+"的映像文件直接写到 U盘。对了，这个 U 盘的容量至少要有 256 mb。当然了，上面所"
+"说的操作会把 U 盘里的原有数据全部毁掉。以后再挂载这个 U 盘的话，它上面就不再"
+"是 FAT 文件系统了。写完 U 盘后，接着要下载一个 &debian; netinst CD 映像文件，"
+"再把这个映像复制到 U 盘里。哪个映像文件都可以用，只要它的文件名是 <literal>."
+"iso</literal> 结尾的就行。"
 
 #. Tag: para
 #: installation-howto.xml:149
@@ -339,15 +333,6 @@ msgstr "从硬盘启动"
 #. Tag: para
 #: installation-howto.xml:193
 #, no-c-format
-#| msgid ""
-#| "It's possible to boot the installer using no removable media, but just an "
-#| "existing hard disk, which can have a different OS on it. Download "
-#| "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-#| "filename>, and a Debian CD image to the top-level directory of the hard "
-#| "disk. Make sure that the CD image has a filename ending in <literal>.iso</"
-#| "literal>. Now it's just a matter of booting linux with the initrd. "
-#| "<phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to "
-#| "do it. </phrase>"
 msgid ""
 "It's possible to boot the installer using no removable media, but just an "
 "existing hard disk, which can have a different OS on it. Download "
@@ -357,7 +342,13 @@ msgid ""
 "literal>. Now it's just a matter of booting linux with the initrd. <phrase "
 "arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to do it. </"
 "phrase>"
-msgstr "除了从移动介质启动安装套件，其实从手中现有的安装了其它操作系統的硬盘启动也是可行的。把 <filename>hd-media/initrd.gz</filename>、<filename>hd-media/vmlinuz</filename> 和一个 &debian; CD 映像文件下载到硬盘最顶层的目录里。请确保这个 CD 映像文件的文件名是以 <literal>.iso</literal> 结尾的。接下来的问题就是用 initrd 启动 linux 了。<phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> 说明了如何做这件事。</phrase>"
+msgstr ""
+"除了从移动介质启动安装套件，其实从手中现有的安装了其它操作系統的硬盘启动也是"
+"可行的。把 <filename>hd-media/initrd.gz</filename>、<filename>hd-media/"
+"vmlinuz</filename> 和一个 &debian; CD 映像文件下载到硬盘最顶层的目录里。请确"
+"保这个 CD 映像文件的文件名是以 <literal>.iso</literal> 结尾的。接下来的问题就"
+"是用 initrd 启动 linux 了。<phrase arch=\"x86\"> <xref linkend=\"boot-initrd"
+"\"/> 说明了如何做这件事。</phrase>"
 
 #. Tag: title
 #: installation-howto.xml:210
@@ -453,19 +444,16 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:256
 #, no-c-format
-#| msgid ""
-#| "If you have an existing DOS or Windows partition that you want to "
-#| "preserve, be very careful with automatic partitioning. If you choose "
-#| "manual partitioning, you can use the installer to resize existing FAT or "
-#| "NTFS partitions to create room for the Debian install: simply select the "
-#| "partition and specify its new size."
 msgid ""
 "If you have an existing DOS or Windows partition that you want to preserve, "
 "be very careful with automatic partitioning. If you choose manual "
 "partitioning, you can use the installer to resize existing FAT or NTFS "
 "partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
-msgstr "如果您有一个 DOS 或 Windows 分区并想保留它，要小心使用自动分区。如果选择手动分区，可以使用安装程序重新设置 FAT 或 NTFS 分区的大小，分给 &debian; 更多的安装空间：只需选择该分区，并指定它的新尺寸。"
+msgstr ""
+"如果您有一个 DOS 或 Windows 分区并想保留它，要小心使用自动分区。如果选择手动"
+"分区，可以使用安装程序重新设置 FAT 或 NTFS 分区的大小，分给 &debian; 更多的安"
+"装空间：只需选择该分区，并指定它的新尺寸。"
 
 #. Tag: para
 #: installation-howto.xml:263
@@ -613,10 +601,9 @@ msgstr "末了&hellip;"
 #. Tag: para
 #: installation-howto.xml:350
 #, no-c-format
-#| msgid ""
-#| "We hope that your Debian installation is pleasant and that you find "
-#| "Debian useful. You might want to read <xref linkend=\"post-install\"/>."
 msgid ""
 "We hope that your &debian; installation is pleasant and that you find "
 "&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
-msgstr "我们祝愿您安装 &debian 顺利愉快，并希望您能发现 &debian; 的用武之地。还有您也许可以读一下 <xref linkend=\"post-install\"/>。"
+msgstr ""
+"我们祝愿您安装 &debian 顺利愉快，并希望您能发现 &debian; 的用武之地。还有您也"
+"许可以读一下 <xref linkend=\"post-install\"/>。"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index a4e768467..1800f794c 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -15,14 +15,12 @@ msgstr ""
 #. Tag: title
 #: partitioning.xml:5
 #, no-c-format
-#| msgid "Partitioning for Debian"
 msgid "Partitioning for &debian;"
 msgstr "为 &debian; 准备分区"
 
 #. Tag: title
 #: partitioning.xml:13
 #, no-c-format
-#| msgid "Deciding on Debian Partitions and Sizes"
 msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "决定 &debian; 分区以及大小"
 
@@ -111,13 +109,6 @@ msgstr "目录树"
 #. Tag: para
 #: partitioning.xml:68
 #, no-c-format
-#| msgid ""
-#| "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
-#| "Hierarchy Standard</ulink> for directory and file naming. This standard "
-#| "allows users and software programs to predict the location of files and "
-#| "directories. The root level directory is represented simply by the slash "
-#| "<filename>/</filename>. At the root level, all Debian systems include "
-#| "these directories:"
 msgid ""
 "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
 "Hierarchy Standard</ulink> for directory and file naming. This standard "
@@ -125,7 +116,11 @@ msgid ""
 "directories. The root level directory is represented simply by the slash "
 "<filename>/</filename>. At the root level, all &debian; systems include "
 "these directories:"
-msgstr "&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知文件以及目录的位置。根目录只是简单表现为 <filename>/</filename>。在根层次，所有的 &debian; 系统包括这些目录："
+msgstr ""
+"&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem "
+"Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知"
+"文件以及目录的位置。根目录只是简单表现为 <filename>/</filename>。在根层次，所"
+"有的 &debian; 系统包括这些目录："
 
 #. Tag: entry
 #: partitioning.xml:82
@@ -391,19 +386,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:174
 #, no-c-format
-#| msgid ""
-#| "<filename>/var</filename>: variable data like news articles, e-mails, web "
-#| "sites, databases, the packaging system cache, etc. will be placed under "
-#| "this directory. The size of this directory depends greatly on the usage "
-#| "of your system, but for most people will be dictated by the package "
-#| "management tool's overhead. If you are going to do a full installation of "
-#| "just about everything Debian has to offer, all in one session, setting "
-#| "aside 2 or 3 GB of space for <filename>/var</filename> should be "
-#| "sufficient. If you are going to install in pieces (that is to say, "
-#| "install services and utilities, followed by text stuff, then X, ...), you "
-#| "can get away with 300&ndash;500 MB. If hard drive space is at a premium "
-#| "and you don't plan on doing major system updates, you can get by with as "
-#| "little as 30 or 40 MB."
 msgid ""
 "<filename>/var</filename>: variable data like news articles, e-mails, web "
 "sites, databases, the packaging system cache, etc. will be placed under this "
@@ -416,7 +398,14 @@ msgid ""
 "followed by text stuff, then X, ...), you can get away with 300&ndash;500 "
 "MB. If hard drive space is at a premium and you don't plan on doing major "
 "system updates, you can get by with as little as 30 or 40 MB."
-msgstr "<filename>/var</filename>：所有的可变数据，如新闻组文章、电子邮件、网站、数据库、软件包系统的缓存等等，将被放入这个目录。这个目录的大小取决于您计算机的用途，但是对大多数人来说，将主要用于软件包系统的管理工具。如果您准备一次性地做一个全面的安装，包含 &debian; 提供的所有程序，<filename>/var</filename> 下面 2 或 3GB 的空间应该够用。如果您准备逐个安装(也就是说，安装服务程序和工具，然后是文本处理工具，然后是 X，...)，您准备 300&ndash;500 MB 就行。要是硬盘空间很紧张，并且不准备做主版本的系统升级，可以为其准备 30 或 40MB 大小。"
+msgstr ""
+"<filename>/var</filename>：所有的可变数据，如新闻组文章、电子邮件、网站、数据"
+"库、软件包系统的缓存等等，将被放入这个目录。这个目录的大小取决于您计算机的用"
+"途，但是对大多数人来说，将主要用于软件包系统的管理工具。如果您准备一次性地做"
+"一个全面的安装，包含 &debian; 提供的所有程序，<filename>/var</filename> 下面 "
+"2 或 3GB 的空间应该够用。如果您准备逐个安装(也就是说，安装服务程序和工具，然"
+"后是文本处理工具，然后是 X，...)，您准备 300&ndash;500 MB 就行。要是硬盘空间"
+"很紧张，并且不准备做主版本的系统升级，可以为其准备 30 或 40MB 大小。"
 
 #. Tag: para
 #: partitioning.xml:190
@@ -460,13 +449,6 @@ msgstr "推荐的分区方案"
 #. Tag: para
 #: partitioning.xml:223
 #, no-c-format
-#| msgid ""
-#| "For new users, personal Debian boxes, home systems, and other single-user "
-#| "setups, a single <filename>/</filename> partition (plus swap) is probably "
-#| "the easiest, simplest way to go. However, if your partition is larger "
-#| "than around 6GB, choose ext3 as your partition type. Ext2 partitions need "
-#| "periodic file system integrity checking, and this can cause delays during "
-#| "booting when the partition is large."
 msgid ""
 "For new users, personal &debian; boxes, home systems, and other single-user "
 "setups, a single <filename>/</filename> partition (plus swap) is probably "
@@ -474,7 +456,11 @@ msgid ""
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
 "periodic file system integrity checking, and this can cause delays during "
 "booting when the partition is large."
-msgstr "对于新用户，个人 &debian; 系统、家庭系统以及其它单用户配置来说，一个单一 <filename>/</filename> 分区(加上交换分区)可能是最容易的方案。但是如果您的分区大于6GB，请选择 ext3 作为您的分区类型。ext2 分区需要定期的系统完整性检查，当分区很大的时候，这将导致引导期间的延迟。"
+msgstr ""
+"对于新用户，个人 &debian; 系统、家庭系统以及其它单用户配置来说，一个单一 "
+"<filename>/</filename> 分区(加上交换分区)可能是最容易的方案。但是如果您的分区"
+"大于6GB，请选择 ext3 作为您的分区类型。ext2 分区需要定期的系统完整性检查，当"
+"分区很大的时候，这将导致引导期间的延迟。"
 
 #. Tag: para
 #: partitioning.xml:232
@@ -492,16 +478,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:240
 #, no-c-format
-#| msgid ""
-#| "You might need a separate <filename>/usr/local</filename> partition if "
-#| "you plan to install many programs that are not part of the Debian "
-#| "distribution. If your machine will be a mail server, you might need to "
-#| "make <filename>/var/mail</filename> a separate partition. Often, putting "
-#| "<filename>/tmp</filename> on its own partition, for instance "
-#| "20&ndash;50MB, is a good idea. If you are setting up a server with lots "
-#| "of user accounts, it's generally good to have a separate, large "
-#| "<filename>/home</filename> partition. In general, the partitioning "
-#| "situation varies from computer to computer depending on its uses."
 msgid ""
 "You might need a separate <filename>/usr/local</filename> partition if you "
 "plan to install many programs that are not part of the &debian; "
@@ -512,7 +488,13 @@ msgid ""
 "it's generally good to have a separate, large <filename>/home</filename> "
 "partition. In general, the partitioning situation varies from computer to "
 "computer depending on its uses."
-msgstr "如果您计划安装 &debian; 发布版以外的程序，也许需要一个独立的 <filename>/usr/local</filename> 分区。如果您的机器是一个邮件服务器，也许需要为 <filename>/var/mail</filename> 建立一个独立的分区。通常情况下，将 <filename>/tmp</filename> 放在它自己独立的分区，比如 20&ndash;50MB 是一个好主意。如果您要创建一个有很多用户的服务器，一个独立的、大的 <filename>/home</filename> 分区比较好。一般来说，分区状况在每台计算机都不同，这取决于它们的用途。"
+msgstr ""
+"如果您计划安装 &debian; 发布版以外的程序，也许需要一个独立的 <filename>/usr/"
+"local</filename> 分区。如果您的机器是一个邮件服务器，也许需要为 <filename>/"
+"var/mail</filename> 建立一个独立的分区。通常情况下，将 <filename>/tmp</"
+"filename> 放在它自己独立的分区，比如 20&ndash;50MB 是一个好主意。如果您要创建"
+"一个有很多用户的服务器，一个独立的、大的 <filename>/home</filename> 分区比较"
+"好。一般来说，分区状况在每台计算机都不同，这取决于它们的用途。"
 
 #. Tag: para
 #: partitioning.xml:252
@@ -778,24 +760,20 @@ msgstr ""
 #. Tag: title
 #: partitioning.xml:435
 #, no-c-format
-#| msgid "Debian Partitioning Programs"
 msgid "&debian; Partitioning Programs"
 msgstr "&debian; 分区程序"
 
 #. Tag: para
 #: partitioning.xml:436
 #, no-c-format
-#| msgid ""
-#| "Several varieties of partitioning programs have been adapted by Debian "
-#| "developers to work on various types of hard disks and computer "
-#| "architectures. Following is a list of the program(s) applicable for your "
-#| "architecture."
 msgid ""
 "Several varieties of partitioning programs have been adapted by &debian; "
 "developers to work on various types of hard disks and computer "
 "architectures. Following is a list of the program(s) applicable for your "
 "architecture."
-msgstr "&debian; 开发人员选用了几种在不同硬盘和不同体系结构上的分区程序。下面是一个适合您的体系的程序列表。"
+msgstr ""
+"&debian; 开发人员选用了几种在不同硬盘和不同体系结构上的分区程序。下面是一个适"
+"合您的体系的程序列表。"
 
 #. Tag: command
 #: partitioning.xml:448
@@ -806,17 +784,15 @@ msgstr "partman"
 #. Tag: para
 #: partitioning.xml:449
 #, no-c-format
-#| msgid ""
-#| "Recommended partitioning tool in Debian. This Swiss army knife can also "
-#| "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
-#| "(<quote>format</quote> in Windows speak)</phrase> and assign them to the "
-#| "mountpoints."
 msgid ""
 "Recommended partitioning tool in &debian;. This Swiss army knife can also "
 "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
 "(<quote>format</quote> in Windows speak)</phrase> and assign them to the "
 "mountpoints."
-msgstr "推荐的 &debian; 分区工具。这把瑞士军刀可以修改分区大小，创建文件系统<phrase arch=\"any-x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分区至挂接点。"
+msgstr ""
+"推荐的 &debian; 分区工具。这把瑞士军刀可以修改分区大小，创建文件系统<phrase "
+"arch=\"any-x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分"
+"区至挂接点。"
 
 #. Tag: command
 #: partitioning.xml:460
@@ -1011,14 +987,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:591
 #, no-c-format
-#| msgid ""
-#| "If you have an existing other operating system such as DOS or Windows and "
-#| "you want to preserve that operating system while installing Debian, you "
-#| "may need to resize its partition to free up space for the Debian "
-#| "installation. The installer supports resizing of both FAT and NTFS "
-#| "filesystems; when you get to the installer's partitioning step, select "
-#| "the option <guimenuitem>Manual</guimenuitem> and then simply select an "
-#| "existing partition and change its size."
 msgid ""
 "If you have an existing other operating system such as DOS or Windows and "
 "you want to preserve that operating system while installing &debian;, you "
@@ -1027,7 +995,11 @@ msgid ""
 "filesystems; when you get to the installer's partitioning step, select the "
 "option <guimenuitem>Manual</guimenuitem> and then simply select an existing "
 "partition and change its size."
-msgstr "如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 &debian; 时保留它们，应该重新设置分区大小，释放空间给 &debian; 安装程序。安装程序支持修改 FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 <guimenuitem>Manual</guimenuitem> 选项，然后只需选择已有的分区，更改其尺寸。"
+msgstr ""
+"如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 &debian; 时保"
+"留它们，应该重新设置分区大小，释放空间给 &debian; 安装程序。安装程序支持修改 "
+"FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 "
+"<guimenuitem>Manual</guimenuitem> 选项，然后只需选择已有的分区，更改其尺寸。"
 
 #. Tag: para
 #: partitioning.xml:601
@@ -1100,18 +1072,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:641
 #, no-c-format
-#| msgid ""
-#| "This restriction doesn't apply if you have a BIOS newer than around "
-#| "1995&ndash;98 (depending on the manufacturer) that supports the "
-#| "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-#| "Linux loader, and Debian's alternative <command>mbr</command> must use "
-#| "the BIOS to read the kernel from the disk into RAM. If the BIOS int 0x13 "
-#| "large disk access extensions are found to be present, they will be "
-#| "utilized. Otherwise, the legacy disk access interface is used as a fall-"
-#| "back, and it cannot be used to address any location on the disk higher "
-#| "than the 1023rd cylinder. Once &arch-kernel; is booted, no matter what "
-#| "BIOS your computer has, these restrictions no longer apply, since &arch-"
-#| "kernel; does not use the BIOS for disk access."
 msgid ""
 "This restriction doesn't apply if you have a BIOS newer than around "
 "1995&ndash;98 (depending on the manufacturer) that supports the "
@@ -1124,7 +1084,14 @@ msgid ""
 "cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer "
 "has, these restrictions no longer apply, since &arch-kernel; does not use "
 "the BIOS for disk access."
-msgstr "如果您的 BIOS 在 1995&ndash;98 年之后出现(取决于制造商)，并且支持 <quote>Enhanced Disk Drive Support Specification</quote>，就没有这个限制。Linux 的引导程序 Lilo 和 &debian; 的 <command>mbr</command> 都必须使用 BIOS 来从磁盘读取内核至内存。如果 BIOS int 0x13 大硬盘访问拓展被打开，则将被使用。否则会使用旧的传统磁盘访问接口，而且不能找到任何大于 1023 的柱面。一旦 &arch-kernel; 引导后，不管您的计算机 BIOS 是什么，这些限制都不再起任何作用，因为 &arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
+msgstr ""
+"如果您的 BIOS 在 1995&ndash;98 年之后出现(取决于制造商)，并且支持 "
+"<quote>Enhanced Disk Drive Support Specification</quote>，就没有这个限制。"
+"Linux 的引导程序 Lilo 和 &debian; 的 <command>mbr</command> 都必须使用 BIOS "
+"来从磁盘读取内核至内存。如果 BIOS int 0x13 大硬盘访问拓展被打开，则将被使用。"
+"否则会使用旧的传统磁盘访问接口，而且不能找到任何大于 1023 的柱面。一旦 &arch-"
+"kernel; 引导后，不管您的计算机 BIOS 是什么，这些限制都不再起任何作用，因为 "
+"&arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
 
 #. Tag: para
 #: partitioning.xml:655
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index ec08ee56a..dbf169f6d 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -85,15 +85,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:55
 #, no-c-format
-#| msgid ""
-#| "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
-#| "Documentation Project (LDP)</ulink> collects a number of HOWTOs and "
-#| "online books relating to Linux. Most of these documents can be installed "
-#| "locally; just install the <classname>doc-linux-html</classname> package "
-#| "(HTML versions) or the <classname>doc-linux-text</classname> package "
-#| "(ASCII versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
-#| "International versions of the LDP HOWTOs are also available as Debian "
-#| "packages."
 msgid ""
 "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
 "Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
@@ -103,25 +94,23 @@ msgid ""
 "versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
 "International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
-msgstr "Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</ulink> 收集了大量的 HOWTO 和 Linux 在线书籍。这些文档绝大部分可以在本地安装；只须安装 <classname>doc-linux-html</classname> 包(HTML 版本)，或者 <classname>doc-linux-text</classname>包(ASCII 版本)，然后在 <filename>/usr/share/doc/HOWTO</filename> 里面就能找到。在 &debian; 软件包里面也提供 LDP HOWTO 的国际化版本。"
+msgstr ""
+"Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</"
+"ulink> 收集了大量的 HOWTO 和 Linux 在线书籍。这些文档绝大部分可以在本地安装；"
+"只须安装 <classname>doc-linux-html</classname> 包(HTML 版本)，或者 "
+"<classname>doc-linux-text</classname>包(ASCII 版本)，然后在 <filename>/usr/"
+"share/doc/HOWTO</filename> 里面就能找到。在 &debian; 软件包里面也提供 LDP "
+"HOWTO 的国际化版本。"
 
 #. Tag: title
 #: post-install.xml:76
 #, no-c-format
-#| msgid "Orienting Yourself to Debian"
 msgid "Orienting Yourself to &debian;"
 msgstr "让自己适应 &debian;"
 
 #. Tag: para
 #: post-install.xml:77
 #, no-c-format
-#| msgid ""
-#| "Debian is a little different from other distributions. Even if you're "
-#| "familiar with Linux in other distributions, there are things you should "
-#| "know about Debian to help you to keep your system in a good, clean state. "
-#| "This chapter contains material to help you get oriented; it is not "
-#| "intended to be a tutorial for how to use Debian, but just a very brief "
-#| "glimpse of the system for the very rushed."
 msgid ""
 "&debian; is a little different from other distributions. Even if you're "
 "familiar with Linux in other distributions, there are things you should know "
@@ -129,33 +118,21 @@ msgid ""
 "chapter contains material to help you get oriented; it is not intended to be "
 "a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
-msgstr "&debian; 和其它的发行版有些不同。即使您熟悉其它发行版的 Linux，您也应该了解 &debian; 的一些东西，以便保持您的系统处在良好整洁的状态。本章包的材料可以帮助您适应；但这并不是一个如何使用 &debian; 的入门指南，而仅仅是对整个系统的一个粗略的介绍。"
+msgstr ""
+"&debian; 和其它的发行版有些不同。即使您熟悉其它发行版的 Linux，您也应该了解 "
+"&debian; 的一些东西，以便保持您的系统处在良好整洁的状态。本章包的材料可以帮助"
+"您适应；但这并不是一个如何使用 &debian; 的入门指南，而仅仅是对整个系统的一个"
+"粗略的介绍。"
 
 #. Tag: title
 #: post-install.xml:88
 #, no-c-format
-#| msgid "Debian Packaging System"
 msgid "&debian; Packaging System"
 msgstr "&debian; 软件包系统"
 
 #. Tag: para
 #: post-install.xml:89
 #, no-c-format
-#| msgid ""
-#| "The most important concept to grasp is the Debian packaging system. In "
-#| "essence, large parts of your system should be considered under the "
-#| "control of the packaging system. These include: <itemizedlist> "
-#| "<listitem><para> <filename>/usr</filename> (excluding <filename>/usr/"
-#| "local</filename>) </para></listitem> <listitem><para> <filename>/var</"
-#| "filename> (you could make <filename>/var/local</filename> and be safe in "
-#| "there) </para></listitem> <listitem><para> <filename>/bin</filename> </"
-#| "para></listitem> <listitem><para> <filename>/sbin</filename> </para></"
-#| "listitem> <listitem><para> <filename>/lib</filename> </para></listitem> </"
-#| "itemizedlist> For instance, if you replace <filename>/usr/bin/perl</"
-#| "filename>, that will work, but then if you upgrade your <classname>perl</"
-#| "classname> package, the file you put there will be replaced. Experts can "
-#| "get around this by putting packages on <quote>hold</quote> in "
-#| "<command>aptitude</command>."
 msgid ""
 "The most important concept to grasp is the &debian; packaging system. In "
 "essence, large parts of your system should be considered under the control "
@@ -171,7 +148,18 @@ msgid ""
 "classname> package, the file you put there will be replaced. Experts can get "
 "around this by putting packages on <quote>hold</quote> in <command>aptitude</"
 "command>."
-msgstr "要掌握的最重要概念是 &debian; 的软件包系统。事实上，您系统的绝大部分都应该由软件包系统来控制。包括：<itemizedlist> <listitem><para> <filename>/usr</filename> (除了 <filename>/usr/local</filename>) </para></listitem> <listitem><para> <filename>/var</filename> (您可以创建 <filename>/var/local</filename>，在那里面进行安全的操作) </para></listitem> <listitem><para> <filename>/bin</filename> </para></listitem> <listitem><para> <filename>/sbin</filename> </para></listitem> <listitem><para> <filename>/lib</filename> </para></listitem> </itemizedlist> 例如，假设您替换了 <filename>/usr/bin/perl</filename>，它可以正常工作，但以后升级您的 <classname>perl</classname> 软件包，那里的文件将被替换。有经验的用户可以在 <command>aptitude</command> 里面将软件包设置为 <quote>hold</quote>状态，以避免这种情况。"
+msgstr ""
+"要掌握的最重要概念是 &debian; 的软件包系统。事实上，您系统的绝大部分都应该由"
+"软件包系统来控制。包括：<itemizedlist> <listitem><para> <filename>/usr</"
+"filename> (除了 <filename>/usr/local</filename>) </para></listitem> "
+"<listitem><para> <filename>/var</filename> (您可以创建 <filename>/var/local</"
+"filename>，在那里面进行安全的操作) </para></listitem> <listitem><para> "
+"<filename>/bin</filename> </para></listitem> <listitem><para> <filename>/"
+"sbin</filename> </para></listitem> <listitem><para> <filename>/lib</"
+"filename> </para></listitem> </itemizedlist> 例如，假设您替换了 <filename>/"
+"usr/bin/perl</filename>，它可以正常工作，但以后升级您的 <classname>perl</"
+"classname> 软件包，那里的文件将被替换。有经验的用户可以在 <command>aptitude</"
+"command> 里面将软件包设置为 <quote>hold</quote>状态，以避免这种情况。"
 
 #. Tag: para
 #: post-install.xml:130
@@ -277,14 +265,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:193
 #, no-c-format
-#| msgid ""
-#| "There is lots of useful documentation in <filename>/usr/share/doc</"
-#| "filename> as well. In particular, <filename>/usr/share/doc/HOWTO</"
-#| "filename> and <filename>/usr/share/doc/FAQ</filename> contain lots of "
-#| "interesting information. To submit bugs, look at <filename>/usr/share/doc/"
-#| "debian/bug*</filename>. To read about Debian-specific issues for "
-#| "particular programs, look at <filename>/usr/share/doc/(package name)/"
-#| "README.Debian</filename>."
 msgid ""
 "There is lots of useful documentation in <filename>/usr/share/doc</filename> "
 "as well. In particular, <filename>/usr/share/doc/HOWTO</filename> and "
@@ -292,24 +272,17 @@ msgid ""
 "information. To submit bugs, look at <filename>/usr/share/doc/debian/bug*</"
 "filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
-msgstr "在 <filename>/usr/share/doc</filename> 目录里有很多有用的文档，特别是 <filename>/usr/share/doc/HOWTO</filename> 和 <filename>/usr/share/doc/FAQ</filename> 里有很多值得一读的文章。如果您想提交错误报告，请先查阅这些文件：<filename>/usr/share/doc/debian/bug*</filename>。针对某个程序 &debian; 规格的内容可以查阅文件： <filename>/usr/share/doc/(package name)/README.Debian</filename>。"
+msgstr ""
+"在 <filename>/usr/share/doc</filename> 目录里有很多有用的文档，特别是 "
+"<filename>/usr/share/doc/HOWTO</filename> 和 <filename>/usr/share/doc/FAQ</"
+"filename> 里有很多值得一读的文章。如果您想提交错误报告，请先查阅这些文件："
+"<filename>/usr/share/doc/debian/bug*</filename>。针对某个程序 &debian; 规格的"
+"内容可以查阅文件： <filename>/usr/share/doc/(package name)/README.Debian</"
+"filename>。"
 
 #. Tag: para
 #: post-install.xml:204
 #, no-c-format
-#| msgid ""
-#| "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> "
-#| "contains a large quantity of documentation about Debian. In particular, "
-#| "see the <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux "
-#| "FAQ</ulink> and the <ulink url=\"http://www.debian.org/doc/user-"
-#| "manuals#quick-reference\">Debian Reference</ulink>. An index of more "
-#| "Debian documentation is available from the <ulink url=\"http://www.debian."
-#| "org/doc/ddp\">Debian Documentation Project</ulink>. The Debian community "
-#| "is self-supporting; to subscribe to one or more of the Debian mailing "
-#| "lists, see the <ulink url=\"http://www.debian.org/MailingLists/subscribe"
-#| "\"> Mail List Subscription</ulink> page. Last, but not least, the <ulink "
-#| "url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> "
-#| "contain a wealth of information on Debian."
 msgid ""
 "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
 "large quantity of documentation about &debian;. In particular, see the "
@@ -323,7 +296,17 @@ msgid ""
 "ulink> page. Last, but not least, the <ulink url=\"http://lists.debian.org/"
 "\">Debian Mailing List Archives</ulink> contain a wealth of information on "
 "&debian;."
-msgstr "在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 &debian; 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> 和 <ulink url=\"http://www.debian.org/doc/user-manuals#quick-reference\">Debian Reference</ulink>。更多的 &debian; 文档位于 <ulink url=\"http://www.debian.org/doc/ddp\">Debian Documentation Project</ulink>。&debian; 社区是靠用户自己的力量支撑起来的；如果您想要订阅 Debian 的邮件列表，请访问 <ulink url=\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</ulink> 页面。最后，相当重要的，<ulink url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> 包含了 &debian; 丰富的信息。"
+msgstr ""
+"在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 "
+"&debian; 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/"
+"\">Debian GNU/Linux FAQ</ulink> 和 <ulink url=\"http://www.debian.org/doc/"
+"user-manuals#quick-reference\">Debian Reference</ulink>。更多的 &debian; 文档"
+"位于 <ulink url=\"http://www.debian.org/doc/ddp\">Debian Documentation "
+"Project</ulink>。&debian; 社区是靠用户自己的力量支撑起来的；如果您想要订阅 "
+"Debian 的邮件列表，请访问 <ulink url=\"http://www.debian.org/MailingLists/"
+"subscribe\"> Mail List Subscription</ulink> 页面。最后，相当重要的，<ulink "
+"url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> 包含了 "
+"&debian; 丰富的信息。"
 
 #. Tag: para
 #: post-install.xml:222
@@ -347,17 +330,14 @@ msgstr "让您的系统使用 E-Mail"
 #. Tag: para
 #: post-install.xml:239
 #, no-c-format
-#| msgid ""
-#| "Today, email is an important part of many people's life. As there are "
-#| "many options as to how to set it up, and as having it set up correctly is "
-#| "important for some Debian utilities, we will try to cover the basics in "
-#| "this section."
 msgid ""
 "Today, email is an important part of many people's life. As there are many "
 "options as to how to set it up, and as having it set up correctly is "
 "important for some &debian; utilities, we will try to cover the basics in "
 "this section."
-msgstr "今天，email 是许多人生活中一个重要的组成部分。建立它有很多种选择，并且对于很多 &debian; 工具如何设置正确非常重要，我们将在本节介绍一些基本的知识。"
+msgstr ""
+"今天，email 是许多人生活中一个重要的组成部分。建立它有很多种选择，并且对于很"
+"多 &debian; 工具如何设置正确非常重要，我们将在本节介绍一些基本的知识。"
 
 #. Tag: para
 #: post-install.xml:246
@@ -405,17 +385,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:269
 #, no-c-format
-#| msgid ""
-#| "With the increasing popularity of graphical desktop systems, the use of "
-#| "graphical e-mail programs like GNOME's <command>evolution</command>, "
-#| "KDE's <command>kmail</command> or Mozilla's <command>thunderbird</"
-#| "command> (in Debian available as <command>icedove</command><footnote> "
-#| "<para> The reason that <command>thunderbird</command> has been renamed to "
-#| "<command>icedove</command> in Debian has to do with licensing issues. "
-#| "Details are outside the scope of this manual. </para> </footnote>) is "
-#| "becoming more popular. These programs combine the function of a MUA, MTA "
-#| "and MDA, but can &mdash; and often are &mdash; also be used in "
-#| "combination with the traditional Linux tools."
 msgid ""
 "With the increasing popularity of graphical desktop systems, the use of "
 "graphical e-mail programs like GNOME's <command>evolution</command>, KDE's "
@@ -427,7 +396,14 @@ msgid ""
 "These programs combine the function of a MUA, MTA and MDA, but can &mdash; "
 "and often are &mdash; also be used in combination with the traditional Linux "
 "tools."
-msgstr "配合逐步流行的图形桌面系统，使用图形 e-mail 程序，像 GNOME 的 <command>evolution</command>、KDE 的 <command>kmail</command> 或 Mozilla 的 <command>thunderbird</command> (在 &debian; 中是 <command>icedove</command><footnote> <para> &debian; 中 <command>thunderbird</command> 改名为 <command>icedove</command> 的原因是许可证的问题。具体内容超出了本手册的范围。</para> </footnote>) 越来越流行。这些程序综合了 MUA、MTA 和 MDA 的功能，但也能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
+msgstr ""
+"配合逐步流行的图形桌面系统，使用图形 e-mail 程序，像 GNOME 的 "
+"<command>evolution</command>、KDE 的 <command>kmail</command> 或 Mozilla 的 "
+"<command>thunderbird</command> (在 &debian; 中是 <command>icedove</"
+"command><footnote> <para> &debian; 中 <command>thunderbird</command> 改名为 "
+"<command>icedove</command> 的原因是许可证的问题。具体内容超出了本手册的范围。"
+"</para> </footnote>) 越来越流行。这些程序综合了 MUA、MTA 和 MDA 的功能，但也"
+"能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
 
 #. Tag: title
 #: post-install.xml:289
@@ -498,15 +474,13 @@ msgstr "发送邮件到系统之外"
 #. Tag: para
 #: post-install.xml:335
 #, no-c-format
-#| msgid ""
-#| "As mentioned earlier, the installed Debian system is only set up to "
-#| "handle e-mail local to the system, not for sending mail to others nor for "
-#| "receiving mail from others."
 msgid ""
 "As mentioned earlier, the installed &debian; system is only set up to handle "
 "e-mail local to the system, not for sending mail to others nor for receiving "
 "mail from others."
-msgstr "前面提到，安装的 &debian; 系统只架设了处理本地系统的邮件，而不是用于发送或接收其他系统的邮件。"
+msgstr ""
+"前面提到，安装的 &debian; 系统只架设了处理本地系统的邮件，而不是用于发送或接"
+"收其他系统的邮件。"
 
 #. Tag: para
 #: post-install.xml:341
@@ -537,19 +511,16 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:356
 #, no-c-format
-#| msgid ""
-#| "However, in that case you may need to configure individual utilities to "
-#| "correctly send e-mails. One such utility is <command>reportbug</command>, "
-#| "a program that facilitates submitting bug reports against Debian "
-#| "packages. By default it expects to be able to use <classname>exim4</"
-#| "classname> to submit bug reports."
 msgid ""
 "However, in that case you may need to configure individual utilities to "
 "correctly send e-mails. One such utility is <command>reportbug</command>, a "
 "program that facilitates submitting bug reports against &debian; packages. "
 "By default it expects to be able to use <classname>exim4</classname> to "
 "submit bug reports."
-msgstr "但是，这种情况下您可能还是要配置一些独立的工具来正确发送 e-mails。其中一个这样的工具是 <command>reportbug</command>，该程序的功能是提交 &debian; 软件包对应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
+msgstr ""
+"但是，这种情况下您可能还是要配置一些独立的工具来正确发送 e-mails。其中一个这"
+"样的工具是 <command>reportbug</command>，该程序的功能是提交 &debian; 软件包对"
+"应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
 
 #. Tag: para
 #: post-install.xml:364
@@ -752,13 +723,6 @@ msgstr "编译新内核"
 #. Tag: para
 #: post-install.xml:501
 #, no-c-format
-#| msgid ""
-#| "Why would someone want to compile a new kernel? It is often not necessary "
-#| "since the default kernel shipped with Debian handles most configurations. "
-#| "Also, Debian often offers several alternative kernels. So you may want to "
-#| "check first if there is an alternative kernel image package that better "
-#| "corresponds to your hardware. However, it can be useful to compile a new "
-#| "kernel in order to:"
 msgid ""
 "Why would someone want to compile a new kernel? It is often not necessary "
 "since the default kernel shipped with &debian; handles most configurations. "
@@ -766,7 +730,11 @@ msgid ""
 "check first if there is an alternative kernel image package that better "
 "corresponds to your hardware. However, it can be useful to compile a new "
 "kernel in order to:"
-msgstr "为什么有些人想要编译新内核? &debian; 自带的默认内核已经包含了绝大部分配置，所以编译新内核并不是必需的。并且，&debian; 提供了多个内核供选择。所以您应该先确认一下，有没有适合您硬件的内核映像软件包存在。然而，基于下列理由，编译新内核还是很有用的："
+msgstr ""
+"为什么有些人想要编译新内核? &debian; 自带的默认内核已经包含了绝大部分配置，所"
+"以编译新内核并不是必需的。并且，&debian; 提供了多个内核供选择。所以您应该先确"
+"认一下，有没有适合您硬件的内核映像软件包存在。然而，基于下列理由，编译新内核"
+"还是很有用的："
 
 #. Tag: para
 #: post-install.xml:511
@@ -823,19 +791,17 @@ msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
 #. Tag: para
 #: post-install.xml:552
 #, no-c-format
-#| msgid ""
-#| "To compile a kernel the Debian way, you need some packages: "
-#| "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
-#| "<classname>linux-source-2.6</classname> and a few others which are "
-#| "probably already installed (see <filename>/usr/share/doc/kernel-package/"
-#| "README.gz</filename> for the complete list)."
 msgid ""
 "To compile a kernel the &debian; way, you need some packages: "
 "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
 "<classname>linux-source-2.6</classname> and a few others which are probably "
 "already installed (see <filename>/usr/share/doc/kernel-package/README.gz</"
 "filename> for the complete list)."
-msgstr "为了以 &debian; 的方式编译内核，您需要一些软件包： <classname>fakeroot</classname>，<classname>kernel-package</classname>，<classname>linux-source-2.6</classname> 以及其它一些可能已经安装过的软件包(完整的列表请参阅 <filename>/usr/share/doc/kernel-package/README.gz</filename>)。"
+msgstr ""
+"为了以 &debian; 的方式编译内核，您需要一些软件包： <classname>fakeroot</"
+"classname>，<classname>kernel-package</classname>，<classname>linux-"
+"source-2.6</classname> 以及其它一些可能已经安装过的软件包(完整的列表请参阅 "
+"<filename>/usr/share/doc/kernel-package/README.gz</filename>)。"
 
 #. Tag: para
 #: post-install.xml:561
@@ -853,13 +819,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:569
 #, no-c-format
-#| msgid ""
-#| "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
-#| "<quote>Debian way</quote>; but we find that using the packaging system to "
-#| "manage your kernel is actually safer and easier. In fact, you can get "
-#| "your kernel sources right from Linus instead of <classname>linux-"
-#| "source-2.6</classname>, yet still use the <classname>kernel-package</"
-#| "classname> compilation method."
 msgid ""
 "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
 "<quote>&debian; way</quote>; but we find that using the packaging system to "
@@ -867,7 +826,11 @@ msgid ""
 "kernel sources right from Linus instead of <classname>linux-source-2.6</"
 "classname>, yet still use the <classname>kernel-package</classname> "
 "compilation method."
-msgstr "注意，您不一定<emphasis>要</emphasis>以 <quote>&debian; 方式</quote>编译内核；但我们发现使用软件包系统来管理您的内核，确实可以更加安全和易用。事实上，您可以直接从 Linus 那里而非 <classname>linux-source-2.6</classname> 得到内核源码，并仍使用 <classname>kernel-package</classname> 的编译方法。"
+msgstr ""
+"注意，您不一定<emphasis>要</emphasis>以 <quote>&debian; 方式</quote>编译内"
+"核；但我们发现使用软件包系统来管理您的内核，确实可以更加安全和易用。事实上，"
+"您可以直接从 Linus 那里而非 <classname>linux-source-2.6</classname> 得到内核"
+"源码，并仍使用 <classname>kernel-package</classname> 的编译方法。"
 
 #. Tag: para
 #: post-install.xml:578
@@ -906,19 +869,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:605
 #, no-c-format
-#| msgid ""
-#| "Now, you can configure your kernel. Run <userinput>make xconfig</"
-#| "userinput> if X11 is installed, configured and being run; run "
-#| "<userinput>make menuconfig</userinput> otherwise (you'll need "
-#| "<classname>libncurses5-dev</classname> installed). Take the time to read "
-#| "the online help and choose carefully. When in doubt, it is typically "
-#| "better to include the device driver (the software which manages hardware "
-#| "peripherals, such as Ethernet cards, SCSI controllers, and so on) you are "
-#| "unsure about. Be careful: other options, not related to a specific "
-#| "hardware, should be left at the default value if you do not understand "
-#| "them. Do not forget to select <quote>Kernel module loader</quote> in "
-#| "<quote>Loadable module support</quote> (it is not selected by default). "
-#| "If not included, your Debian installation will experience problems."
 msgid ""
 "Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
 "if X11 is installed, configured and being run; run <userinput>make "
@@ -932,7 +882,15 @@ msgid ""
 "module loader</quote> in <quote>Loadable module support</quote> (it is not "
 "selected by default). If not included, your &debian; installation will "
 "experience problems."
-msgstr "现在，可以开始配置您的内核了。如果您已经安装配置好，并正在运行 X11，请执行 <userinput>make xconfig</userinput>；否则请执行 <userinput>make menuconfig</userinput>(必须已经安装好 <classname>libncurses5-dev</classname>)。请花点时间阅读在线帮助并仔细地作选择。如果有疑问，通常来说包含您所不确定的设备驱动程序(用来管理硬件外设的软件，例如以太网卡、SCSI 控制器等)会比较好一点。注意：对于与特殊硬件无关的其它选项，如果您不了解它们，最好保持默认值。不要忘记选择 <quote>Kernel module loader</quote> 中的 <quote>Loadable module support</quote> (它们默认并没有被选择)。否则，您的 &debian; 安装将会遇到问题。"
+msgstr ""
+"现在，可以开始配置您的内核了。如果您已经安装配置好，并正在运行 X11，请执行 "
+"<userinput>make xconfig</userinput>；否则请执行 <userinput>make menuconfig</"
+"userinput>(必须已经安装好 <classname>libncurses5-dev</classname>)。请花点时间"
+"阅读在线帮助并仔细地作选择。如果有疑问，通常来说包含您所不确定的设备驱动程序"
+"(用来管理硬件外设的软件，例如以太网卡、SCSI 控制器等)会比较好一点。注意：对于"
+"与特殊硬件无关的其它选项，如果您不了解它们，最好保持默认值。不要忘记选择 "
+"<quote>Kernel module loader</quote> 中的 <quote>Loadable module support</"
+"quote> (它们默认并没有被选择)。否则，您的 &debian; 安装将会遇到问题。"
 
 #. Tag: para
 #: post-install.xml:620
@@ -1004,18 +962,16 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:660
 #, no-c-format
-#| msgid ""
-#| "For more information on Debian kernels and kernel compilation, see the "
-#| "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</"
-#| "ulink>. For more information on <classname>kernel-package</classname>, "
-#| "read the fine documentation in <filename>/usr/share/doc/kernel-package</"
-#| "filename>."
 msgid ""
 "For more information on &debian; kernels and kernel compilation, see the "
 "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink>. "
 "For more information on <classname>kernel-package</classname>, read the fine "
 "documentation in <filename>/usr/share/doc/kernel-package</filename>."
-msgstr "要了解 &debian; 内核与编译内核的更多信息，清参阅 <ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink>。欲获得关于 <classname>kernel-package</classname> 的更多信息，有一份很好的文档 <filename>/usr/share/doc/kernel-package</filename>。"
+msgstr ""
+"要了解 &debian; 内核与编译内核的更多信息，清参阅 <ulink url=\"&url-kernel-"
+"handbook;\">Debian Linux Kernel Handbook</ulink>。欲获得关于 "
+"<classname>kernel-package</classname> 的更多信息，有一份很好的文档 "
+"<filename>/usr/share/doc/kernel-package</filename>。"
 
 #. Tag: title
 #: post-install.xml:676
@@ -1077,13 +1033,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:710
 #, no-c-format
-#| msgid ""
-#| "If possible, the installer will now present you with a shell prompt in "
-#| "the file system you selected, which you can use to perform any necessary "
-#| "repairs. <phrase arch=\"x86\"> For example, if you need to reinstall the "
-#| "GRUB boot loader into the master boot record of the first hard disk, you "
-#| "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
-#| "so. </phrase>"
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
 "file system you selected, which you can use to perform any necessary "
@@ -1091,7 +1040,11 @@ msgid ""
 "GRUB boot loader into the master boot record of the first hard disk, you "
 "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
 "so. </phrase>"
-msgstr "如可能，安装程序将在您选择的文件系统上给出一个 shell 提示符，通过它可以执行一些必要的修复操作。<phrase arch=\"x86\">例如，您需要在第一个硬盘的主引导区重装 GRUB 引导程序，可以通过输入这个命令 <userinput>grub-install '(hd0)'</userinput> 完成。</phrase>"
+msgstr ""
+"如可能，安装程序将在您选择的文件系统上给出一个 shell 提示符，通过它可以执行一"
+"些必要的修复操作。<phrase arch=\"x86\">例如，您需要在第一个硬盘的主引导区重"
+"装 GRUB 引导程序，可以通过输入这个命令 <userinput>grub-install '(hd0)'</"
+"userinput> 完成。</phrase>"
 
 #. Tag: para
 #: post-install.xml:722
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index ccdd4dc2e..91bcd8931 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -21,31 +21,21 @@ msgstr "在 &architecture; 上安装 &debian-gnu; &release;"
 #. Tag: para
 #: preface.xml:6
 #, no-c-format
-#| msgid ""
-#| "We are delighted that you have decided to try Debian, and are sure that "
-#| "you will find that Debian's GNU/&arch-kernel; distribution is unique. "
-#| "&debian-gnu; brings together high-quality free software from around the "
-#| "world, integrating it into a coherent whole. We believe that you will "
-#| "find that the result is truly more than the sum of the parts."
 msgid ""
 "We are delighted that you have decided to try &debian;, and are sure that "
 "you will find that &debian;'s GNU/&arch-kernel; distribution is unique. "
 "&debian-gnu; brings together high-quality free software from around the "
 "world, integrating it into a coherent whole. We believe that you will find "
 "that the result is truly more than the sum of the parts."
-msgstr "我们非常高兴地看到您决定试试 &debian;，并确信您将发现 &debian; 的 GNU/&arch-kernel; 发行版是独一无二的。&debian-gnu; 将带给您来自世界各地的高质量的自由软件，并将它们整合成一个紧密的整体。您会发现整合后的结果一定会大于将各部分简单地相加。"
+msgstr ""
+"我们非常高兴地看到您决定试试 &debian;，并确信您将发现 &debian; 的 GNU/&arch-"
+"kernel; 发行版是独一无二的。&debian-gnu; 将带给您来自世界各地的高质量的自由软"
+"件，并将它们整合成一个紧密的整体。您会发现整合后的结果一定会大于将各部分简单"
+"地相加。"
 
 #. Tag: para
 #: preface.xml:15
 #, no-c-format
-#| msgid ""
-#| "We understand that many of you want to install Debian without reading "
-#| "this manual, and the Debian installer is designed to make this possible. "
-#| "If you don't have time to read the whole Installation Guide right now, we "
-#| "recommend that you read the Installation Howto, which will walk you "
-#| "through the basic installation process, and links to the manual for more "
-#| "advanced topics or for when things go wrong. The Installation Howto can "
-#| "be found in <xref linkend=\"installation-howto\"/>."
 msgid ""
 "We understand that many of you want to install &debian; without reading this "
 "manual, and the &debian; installer is designed to make this possible. If you "
@@ -54,7 +44,12 @@ msgid ""
 "installation process, and links to the manual for more advanced topics or "
 "for when things go wrong. The Installation Howto can be found in <xref "
 "linkend=\"installation-howto\"/>."
-msgstr "我们也知道大多数用户都希望能够不用阅读本手册而直接安装 &debian;。&debian; 安装程序的设计意图也就是尽力实现这个想法。如果您现在的确没有时间来阅读整个安装手册，我们推荐您看看安装指南一文。该文包含了基本安装过程的简要介绍，以及当处理运行错误或需要较专业内容时查询本手册的链接。您可以在 <xref linkend=\"installation-howto\"/> 阅读此文。"
+msgstr ""
+"我们也知道大多数用户都希望能够不用阅读本手册而直接安装 &debian;。&debian; 安"
+"装程序的设计意图也就是尽力实现这个想法。如果您现在的确没有时间来阅读整个安装"
+"手册，我们推荐您看看安装指南一文。该文包含了基本安装过程的简要介绍，以及当处"
+"理运行错误或需要较专业内容时查询本手册的链接。您可以在 <xref linkend="
+"\"installation-howto\"/> 阅读此文。"
 
 #. Tag: para
 #: preface.xml:25
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 973844181..a462ddc82 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:40+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -21,15 +21,13 @@ msgstr "开始安装 &debian-gnu; 之前"
 #. Tag: para
 #: preparing.xml:6
 #, no-c-format
-#| msgid ""
-#| "This chapter deals with the preparation for installing Debian before you "
-#| "even boot the installer. This includes backing up your data, gathering "
-#| "information about your hardware, and locating any necessary information."
 msgid ""
 "This chapter deals with the preparation for installing &debian; before you "
 "even boot the installer. This includes backing up your data, gathering "
 "information about your hardware, and locating any necessary information."
-msgstr "本章涉及在启动安装程序安装 &debian; 之前的准备工作。这包括备份您的数据、搜集您硬件的信息，以及获取其他一些必要的信息。"
+msgstr ""
+"本章涉及在启动安装程序安装 &debian; 之前的准备工作。这包括备份您的数据、搜集"
+"您硬件的信息，以及获取其他一些必要的信息。"
 
 #. Tag: title
 #: preparing.xml:19
@@ -40,15 +38,13 @@ msgstr "安装概述"
 #. Tag: para
 #: preparing.xml:20
 #, no-c-format
-#| msgid ""
-#| "First, just a note about re-installations. With Debian, a circumstance "
-#| "that will require a complete re-installation of your system is very rare; "
-#| "perhaps mechanical failure of the hard disk would be the most common case."
 msgid ""
 "First, just a note about re-installations. With &debian;, a circumstance "
 "that will require a complete re-installation of your system is very rare; "
 "perhaps mechanical failure of the hard disk would be the most common case."
-msgstr "先说一下有关重新安装的事情。使用 &debian; 时，极少出现必须进行完全重新安装的情况，导致这种情况的可能大多是硬盘的物理故障。"
+msgstr ""
+"先说一下有关重新安装的事情。使用 &debian; 时，极少出现必须进行完全重新安装的"
+"情况，导致这种情况的可能大多是硬盘的物理故障。"
 
 #. Tag: para
 #: preparing.xml:27
@@ -66,17 +62,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:35
 #, no-c-format
-#| msgid ""
-#| "Under &debian-gnu;, it is much more likely that your OS can be repaired "
-#| "rather than replaced if things go wrong. Upgrades never require a "
-#| "wholesale installation; you can always upgrade in-place. And the programs "
-#| "are almost always compatible with successive OS releases. If a new "
-#| "program version requires newer supporting software, the Debian packaging "
-#| "system ensures that all the necessary software is automatically "
-#| "identified and installed. The point is, much effort has been put into "
-#| "avoiding the need for re-installation, so think of it as your very last "
-#| "option. The installer is <emphasis>not</emphasis> designed to re-install "
-#| "over an existing system."
 msgid ""
 "Under &debian-gnu;, it is much more likely that your OS can be repaired "
 "rather than replaced if things go wrong. Upgrades never require a wholesale "
@@ -87,7 +72,13 @@ msgid ""
 "The point is, much effort has been put into avoiding the need for re-"
 "installation, so think of it as your very last option. The installer is "
 "<emphasis>not</emphasis> designed to re-install over an existing system."
-msgstr "在 &debian-gnu; 里，如果操作系统遇到出错的情况，您大多时候都能把它修复而不用重新安装。升级不再需要进行大规模的安装操作，您可以就地升级它，而这些程序也总能和新版的操作系统和平共处。如果一个程序的新版本需要其他程序的更新版本来支持它，&debian; 软件包管理系统会自动帮您确定所有必须的软件，并把它们安装上。关键是，&debian; 为了避免重新安装而做了大量努力，所以您尽可以不用去烦心这些问题了。安装程序<emphasis>不是</emphasis>设计用来重装您的系统的。"
+msgstr ""
+"在 &debian-gnu; 里，如果操作系统遇到出错的情况，您大多时候都能把它修复而不用"
+"重新安装。升级不再需要进行大规模的安装操作，您可以就地升级它，而这些程序也总"
+"能和新版的操作系统和平共处。如果一个程序的新版本需要其他程序的更新版本来支持"
+"它，&debian; 软件包管理系统会自动帮您确定所有必须的软件，并把它们安装上。关键"
+"是，&debian; 为了避免重新安装而做了大量努力，所以您尽可以不用去烦心这些问题"
+"了。安装程序<emphasis>不是</emphasis>设计用来重装您的系统的。"
 
 #. Tag: para
 #: preparing.xml:48
@@ -116,31 +107,28 @@ msgstr "在开始整个安装过程之前，收集您的计算机的硬件信息
 #. Tag: para
 #: preparing.xml:68
 #, no-c-format
-#| msgid "Create partitionable space for Debian on your hard disk."
 msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "在硬盘上为 &debian; 留出可以用来创建分区的空间；"
 
 #. Tag: para
 #: preparing.xml:73
 #, no-c-format
-#| msgid ""
-#| "Locate and/or download the installer software and any specialized driver "
-#| "files your machine requires (except Debian CD users)."
 msgid ""
 "Locate and/or download the installer software and any specialized driver "
 "files your machine requires (except &debian; CD users)."
-msgstr "如果您不是使用 &debian; CD，请寻找和(或)下载安装程序软件，还有用于您电脑上的特殊硬件的驱动程序。"
+msgstr ""
+"如果您不是使用 &debian; CD，请寻找和(或)下载安装程序软件，还有用于您电脑上的"
+"特殊硬件的驱动程序。"
 
 #. Tag: para
 #: preparing.xml:79
 #, no-c-format
-#| msgid ""
-#| "Set up boot tapes/floppies/USB sticks, or place boot files (most Debian "
-#| "CD users can boot from one of the CDs)."
 msgid ""
 "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
-msgstr "设置从磁带/软盘/USB 盘，或者其它存有系统启动文件的设备上启动(对于大多数 &debian; CD 使用者来说，可以直接用一个 CD 启动)；"
+msgstr ""
+"设置从磁带/软盘/USB 盘，或者其它存有系统启动文件的设备上启动(对于大多数 "
+"&debian; CD 使用者来说，可以直接用一个 CD 启动)；"
 
 #. Tag: para
 #: preparing.xml:85
@@ -182,7 +170,6 @@ msgstr "加上一个或多个直接存取设备(DASD)；"
 #. Tag: para
 #: preparing.xml:117
 #, no-c-format
-#| msgid "Create and mount the partitions on which Debian will be installed."
 msgid "Create and mount the partitions on which &debian; will be installed."
 msgstr "创建并挂载用来安装 &debian; 的分区；"
 
@@ -213,17 +200,15 @@ msgstr "第一次加载新安装的系统；"
 #. Tag: para
 #: preparing.xml:141
 #, no-c-format
-#| msgid ""
-#| "For &arch-title; you have the option of using <phrase arch=\"x86\">a</"
-#| "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical "
-#| "version of the installation system. For more information about this "
-#| "graphical installer, see <xref linkend=\"graphical\"/>."
 msgid ""
 "For &arch-title; you have the option of using <phrase arch=\"any-x86\">a</"
 "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical version "
 "of the installation system. For more information about this graphical "
 "installer, see <xref linkend=\"graphical\"/>."
-msgstr "对于 &arch-title;，您可以选择使用<phrase arch=\"any-x86\">一个</phrase><phrase arch=\"powerpc\">一个实验性的</phrase>图形界面的安装系统。有关图形安装程序的更多信息，请参阅 <xref linkend=\"graphical\"/>。"
+msgstr ""
+"对于 &arch-title;，您可以选择使用<phrase arch=\"any-x86\">一个</"
+"phrase><phrase arch=\"powerpc\">一个实验性的</phrase>图形界面的安装系统。有关"
+"图形安装程序的更多信息，请参阅 <xref linkend=\"graphical\"/>。"
 
 #. Tag: para
 #: preparing.xml:149
@@ -374,30 +359,26 @@ msgstr "&list-install-manual-files;"
 #. Tag: para
 #: preparing.xml:252
 #, no-c-format
-#| msgid ""
-#| "The document you are now reading, which is the official version of the "
-#| "Installation Guide for the &releasename; release of Debian; available in "
-#| "<ulink url=\"&url-release-area;/installmanual\">various formats and "
-#| "translations</ulink>."
 msgid ""
 "The document you are now reading, which is the official version of the "
 "Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
-msgstr "您正在阅读的文档，是 &debian; &releasename; 发行版安装指南的正式版本; 还有<ulink url=\"&url-release-area;/installmanual\">各种文件格式和不同语种的翻译</ulink>。"
+msgstr ""
+"您正在阅读的文档，是 &debian; &releasename; 发行版安装指南的正式版本; 还有"
+"<ulink url=\"&url-release-area;/installmanual\">各种文件格式和不同语种的翻译"
+"</ulink>。"
 
 #. Tag: para
 #: preparing.xml:261
 #, no-c-format
-#| msgid ""
-#| "The document you are now reading, which is a development version of the "
-#| "Installation Guide for the next release of Debian; available in <ulink "
-#| "url=\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgid ""
 "The document you are now reading, which is a development version of the "
 "Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
-msgstr "您正在阅读的文档，是 &ebian; 下一个发行版安装指南的开发版本；有<ulink url=\"&url-d-i-alioth-manual;\">各种文件格式和不同语种的翻译</ulink>。"
+msgstr ""
+"您正在阅读的文档，是 &ebian; 下一个发行版安装指南的开发版本；有<ulink url="
+"\"&url-d-i-alioth-manual;\">各种文件格式和不同语种的翻译</ulink>。"
 
 #. Tag: title
 #: preparing.xml:273
@@ -440,20 +421,18 @@ msgstr "&arch-title; Hardware References"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"在 &arch-title; 上 Linux 2.4 版内核的安装指引和设备驱动程序 (DASD, XPRAM, "
-"Console, tape, z90 crypto, chandev, network)"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "设备驱动程序与安装命令"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -462,38 +441,36 @@ msgstr ""
 "IBM Redbook 讲述了如何将 Linux 与 zSeries 的 z/VM 和 &arch-title; 硬件组合。"
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "用于 &arch-title; 的 Linux"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
-#| msgid ""
-#| "IBM Redbook describing the Linux distributions available for the "
-#| "mainframe. It has no chapter about Debian but the basic installation "
-#| "concepts are the same across all &arch-title; distributions."
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
 "It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
-msgstr "IBM Redbook 介绍了可用于 mainframe 的 Linux 发行版。其中没有关于 &debian; 的章节，但对于所有的 &arch-title; 发行版，基本的安装概念是相同的。"
+msgstr ""
+"IBM Redbook 介绍了可用于 mainframe 的 Linux 发行版。其中没有关于 &debian; 的"
+"章节，但对于所有的 &arch-title; 发行版，基本的安装概念是相同的。"
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "提供硬件信息的资源"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -504,19 +481,19 @@ msgstr ""
 "熟悉一下您的硬件比较好。"
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "获取硬件信息的途径有："
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "每个硬件附带的手册。"
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -527,19 +504,19 @@ msgstr ""
 "您的手册确认组合键。通常，它是 <keycap>Delete</keycap> 键。"
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "每个硬件的包装盒。"
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Windows 控制面板里面的系统窗口。"
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -550,7 +527,7 @@ msgstr ""
 "盘特别有用。"
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -560,179 +537,179 @@ msgstr ""
 "息。"
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "安装所需的硬件信息"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "硬件"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "您需要了解的信息"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "硬盘"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "拥有的容量。"
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "它们在系统上的次序。"
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "是 IDE (也称为 PATA)、SATA 或 SCSI。"
 
 # index.docbook:445, index.docbook:497
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "可用空间。"
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "分区。"
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "安装有其他操作系统的分区。"
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "显示器"
 
 # index.docbook:453, index.docbook:473, index.docbook:479, index.docbook:485
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "型号与制造商。"
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "支持的分辨率。"
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "水平扫描频率。"
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "垂直扫描频率。"
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "支持的颜色深度(颜色数)。"
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "屏幕尺寸。"
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "鼠标"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "类型：串口、PS/2 或 USB。"
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "端口。"
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "制造商。"
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "按键数。"
 
 # index.docbook:472, index.docbook:500
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 # index.docbook:475, index.docbook:501
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "适配器类型。"
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "打印机"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "支持的打印分辨率。"
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "视频卡"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "可用显存。"
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -740,37 +717,37 @@ msgid ""
 msgstr "支持的分辨率和颜色数(还需检验您显示器的能力)。"
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "设备数。"
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "设备数。"
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "OSA 卡的相对适配器号。"
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "硬件兼容性"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -783,7 +760,7 @@ msgstr ""
 "不同的硬件上运行。"
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -792,7 +769,7 @@ msgstr ""
 "特别是，&arch-kernel; 通常不能驱动那些需要某些版本 Windows 才运行的硬件上。"
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -805,7 +782,7 @@ msgstr ""
 "上。因此，它们很快就会被废弃。"
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -815,19 +792,19 @@ msgstr ""
 "格的。"
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "您可以通过以下方式检验硬件兼容性："
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "检查制造商的网站来得到新的驱动程序。"
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -837,7 +814,7 @@ msgstr ""
 "驱动程序或者设置。"
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -845,19 +822,19 @@ msgid ""
 msgstr "检查您计算机体系的 &arch-kernel; 兼容性列表网站。"
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "搜索互联网查找其他用户的经验。"
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "网络设置"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -868,31 +845,31 @@ msgstr ""
 "号连接)，您需要向您的网络系统管理员咨询这项信息。"
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "您的主机名(您也许可以自己决定)。"
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "您的域名。"
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "您的计算机 IP 地址。"
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "您网络的网络掩码。"
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -901,7 +878,7 @@ msgstr ""
 "路由经过的默认网关的 IP 地址，如果您的网络<emphasis>有</emphasis>网关的话。"
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -909,7 +886,7 @@ msgid ""
 msgstr "您的网络中作为 DNS(域名服务) 服务器的系统。"
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -921,31 +898,31 @@ msgstr ""
 "需了解这项信息，因为 DHCP 服务器会在安装过程中直接提供。"
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "如果您有一个无线网络，您应该找出："
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "您的无线网络的 ESSID。"
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEP 安全密钥(如果可用)。"
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "满足最低的硬件要求"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -956,7 +933,7 @@ msgstr ""
 "偿，安装上系统。"
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -967,112 +944,115 @@ msgstr ""
 "议的话，多数用户会安装失败。"
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "Pentium 4、1GHz 的系统是桌面系统的最低推荐配置。"
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr "任何一台 OldWorld 或 NewWorld PowerPC 都可以用作一个不错的桌面系统。"
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "推荐的最低系统配置"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "安装类别"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (最低要求)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (推荐配置)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "硬盘"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "无桌面的系统"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 MB"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 MB"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 GB"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "桌面系统"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 MB"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 MB"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 GB"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
-#| msgid ""
-#| "The actual minimum memory requirements are a lot less then the numbers "
-#| "listed in this table. Depending on the architecture, it is possible to "
-#| "install Debian with as little as 20MB (for s390) to 60MB (for "
-#| "amd64). The same goes for the disk space requirements, especially if you "
-#| "pick and choose which applications to install; see <xref linkend="
-#| "\"tasksel-size-list\"/> for additional information on disk space "
-#| "requirements."
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
-msgstr "实际的内存最低要求会略低于表中的数字。根据各自的体系，&debian; 可以在 20MB (s390) 到 60MB (amd64) 这样少的内存上安装。同样，对磁盘空间也是如此，取决于您选择安装的应用软件。参阅 <xref linkend=\"tasksel-size-list\"/> 了解磁盘空间需求的内容。"
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
+msgstr ""
+"实际的内存最低要求会略低于表中的数字。根据各自的体系，&debian; 可以在 20MB "
+"(s390) 到 60MB (amd64) 这样少的内存上安装。同样，对磁盘空间也是如此，取决于您"
+"选择安装的应用软件。参阅 <xref linkend=\"tasksel-size-list\"/> 了解磁盘空间需"
+"求的内容。"
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1088,7 +1068,7 @@ msgstr ""
 "择。"
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1098,7 +1078,7 @@ msgstr ""
 "很难说清楚服务器安装该需要多少内存和磁盘空间，这完全取决于服务器的用途。"
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1109,18 +1089,8 @@ msgstr ""
 "含用户的文件、信件或者数据。在考虑您自己的文件和数据空间时，越慷慨越好。"
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, no-c-format
-#| msgid ""
-#| "Disk space required for the smooth operation of the &debian-gnu; system "
-#| "itself is taken into account in these recommended system requirements. "
-#| "Notably, the <filename>/var</filename> partition contains a lot of state "
-#| "information specific to Debian in addition to its regular contents, like "
-#| "logfiles. The <command>dpkg</command> files (with information on all "
-#| "installed packages) can easily consume 40MB. Also, <command>apt-get</"
-#| "command> puts downloaded packages here before they are installed. You "
-#| "should usually allocate at least 200MB for <filename>/var</filename>, and "
-#| "a lot more if you install a graphical desktop environment."
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
 "itself is taken into account in these recommended system requirements. "
@@ -1131,16 +1101,22 @@ msgid ""
 "command> puts downloaded packages here before they are installed. You should "
 "usually allocate at least 200MB for <filename>/var</filename>, and a lot "
 "more if you install a graphical desktop environment."
-msgstr "在推荐的系统需求中已经包含流畅运行 &debian-gnu; 所需的磁盘空间。尤其是 <filename>/var</filename> 分区里装有许多 &debian; 的特定状态信息和类似日志文件这样的常规内容。<command>dpkg</command> 所用的文件(含有所有已安装软件包的信息)很容易就会消耗掉 40MB。另外，<command>apt-get</command> 会在安装前将下载的软件包放在这里。您应当最少分配 200MB 的空间给 <filename>/var</filename>，如果您安装了图形桌面系统，还要更多空间。"
+msgstr ""
+"在推荐的系统需求中已经包含流畅运行 &debian-gnu; 所需的磁盘空间。尤其是 "
+"<filename>/var</filename> 分区里装有许多 &debian; 的特定状态信息和类似日志文"
+"件这样的常规内容。<command>dpkg</command> 所用的文件(含有所有已安装软件包的信"
+"息)很容易就会消耗掉 40MB。另外，<command>apt-get</command> 会在安装前将下载的"
+"软件包放在这里。您应当最少分配 200MB 的空间给 <filename>/var</filename>，如果"
+"您安装了图形桌面系统，还要更多空间。"
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "为多重启动系统事先分区"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1153,7 +1129,7 @@ msgstr ""
 "间里安置家具，那么这不会对其它房间有任何影响。"
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1165,39 +1141,30 @@ msgstr ""
 "机。"
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, no-c-format
-#| msgid ""
-#| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-#| "phrase> and want to stick Linux on the same disk, you will need to "
-#| "repartition the disk. Debian requires its own hard disk partitions. It "
-#| "cannot be installed on Windows or MacOS partitions. It may be able to "
-#| "share some partitions with other Linux systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
-msgstr "如果您已经在您的机器中安装有操作系统<phrase arch=\"x86\"> (Windows 9x、Windows NT/2000/XP/2003/Vista/7、OS/2、MacOS、Solaris、FreeBSD，&hellip;) </phrase> <phrase arch=\"s390\"> (VM、z/OS、OS/390，&hellip;) </phrase>，同时也希望把 Linux 装在同一块硬盘上，那么您就必须重新对硬盘分区。&debian; 需要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与其它 Linux 系统共享一些分区，但是我们在这里不会对此进行说明。最起码，您要为 &debian; 的根目录准备一个专用的分区。"
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
+msgstr ""
+"如果您已经在您的机器中安装有操作系统<phrase arch=\"x86\"> (Windows 9x、"
+"Windows NT/2000/XP/2003/Vista/7、OS/2、MacOS、Solaris、FreeBSD，&hellip;) </"
+"phrase> <phrase arch=\"s390\"> (VM、z/OS、OS/390，&hellip;) </phrase>，同时也"
+"希望把 Linux 装在同一块硬盘上，那么您就必须重新对硬盘分区。&debian; 需要它自"
+"己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与其它 "
+"Linux 系统共享一些分区，但是我们在这里不会对此进行说明。最起码，您要为 "
+"&debian; 的根目录准备一个专用的分区。"
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, no-c-format
-#| msgid ""
-#| "You can find information about your current partition setup by using a "
-#| "partitioning tool for your current operating system<phrase arch=\"x86\">, "
-#| "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such "
-#| "as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, "
-#| "such as the VM diskmap</phrase>. Partitioning tools always provide a way "
-#| "to show existing partitions without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
@@ -1205,10 +1172,15 @@ msgid ""
 "such as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, "
 "such as the VM diskmap</phrase>. Partitioning tools always provide a way to "
 "show existing partitions without making changes."
-msgstr "通过当前的操作系统中的分区工具，您可以获知现在的分区状况<phrase arch=\"any-x86\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">，如 VM diskmap</phrase>。分区工具总会提供一种办法让您查看现有的分区情况，而不作任何改动。"
+msgstr ""
+"通过当前的操作系统中的分区工具，您可以获知现在的分区状况<phrase arch=\"any-"
+"x86\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 "
+"Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">，如 VM "
+"diskmap</phrase>。分区工具总会提供一种办法让您查看现有的分区情况，而不作任何"
+"改动。"
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1222,28 +1194,26 @@ msgstr ""
 "最好在把挡路的家具都移开，否则就要冒家具被毁坏的危险。"
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
-#| msgid ""
-#| "If your computer has more than one hard disk, you may want to dedicate "
-#| "one of the hard disks completely to Debian. If so, you don't need to "
-#| "partition that disk before booting the installation system; the "
-#| "installer's included partitioning program can handle the job nicely."
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
 "of the hard disks completely to &debian;. If so, you don't need to partition "
 "that disk before booting the installation system; the installer's included "
 "partitioning program can handle the job nicely."
-msgstr "如果您的计算机配有不只一块硬盘，您或许可以考虑把其中一块硬盘专门分配给 &debian; 使用。这样的话，您就不用在启动安装系统前再对那块硬盘进行分区了，安装程序自带的分区程序会漂亮地完成这个任务。"
+msgstr ""
+"如果您的计算机配有不只一块硬盘，您或许可以考虑把其中一块硬盘专门分配给 "
+"&debian; 使用。这样的话，您就不用在启动安装系统前再对那块硬盘进行分区了，安装"
+"程序自带的分区程序会漂亮地完成这个任务。"
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1267,15 +1237,8 @@ msgstr ""
 "常，至少您还可以有几个办法可选，比如原先系统的安装磁带或 CD。"
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
-#| msgid ""
-#| "If your machine already has multiple partitions, and enough space can be "
-#| "provided by deleting and replacing one or more of them, then you too can "
-#| "wait and use the Debian installer's partitioning program. You should "
-#| "still read through the material below, because there may be special "
-#| "circumstances like the order of the existing partitions within the "
-#| "partition map, that force you to partition before installing anyway."
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
 "provided by deleting and replacing one or more of them, then you too can "
@@ -1283,33 +1246,27 @@ msgid ""
 "read through the material below, because there may be special circumstances "
 "like the order of the existing partitions within the partition map, that "
 "force you to partition before installing anyway."
-msgstr "倘若您的机器已经有多个分区，并且通过删除或替换它们中的一个或多个就能为安装提供足够的空间，那么您一样也可以把分区操作延后，到安装时再使用 &debian; 安装程序自带的分区工具。不过，您还是应当继续读完下面的文档，因为可能会存在一些特殊的情形。比如，分区表中现有分区的顺序问题，这也许会令您不得不在安装前先分好区。"
+msgstr ""
+"倘若您的机器已经有多个分区，并且通过删除或替换它们中的一个或多个就能为安装提"
+"供足够的空间，那么您一样也可以把分区操作延后，到安装时再使用 &debian; 安装程"
+"序自带的分区工具。不过，您还是应当继续读完下面的文档，因为可能会存在一些特殊"
+"的情形。比如，分区表中现有分区的顺序问题，这也许会令您不得不在安装前先分好"
+"区。"
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
-#| msgid ""
-#| "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
-#| "you can wait and use Debian installer's partitioning program to resize "
-#| "the filesystem."
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
 "you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
-msgstr "如果您的计算机上有 FAT 或 NTFS 文件系统，它被 DOS 和 Windows 使用，您可以等到用 &debian; 安装程序中的分区工具来重新调整文件系统的大小。"
+msgstr ""
+"如果您的计算机上有 FAT 或 NTFS 文件系统，它被 DOS 和 Windows 使用，您可以等到"
+"用 &debian; 安装程序中的分区工具来重新调整文件系统的大小。"
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
-#| msgid ""
-#| "If none of the above apply, you'll need to partition your hard disk "
-#| "before starting the installation to create partitionable space for "
-#| "Debian. If some of the partitions will be owned by other operating "
-#| "systems, you should create those partitions using native operating system "
-#| "partitioning programs. We recommend that you do <emphasis>not</emphasis> "
-#| "attempt to create partitions for &debian-gnu; using another operating "
-#| "system's tools. Instead, you should just create the native operating "
-#| "system's partitions you will want to retain."
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
 "starting the installation to create partitionable space for &debian;. If "
@@ -1319,27 +1276,29 @@ msgid ""
 "partitions for &debian-gnu; using another operating system's tools. Instead, "
 "you should just create the native operating system's partitions you will "
 "want to retain."
-msgstr "如果您的情况不属于上面任何一种，那么需要在开始安装之前，事先为 &debian; 腾出可用于分区的空间。要是有分区是为其它操作系统准备的，最好用该操作系统自己的分区软件来新建这些分区。我们建议您<emphasis>不要</emphasis>用其它操作系统里的工具为 &debian-gnu; 创建 Linux 分区。也就是说，应当仅仅创建要保留的操作系统自身的分区。"
+msgstr ""
+"如果您的情况不属于上面任何一种，那么需要在开始安装之前，事先为 &debian; 腾出"
+"可用于分区的空间。要是有分区是为其它操作系统准备的，最好用该操作系统自己的分"
+"区软件来新建这些分区。我们建议您<emphasis>不要</emphasis>用其它操作系统里的工"
+"具为 &debian-gnu; 创建 Linux 分区。也就是说，应当仅仅创建要保留的操作系统自身"
+"的分区。"
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
-#| msgid ""
-#| "If you are going to install more than one operating system on the same "
-#| "machine, you should install all other system(s) before proceeding with "
-#| "Debian installation. Windows and other OS installations may destroy your "
-#| "ability to start Debian, or encourage you to reformat non-native "
-#| "partitions."
 msgid ""
 "If you are going to install more than one operating system on the same "
 "machine, you should install all other system(s) before proceeding with "
 "&debian; installation. Windows and other OS installations may destroy your "
 "ability to start &debian;, or encourage you to reformat non-native "
 "partitions."
-msgstr "倘若您打算在同一台机器上安装多个操作系统的话，应当在安装 &debian; 之前，先把所有其它系统都装好。Windows 和其它操作系统的安装过程可能会让您无法启动 &debian;，也可能会怂恿您重新格式化不属于它们自己的分区。"
+msgstr ""
+"倘若您打算在同一台机器上安装多个操作系统的话，应当在安装 &debian; 之前，先把"
+"所有其它系统都装好。Windows 和其它操作系统的安装过程可能会让您无法启动 "
+"&debian;，也可能会怂恿您重新格式化不属于它们自己的分区。"
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1349,17 +1308,8 @@ msgstr ""
 "能够帮您免除这些烦恼。"
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, no-c-format
-#| msgid ""
-#| "In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
-#| "partitions should appear before all other partitions on the disk, "
-#| "especially MacOS boot partitions. This should be kept in mind when pre-"
-#| "partitioning; you should create a Linux placeholder partition to come "
-#| "<emphasis>before</emphasis> the other bootable partitions on the disk. "
-#| "(The small partitions dedicated to Apple disk drivers are not bootable.) "
-#| "You can delete the placeholder with the Linux partition tools later "
-#| "during the actual install, and replace it with Linux partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
@@ -1369,29 +1319,33 @@ msgid ""
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
 "can delete the placeholder with the &debian; partition tools later during "
 "the actual install, and replace it with &arch-parttype; partitions."
-msgstr "为了能让 OpemFirmware 自动启动 &debian-gnu; &arch-parttype; 分区必须被安置在其它分区之前，特别是 MacOS 的启动分区。在事先分区时，这一点您必须牢记在心。即，您必须在其它可引导分区<emphasis>之前</emphasis>为 &arch-parttype; 预留一个分区。(专门留给 Apple 的硬盘驱动程序的那些小分区并不是可引导的。) 您可以在真正安装时，用 &debian; 的分区工具来删除当初预留的分区，再用 &arch-parttype; 的分区取而代之。"
+msgstr ""
+"为了能让 OpemFirmware 自动启动 &debian-gnu; &arch-parttype; 分区必须被安置在"
+"其它分区之前，特别是 MacOS 的启动分区。在事先分区时，这一点您必须牢记在心。"
+"即，您必须在其它可引导分区<emphasis>之前</emphasis>为 &arch-parttype; 预留一"
+"个分区。(专门留给 Apple 的硬盘驱动程序的那些小分区并不是可引导的。) 您可以在"
+"真正安装时，用 &debian; 的分区工具来删除当初预留的分区，再用 &arch-parttype; "
+"的分区取而代之。"
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
-#| msgid ""
-#| "If you currently have one hard disk with one partition (a common setup "
-#| "for desktop computers), and you want to multi-boot the native operating "
-#| "system and Debian, you will need to:"
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
 "desktop computers), and you want to multi-boot the native operating system "
 "and &debian;, you will need to:"
-msgstr "如果您现在有一块硬盘，这块硬盘上仅有一个分区(这是桌面电脑的通常设置)，同时希望能多重启动原有的操作系统和 &debian;，那么您将需要："
+msgstr ""
+"如果您现在有一块硬盘，这块硬盘上仅有一个分区(这是桌面电脑的通常设置)，同时希"
+"望能多重启动原有的操作系统和 &debian;，那么您将需要："
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "备份计算机里所有的数据。"
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1404,7 +1358,7 @@ msgstr ""
 "的 MacOS 系统。</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1414,61 +1368,48 @@ msgstr ""
 "个分区，或者腾出一块空闲空间。"
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "把原有的操作系统安装到属于它的新分区上。"
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
-#| msgid ""
-#| "Boot back into the native system to verify everything's OK, and to "
-#| "download the Debian installer boot files."
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
 "the &debian; installer boot files."
-msgstr "启动到原有的操作系统，以确保一切正常，再下载 &debian; 安装程序的启动文件。"
+msgstr ""
+"启动到原有的操作系统，以确保一切正常，再下载 &debian; 安装程序的启动文件。"
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
-#| msgid "Boot the Debian installer to continue installing Debian."
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "启动 &debian; 安装程序，并继续安装 &debian;。"
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "从 DOS 或 Windows 分区"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
-#| msgid ""
-#| "If you are manipulating existing FAT or NTFS partitions, it is "
-#| "recommended that you either use the scheme below or native Windows or DOS "
-#| "tools. Otherwise, it is not really necessary to partition from DOS or "
-#| "Windows; the Debian partitioning tools will generally do a better job."
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
 "that you either use the scheme below or native Windows or DOS tools. "
 "Otherwise, it is not really necessary to partition from DOS or Windows; the "
 "&debian; partitioning tools will generally do a better job."
-msgstr "如果您想在已有的 FAT 或 NTFS 分区上动手，那么建议您或者按照下面介绍的方案操作，或者使用 Windows 或者 DOS 自己的工具软件。否则的话，真的没必要从 DOS 或者 Windows 分区，一般来说，&debian; 的分区软件会做得更好。"
+msgstr ""
+"如果您想在已有的 FAT 或 NTFS 分区上动手，那么建议您或者按照下面介绍的方案操"
+"作，或者使用 Windows 或者 DOS 自己的工具软件。否则的话，真的没必要从 DOS 或"
+"者 Windows 分区，一般来说，&debian; 的分区软件会做得更好。"
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
-#| msgid ""
-#| "But if you have a large IDE disk, and are not using LBA addressing, "
-#| "overlay drivers (sometimes provided by hard disk manufacturers), or a new "
-#| "(post 1998) BIOS that supports large disk access extensions, then you "
-#| "must locate your Debian boot partition carefully. In this case, you will "
-#| "have to put the boot partition into the first 1024 cylinders of your hard "
-#| "disk (usually around 524 megabytes, without BIOS translation). This may "
-#| "require that you move an existing FAT or NTFS partition."
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
 "drivers (sometimes provided by hard disk manufacturers), or a new (post "
@@ -1477,50 +1418,43 @@ msgid ""
 "the boot partition into the first 1024 cylinders of your hard disk (usually "
 "around 524 megabytes, without BIOS translation). This may require that you "
 "move an existing FAT or NTFS partition."
-msgstr "但是，如果您有一块 IDE 接口的大硬盘，而且使用的既不是 LBA 寻址或 overlay 驱动(有时候硬盘厂商会提供这种驱动)，也没用支持大硬盘访问扩展的新款(1998 年以后) BIOS，那么必须小心地划分 &debian; 的引导分区。在这种情形下，一定要把引导分区分在硬盘开始的 1024 柱面之内(BIOS 不换算的话，大约 524 MB)。为此，您可能需要移动已存在的 FAT 或 NTFS 分区。"
+msgstr ""
+"但是，如果您有一块 IDE 接口的大硬盘，而且使用的既不是 LBA 寻址或 overlay 驱动"
+"(有时候硬盘厂商会提供这种驱动)，也没用支持大硬盘访问扩展的新款(1998 年以后) "
+"BIOS，那么必须小心地划分 &debian; 的引导分区。在这种情形下，一定要把引导分区"
+"分在硬盘开始的 1024 柱面之内(BIOS 不换算的话，大约 524 MB)。为此，您可能需要"
+"移动已存在的 FAT 或 NTFS 分区。"
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
-#| msgid ""
-#| "One of the most common installations is onto a system that already "
-#| "contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, "
-#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian onto the same "
-#| "disk without destroying the previous system. Note that the installer "
-#| "supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
-#| "Simply start the installer and when you get to the partitioning step, "
-#| "select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </"
-#| "menuchoice> partitioning, select the partition to resize, and specify its "
-#| "new size. So in most cases you should not need to use the method "
-#| "described below."
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
-msgstr "在常见的安装中，有一种是希望在已装有 DOS(含 Windows 3.1)、Win32(如 Windows 95、98、Me、NT、2000、XP、2003、Vista、7) 或者 OS/2 的系统上安装 &debian; 到同一块硬盘，并保留原有系统。注意，安装程序支持改变 DOS 和 Windows 所使用的 FAT 和 NTFS 文件系统的容量。只需启动安装程序，选择 <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> 选项，并选择需要调整大小的分区，指定新的尺寸。在多数情况下您并不需要使用下面的方法。"
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
+msgstr ""
+"在常见的安装中，有一种是希望在已装有 DOS(含 Windows 3.1)、Win32(如 Windows "
+"95、98、Me、NT、2000、XP、2003、Vista、7) 或者 OS/2 的系统上安装 &debian; 到"
+"同一块硬盘，并保留原有系统。注意，安装程序支持改变 DOS 和 Windows 所使用的 "
+"FAT 和 NTFS 文件系统的容量。只需启动安装程序，选择 <menuchoice> "
+"<guimenuitem>Manual</guimenuitem> </menuchoice> 选项，并选择需要调整大小的分"
+"区，指定新的尺寸。在多数情况下您并不需要使用下面的方法。"
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
-#| msgid ""
-#| "Before going any further, you should have decided how you will be "
-#| "dividing up the disk. The method in this section will only split a "
-#| "partition into two pieces. One will contain the original OS and the other "
-#| "will be used for Debian. During the installation of Debian, you will be "
-#| "given the opportunity to use the Debian portion of the disk as you see "
-#| "fit, i.e., as swap or as a file system."
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
 "up the disk. The method in this section will only split a partition into two "
@@ -1528,10 +1462,14 @@ msgid ""
 "&debian;. During the installation of &debian;, you will be given the "
 "opportunity to use the &debian; portion of the disk as you see fit, i.e., as "
 "swap or as a file system."
-msgstr "在操作前，应该先想好如何分割硬盘。本节所述的方法只会把一个分区一分为二。分出来的其中一片放原来的操作系统，而另一片则归 &debian; 使用。在 &debian; 的安装过程中，您会有机会把您认为合适的那部分硬盘划归 &debian; 使用。比如说，用作交换分区或者放置文件系统。"
+msgstr ""
+"在操作前，应该先想好如何分割硬盘。本节所述的方法只会把一个分区一分为二。分出"
+"来的其中一片放原来的操作系统，而另一片则归 &debian; 使用。在 &debian; 的安装"
+"过程中，您会有机会把您认为合适的那部分硬盘划归 &debian; 使用。比如说，用作交"
+"换分区或者放置文件系统。"
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1546,12 +1484,12 @@ msgstr ""
 "内，尽量不要往分区的后部写数据。否则就会减少从能该分区分出去的空间大小。"
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
+#: preparing.xml:983
+#, fuzzy, no-c-format
 #| msgid ""
 #| "The first thing needed is a copy of <command>fips</command> which is "
 #| "available in the <filename>tools/</filename> directory on your nearest "
-#| "Debian mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
 #| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
 #| "filename> to a bootable floppy. A bootable floppy can be created using "
 #| "the command <filename>sys a:</filename> under DOS. <command>fips</"
@@ -1560,20 +1498,26 @@ msgstr ""
 #| "compression driver or a disk manager. Create the disk and read the "
 #| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
-msgstr "第一件需要的东西是一份 <command>fips</command> 的拷贝。您可以从离您最近的 &debian; 镜像里的 <filename>tools/</filename> 目录下载它。解开这个 zip 压缩文件，把 <filename>RESTORRB.EXE</filename>、<filename>FIPS.EXE</filename> 和 <filename>ERRORS.TXT</filename> 复制到一张启动软盘里。您可以在 DOS 下面用 <filename>sys a:</filename> 来制作启动盘。<command>fips</command> 带有相当不错的文档，您也许会想看看的。倘若您正在用磁盘压缩驱动程序或者磁盘管理器，那么您绝对有必要读一下那个文档。在为这块硬盘清理磁盘碎片<emphasis>之前</emphasis>，请先做一张启动盘并好好阅读那份文档。"
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
+msgstr ""
+"第一件需要的东西是一份 <command>fips</command> 的拷贝。您可以从离您最近的 "
+"&debian; 镜像里的 <filename>tools/</filename> 目录下载它。解开这个 zip 压缩文"
+"件，把 <filename>RESTORRB.EXE</filename>、<filename>FIPS.EXE</filename> 和 "
+"<filename>ERRORS.TXT</filename> 复制到一张启动软盘里。您可以在 DOS 下面用 "
+"<filename>sys a:</filename> 来制作启动盘。<command>fips</command> 带有相当不"
+"错的文档，您也许会想看看的。倘若您正在用磁盘压缩驱动程序或者磁盘管理器，那么"
+"您绝对有必要读一下那个文档。在为这块硬盘清理磁盘碎片<emphasis>之前</"
+"emphasis>，请先做一张启动盘并好好阅读那份文档。"
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1592,7 +1536,7 @@ msgstr ""
 "VFAT 分区。"
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1604,7 +1548,7 @@ msgstr ""
 "<filename>a:\\fips</filename>，然后按照提示操作。"
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1614,65 +1558,55 @@ msgstr ""
 "可供差遣。"
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "为 DOS 分区"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
-#| msgid ""
-#| "If you are partitioning for DOS drives, or changing the size of DOS "
-#| "partitions, using Debian tools, many people experience problems working "
-#| "with the resulting FAT partitions. For instance, some have reported slow "
-#| "performance, consistent problems with <command>scandisk</command>, or "
-#| "other weird errors in DOS or Windows."
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
 "partitions, using &debian; tools, many people experience problems working "
 "with the resulting FAT partitions. For instance, some have reported slow "
 "performance, consistent problems with <command>scandisk</command>, or other "
 "weird errors in DOS or Windows."
-msgstr "如果您用 &debian; 的工具软件来为 DOS 硬盘分区，或者改动 DOS 分区的大小的话，请注意，有许多人在这样做了以后，在使用新分出来的或者大小被改变的 FAT 分区的过程中发现存在着各种各样的问题。举例来说，有些人回报说发现性能下降，有的人则在使用 <command>scandisk</command> 时发现有一致性(consistent)的问题，还有其它在 DOS 或 Windows 中发现的各种古怪的错误。"
+msgstr ""
+"如果您用 &debian; 的工具软件来为 DOS 硬盘分区，或者改动 DOS 分区的大小的话，"
+"请注意，有许多人在这样做了以后，在使用新分出来的或者大小被改变的 FAT 分区的过"
+"程中发现存在着各种各样的问题。举例来说，有些人回报说发现性能下降，有的人则在"
+"使用 <command>scandisk</command> 时发现有一致性(consistent)的问题，还有其它"
+"在 DOS 或 Windows 中发现的各种古怪的错误。"
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
-#| msgid ""
-#| "Apparently, whenever you create or resize a partition for DOS use, it's a "
-#| "good idea to fill the first few sectors with zeros. You should do this "
-#| "prior to running DOS's <command>format</command> command by executing the "
-#| "following command from Debian:"
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
 "good idea to fill the first few sectors with zeros. You should do this prior "
 "to running DOS's <command>format</command> command by executing the "
 "following command from &debian;:"
-msgstr "显然，当您为 DOS 新建分区或者改动分区大小时，最好把前面几个扇区全部清零。您应该在运行 DOS 的 <command>format</command> 命令之前，到 &debian; 系统中，执行："
+msgstr ""
+"显然，当您为 DOS 新建分区或者改动分区大小时，最好把前面几个扇区全部清零。您应"
+"该在运行 DOS 的 <command>format</command> 命令之前，到 &debian; 系统中，执"
+"行："
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "在 SunOS 下分区"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
-#| msgid ""
-#| "It's perfectly fine to partition from SunOS; in fact, if you intend to "
-#| "run both SunOS and Debian on the same machine, it is recommended that you "
-#| "partition using SunOS prior to installing Debian. The Linux kernel "
-#| "understands Sun disk labels, so there are no problems there. SILO "
-#| "supports booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), "
-#| "romfs or iso9660 (CDROM) partitions."
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
 "both SunOS and &debian; on the same machine, it is recommended that you "
@@ -1680,16 +1614,20 @@ msgid ""
 "understands Sun disk labels, so there are no problems there. SILO supports "
 "booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), romfs or "
 "iso9660 (CDROM) partitions."
-msgstr "从 SunOS 分区非常完美。事实上，如果您倾向在同一台计算机上使用 SunOS 和 &debian;，建议在安装 &debian; 之前使用 SunOS 进行分区。Linux 内核可以识别 Sun 的磁盘标签，因此不会有任何问题。SILO 支持从 EXT2 (Linux)、UFS (SunOS)、romfs 和 iso9660 (CDROM)分区启动 Linux 和 SunOS。"
+msgstr ""
+"从 SunOS 分区非常完美。事实上，如果您倾向在同一台计算机上使用 SunOS 和 "
+"&debian;，建议在安装 &debian; 之前使用 SunOS 进行分区。Linux 内核可以识别 "
+"Sun 的磁盘标签，因此不会有任何问题。SILO 支持从 EXT2 (Linux)、UFS (SunOS)、"
+"romfs 和 iso9660 (CDROM)分区启动 Linux 和 SunOS。"
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "从 Linux 或其他 OS 分区"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1709,7 +1647,7 @@ msgstr ""
 "系)格式化过的磁盘，您必须创建新的磁盘标签，不然会有磁盘排列问题出现。"
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1722,13 +1660,13 @@ msgstr ""
 "linkend=\"partitioning\"/>。"
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "在 MacOS/OSX 下分区"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1743,7 +1681,7 @@ msgstr ""
 "Setup</application> 中。"
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1754,7 +1692,7 @@ msgstr ""
 "无关紧要，在后面的 &debian-gnu; 安装程序中，它会被删除并替换。"
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1778,7 +1716,7 @@ msgstr ""
 "问。"
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1794,22 +1732,14 @@ msgstr ""
 "系统间共享信息。HFS，HFS+ 和 MS-DOS FAT 分区都能被 MacOS 和 Linux 支持。"
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "安装前的硬件和操作系统的相关设置"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
-#| msgid ""
-#| "This section will walk you through pre-installation hardware setup, if "
-#| "any, that you will need to do prior to installing Debian. Generally, this "
-#| "involves checking and possibly changing firmware settings for your "
-#| "system. The <quote>firmware</quote> is the core software used by the "
-#| "hardware; it is most critically invoked during the bootstrap process "
-#| "(after power-up). Known hardware issues affecting the reliability of "
-#| "&debian-gnu; on your system are also highlighted."
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
 "that you will need to do prior to installing &debian;. Generally, this "
@@ -1818,24 +1748,23 @@ msgid ""
 "most critically invoked during the bootstrap process (after power-up). Known "
 "hardware issues affecting the reliability of &debian-gnu; on your system are "
 "also highlighted."
-msgstr "在本节中，我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的话，您就需要在安装 &debian; 前先做一些准备工作了。一般来说，准备工作包括：检查或者修改为您的系统中固件(firmware)的设定。所谓<quote>固件</quote>就是硬件运行所需的核心软件。它在系统引导过程(即开机之后)中起到了至关重要的作用。我们同时也会着重提出一些硬件问题，您系统上这些硬件问题在将会影响到 &debian-gnu; 的可靠性。"
+msgstr ""
+"在本节中，我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的"
+"话，您就需要在安装 &debian; 前先做一些准备工作了。一般来说，准备工作包括：检"
+"查或者修改为您的系统中固件(firmware)的设定。所谓<quote>固件</quote>就是硬件运"
+"行所需的核心软件。它在系统引导过程(即开机之后)中起到了至关重要的作用。我们同"
+"时也会着重提出一些硬件问题，您系统上这些硬件问题在将会影响到 &debian-gnu; 的"
+"可靠性。"
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOS 设置菜单的使用"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
-#| msgid ""
-#| "BIOS provides the basic functions needed to boot your machine to allow "
-#| "your operating system to access your hardware. Your system probably "
-#| "provides a BIOS setup menu, which is used to configure the BIOS. Before "
-#| "installing, you <emphasis>must</emphasis> ensure that your BIOS is set up "
-#| "correctly; not doing so can lead to intermittent crashes or an inability "
-#| "to install Debian."
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
 "operating system to access your hardware. Your system probably provides a "
@@ -1843,10 +1772,14 @@ msgid ""
 "<emphasis>must</emphasis> ensure that your BIOS is set up correctly; not "
 "doing so can lead to intermittent crashes or an inability to install "
 "&debian;."
-msgstr "BIOS 为引导您的机器提供了基本的帮助，进而能让操作系统能访问您的硬件。您的系统应该会有 BIOS 的设置菜单，通过它，我们就能配置 BIOS。在进行安装前，您<emphasis>一定要</emphasis>确保 BIOS 的设置是正确无误的。否则，可能会导致经常性的系统崩溃或者根本无法安装 &debian;。"
+msgstr ""
+"BIOS 为引导您的机器提供了基本的帮助，进而能让操作系统能访问您的硬件。您的系统"
+"应该会有 BIOS 的设置菜单，通过它，我们就能配置 BIOS。在进行安装前，您"
+"<emphasis>一定要</emphasis>确保 BIOS 的设置是正确无误的。否则，可能会导致经常"
+"性的系统崩溃或者根本无法安装 &debian;。"
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1859,25 +1792,25 @@ msgstr ""
 "quote>) 设置菜单取决于 BIOS 软件的作者是谁："
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "<keycap>Delete</keycap> 键，在 POST(power on self test) 过程中"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1887,25 +1820,25 @@ msgstr ""
 "keycombo>，或 <keycap>Delete</keycap> 键，在 POST 过程中"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "<keycap>Esc</keycap> 键，在 POST 过程中"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -1917,13 +1850,13 @@ msgstr ""
 "keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1935,7 +1868,7 @@ msgstr ""
 "keycap> </keycombo> 或 <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -1945,7 +1878,7 @@ msgstr ""
 "invoking-bios-info;\"></ulink>。"
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -1961,23 +1894,14 @@ msgstr ""
 
 # index.docbook:1522, index.docbook:1865
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "选择引导设备"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
-#| msgid ""
-#| "Many BIOS setup menus allow you to select the devices that will be used "
-#| "to bootstrap the system. Set this to look for a bootable operating system "
-#| "on <filename>A:</filename> (the first floppy disk), then optionally the "
-#| "first CD-ROM device (possibly appearing as <filename>D:</filename> or "
-#| "<filename>E:</filename>), and then from <filename>C:</filename> (the "
-#| "first hard disk). This setting enables you to boot from either a floppy "
-#| "disk or a CD-ROM, which are the two most common boot devices used to "
-#| "install Debian."
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
 "bootstrap the system. Set this to look for a bootable operating system on "
@@ -1986,10 +1910,16 @@ msgid ""
 "</filename>), and then from <filename>C:</filename> (the first hard disk). "
 "This setting enables you to boot from either a floppy disk or a CD-ROM, "
 "which are the two most common boot devices used to install &debian;."
-msgstr "许多 BIOS 的设置菜单都能让您选择用来引导系统的设备。我们来设置一下，让它先在 <filename>A:</filename> (第一个软驱)中找寻可引导的操作系统，不行的话，再在第一个 CD-ROM 设备(有可能就是 <filename>D:</filename> 或 <filename>E:</filename>)中找，然后接着在 <filename>C:</filename>(第一块硬盘)找。照这样设定的话，就能让您从软盘或者 CD-ROM 引导。这是安装 &debian; 最常用的两个引导设备。"
+msgstr ""
+"许多 BIOS 的设置菜单都能让您选择用来引导系统的设备。我们来设置一下，让它先在 "
+"<filename>A:</filename> (第一个软驱)中找寻可引导的操作系统，不行的话，再在第"
+"一个 CD-ROM 设备(有可能就是 <filename>D:</filename> 或 <filename>E:</"
+"filename>)中找，然后接着在 <filename>C:</filename>(第一块硬盘)找。照这样设定"
+"的话，就能让您从软盘或者 CD-ROM 引导。这是安装 &debian; 最常用的两个引导设"
+"备。"
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2001,7 +1931,7 @@ msgstr ""
 "CD-ROM 引导系统。"
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2016,7 +1946,7 @@ msgstr ""
 "<quote>USB-ZIP</quote> 引导。"
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2027,13 +1957,13 @@ msgstr ""
 "要恢复原来的启动顺序，这样，您就能像以前一样从硬盘启动了。"
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "修改 IDE 接口计算机的引导顺序"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2045,7 +1975,7 @@ msgstr ""
 "关文档。"
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2055,19 +1985,19 @@ msgstr ""
 "有关。不管如何，您要找的是列有驱动器名的栏位。"
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "对 IDE 机器而言，列表里常见的表项是 C、A、cdrom 或者 A、C、cdrom。"
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C 就是硬盘，而 A 则是软驱。"
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2078,7 +2008,7 @@ msgstr ""
 "keycap> 或者 <keycap>Page Down</keycap> 键能够循环地选中可能的选项。"
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2087,20 +2017,20 @@ msgstr ""
 "然后，保存您对设置的修改。屏幕上的提示会告诉您如何才能保存修改过的到计算机。"
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "修改 SCSI 接口计算机的引导顺序"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr "当您的计算机启动时，可以按下某些键进入 SCSI 的设置软件。"
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2110,7 +2040,7 @@ msgstr ""
 "提示的时候，启动 SCSI 设置软件。"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2122,20 +2052,20 @@ msgstr ""
 "的相关文档。"
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "找到用来修改引导顺序的工具软件。"
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
 msgstr "通过这个工具软件修改设置，让光盘驱动器的 SCSI ID 排在列表的首位。"
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2145,19 +2075,19 @@ msgstr ""
 "需要按下 <keycap>F10</keycap>。"
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "BIOS 设置的其余项目"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "CD-ROM 的设置"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2170,13 +2100,13 @@ msgstr ""
 "userinput> 的错误提示，那么就有可能是您的设置问题了。"
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "扩展内存与扩充内存"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2189,13 +2119,13 @@ msgstr ""
 "得尽量小。&arch-kernel; 需要使用扩展内存，但无法利用扩充内存。"
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "病毒保护"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2218,13 +2148,13 @@ msgstr ""
 "装并设置好之后，就不再需要更动主引导扇区(MBR)了。</para> </footnote>。"
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "影像(shadow)内存"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2248,13 +2178,13 @@ msgstr ""
 "kernel; 存取硬件设备。"
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "内存空洞"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2265,7 +2195,7 @@ msgstr ""
 "它。如果您有那么多内存的话，&arch-kernel; 就会认为在那儿应该能找到内存块。"
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2284,13 +2214,13 @@ msgstr ""
 "常，否则的话就不行。"
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "高级电源管理"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2305,13 +2235,13 @@ msgstr ""
 "更好。"
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "使用 OpenFireware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2325,7 +2255,7 @@ msgstr ""
 "关的硬件文档。"
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2342,7 +2272,7 @@ msgstr ""
 "阅 <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> 了解更多提示。"
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2364,7 +2294,7 @@ msgstr ""
 "调制解调器端口连接到另外一台电脑上的终端程序来与 OpenFirmware 交互。"
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2384,13 +2314,13 @@ msgstr ""
 "<guibutton>Save</guibutton> 按钮使固件补丁安装到 nvram。"
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "使用 OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2404,7 +2334,7 @@ msgstr ""
 "机做很多事情，如诊断和简单脚本。"
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2423,7 +2353,7 @@ msgstr ""
 "<keycap>n</keycap> 键得到新风格的提示符。"
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2437,7 +2367,7 @@ msgstr ""
 "档。"
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2455,7 +2385,7 @@ msgstr ""
 "Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2494,7 +2424,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2523,19 +2453,19 @@ msgstr ""
 "</screen></informalexample> 或在 Solaris下执行："
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 设置"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2555,7 +2485,7 @@ msgstr ""
 "通过远程方式使用。这归因于该系统上的 3215/3270 控制台是线型，而不是字符型的。"
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2573,19 +2503,8 @@ msgstr ""
 "上的 HMC 启动。"
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
-#| msgid ""
-#| "Before you actually perform an installation, you have to go over some "
-#| "design and preparation steps. IBM has made documentation available about "
-#| "the whole process, e.g. how to prepare an installation medium and how "
-#| "actually to boot from that medium. Duplicating that information here is "
-#| "neither possible nor necessary. However, we will describe here which kind "
-#| "of Debian-specific data is needed and where to find it. Using both "
-#| "sources of information, you have to prepare your machine and the "
-#| "installation medium before you can perform a boot from it. When you see "
-#| "the welcome message in your client session, return to this document to go "
-#| "through the Debian-specific installation steps."
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
 "and preparation steps. IBM has made documentation available about the whole "
@@ -2597,16 +2516,21 @@ msgid ""
 "perform a boot from it. When you see the welcome message in your client "
 "session, return to this document to go through the &debian;-specific "
 "installation steps."
-msgstr "在实际安装之前，您必须仔细检查一些规划和准备步骤。IBM 有关于整个过程的文档，如，怎样准备安装介质和如何从该介质启动。这里毋需复制那些信息。但是，我们会在此说明需要哪些 &debian; 规格的数据，以及在哪里能找到它们。使用这些信息资源，在引导之前您必须准备好计算机和安装介质。当您在客户端会话中看到欢迎画面，再返回到本文档查看 &debian; 规格的安装步骤。"
+msgstr ""
+"在实际安装之前，您必须仔细检查一些规划和准备步骤。IBM 有关于整个过程的文档，"
+"如，怎样准备安装介质和如何从该介质启动。这里毋需复制那些信息。但是，我们会在"
+"此说明需要哪些 &debian; 规格的数据，以及在哪里能找到它们。使用这些信息资源，"
+"在引导之前您必须准备好计算机和安装介质。当您在客户端会话中看到欢迎画面，再返"
+"回到本文档查看 &debian; 规格的安装步骤。"
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "本地化(Native)和 LPAR 安装"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2622,13 +2546,13 @@ msgstr ""
 "如何为 Linux 建立 LPAR 的部分。"
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "作为一个 VM guest 安装"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2644,26 +2568,34 @@ msgstr ""
 "如何为运行 Linux 建立 VM guest 的部分。"
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "您需要从 <filename>generic</filename> 子目录复制所有的文件到您的 CMS 磁盘。确"
 "保 <filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> "
 "是以固定 80 字符记录长度的二近制形式进行传输。"
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "建立安装服务器"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2676,7 +2608,7 @@ msgstr ""
 "HTTP 或 FTP 访问。"
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2688,25 +2620,25 @@ msgstr ""
 "些独立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "需要留心的硬件问题"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS 支持与键盘"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2724,13 +2656,13 @@ msgstr ""
 "keyboard support</quote>选项。"
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "在 OldWorld Powermac 上正常显示"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2747,3 +2679,13 @@ msgstr ""
 "碰到这种问题(有时可以看到显示器上的数据，有时却什么都没有)，或者引导安装程序"
 "以后黑屏，而不是显示用户界面，请试着在 MacOS 下修改显示设置为 256 色，替代 "
 "<quote>thousands</quote> 或 <quote>millions</quote>。"
+
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "在 &arch-title; 上 Linux 2.4 版内核的安装指引和设备驱动程序 (DASD, XPRAM, "
+#~ "Console, tape, z90 crypto, chandev, network)"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "设备驱动程序与安装命令"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 6ddab53af..c77878006 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:49+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -299,12 +299,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:252
 #, no-c-format
-#| msgid ""
-#| "For the other preseeding methods you need to tell the installer what file "
-#| "to use when you boot it. This is normally done by passing the kernel a "
-#| "boot parameter, either manually at boot time or by editing the bootloader "
-#| "configuration file (e.g. <filename>syslinux.cfg</filename>) and adding "
-#| "the parameter to the end of the append line(s) for the kernel."
 msgid ""
 "For the other preseeding methods you need to tell the installer what file to "
 "use when you boot it. This is normally done by passing the kernel a boot "
@@ -316,16 +310,18 @@ msgid ""
 "the kernel.</phrase><phrase arch=\"hurd-any\">(e.g. <filename>grub.cfg</"
 "filename>) and adding the parameter to the end of the <filename>gnumach.gz</"
 "filename> line.</phrase>"
-msgstr "其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件<phrase arch=\"linux-any\">(如: <filename>syslinux.cfg</filename>)，并在内核的附加行后面添加参数。</phrase></phrase><phrase arch=\"kfreebsd-any\">(如: <filename>grub.cfg</filename>)，并为内核添加一个新<literal>设置</literal>行。</phrase><phrase arch=\"hurd-any\">(如: <filename>grub.cfg</filename>)，并在 <filename>gnumach.gz</filename> 行后添加参数。</phrase>"
+msgstr ""
+"其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递"
+"引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件<phrase "
+"arch=\"linux-any\">(如: <filename>syslinux.cfg</filename>)，并在内核的附加行"
+"后面添加参数。</phrase></phrase><phrase arch=\"kfreebsd-any\">(如: "
+"<filename>grub.cfg</filename>)，并为内核添加一个新<literal>设置</literal>行。"
+"</phrase><phrase arch=\"hurd-any\">(如: <filename>grub.cfg</filename>)，并在 "
+"<filename>gnumach.gz</filename> 行后添加参数。</phrase>"
 
 #. Tag: para
 #: preseed.xml:265
 #, no-c-format
-#| msgid ""
-#| "If you do specify the preconfiguration file in the bootloader "
-#| "configuration, you might change the configuration so you don't need to "
-#| "hit enter to boot the installer. For syslinux this means setting the "
-#| "timeout to <literal>1</literal> in <filename>syslinux.cfg</filename>."
 msgid ""
 "If you do specify the preconfiguration file in the bootloader configuration, "
 "you might change the configuration so you don't need to hit enter to boot "
@@ -333,7 +329,12 @@ msgid ""
 "the timeout to <literal>1</literal> in <filename>syslinux.cfg</filename>.</"
 "phrase><phrase arch=\"kfrebsd-any;hurd-any\">For grub this means setting the "
 "timeout to <literal>0</literal> in <filename>grub.cfg</filename>.</phrase>"
-msgstr "如果在 bootloader 设置里指定预置文件，可以修改配置让您不再需要键入回车启动安装程序。<phrase arch=\"linux-any\">对于 syslinux，这意味着在 <filename>syslinux.cfg</filename> 里面设置 timeout 为 <literal>1</literal>。</phrase><phrase arch=\"kfrebsd-any;hurd-any\">对于 grub 则设置 timeout 为 <literal>0</literal> 到 <filename>grub.cfg</filename> 文件。</phrase>"
+msgstr ""
+"如果在 bootloader 设置里指定预置文件，可以修改配置让您不再需要键入回车启动安"
+"装程序。<phrase arch=\"linux-any\">对于 syslinux，这意味着在 "
+"<filename>syslinux.cfg</filename> 里面设置 timeout 为 <literal>1</literal>。"
+"</phrase><phrase arch=\"kfrebsd-any;hurd-any\">对于 grub 则设置 timeout 为 "
+"<literal>0</literal> 到 <filename>grub.cfg</filename> 文件。</phrase>"
 
 #. Tag: para
 #: preseed.xml:274
@@ -535,20 +536,6 @@ msgstr "auto 模式"
 #. Tag: para
 #: preseed.xml:381
 #, no-c-format
-#| msgid ""
-#| "There are several features of Debian Installer that combine to allow "
-#| "fairly simple command lines at the boot prompt to result in arbitrarily "
-#| "complex customized automatic installs. To illustrate this, here are some "
-#| "examples that can be used at the boot prompt: <informalexample><screen>\n"
-#| "auto url=autoserver\n"
-#| "</screen></informalexample> This relies on there being a DHCP server that "
-#| "will get the machine to the point where <literal>autoserver</literal> can "
-#| "be resolved by DNS, perhaps after adding the local domain if that was "
-#| "provided by DHCP. If this was done at a site where the domain is "
-#| "<literal>example.com</literal>, and they have a reasonably sane DHCP "
-#| "setup, it would result in the preseed file being retrieved from "
-#| "<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
-#| "literal>."
 msgid ""
 "There are several features of &debian; Installer that combine to allow "
 "fairly simple command lines at the boot prompt to result in arbitrarily "
@@ -563,9 +550,15 @@ msgid ""
 "in the preseed file being retrieved from <literal>http://autoserver.example."
 "com/d-i/&releasename;/./preseed.cfg</literal>."
 msgstr ""
-"&debian; 安装程序提供了一些特性，可以组合引导提示符后面的简单命令行，达到复杂的自动安装效果。为了表达清楚，这里有一些例子，可以用在引导提示符后面：<informalexample><screen>\n"
+"&debian; 安装程序提供了一些特性，可以组合引导提示符后面的简单命令行，达到复杂"
+"的自动安装效果。为了表达清楚，这里有一些例子，可以用在引导提示符后面："
+"<informalexample><screen>\n"
 "auto url=autoserver\n"
-"</screen></informalexample> 这需要一个 DHCP 服务器能找到并且 DNS 可以解析 <literal>autoserver</literal>，或许要加上 DHCP 提供的本地域名。 如果域名是 <literal>example.com</literal>，并有相应的 DHCP 设置，那么预置文件将从 <literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</literal> 获得。"
+"</screen></informalexample> 这需要一个 DHCP 服务器能找到并且 DNS 可以解析 "
+"<literal>autoserver</literal>，或许要加上 DHCP 提供的本地域名。 如果域名是 "
+"<literal>example.com</literal>，并有相应的 DHCP 设置，那么预置文件将从 "
+"<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
+"literal> 获得。"
 
 #. Tag: para
 #: preseed.xml:398
@@ -922,14 +915,6 @@ msgstr "使用 DHCP 服务器指定预置文件"
 #. Tag: para
 #: preseed.xml:537
 #, no-c-format
-#| msgid ""
-#| "It's also possible to use DHCP to specify a preconfiguration file to "
-#| "download from the network. DHCP allows specifying a filename. Normally "
-#| "this is a file to netboot, but if it appears to be an URL then "
-#| "installation media that support network preseeding will download the file "
-#| "from the URL and use it as a preconfiguration file. Here is an example of "
-#| "how to set it up in the dhcpd.conf for version 3 of the ISC DHCP server "
-#| "(the dhcp3-server Debian package)."
 msgid ""
 "It's also possible to use DHCP to specify a preconfiguration file to "
 "download from the network. DHCP allows specifying a filename. Normally this "
@@ -938,7 +923,11 @@ msgid ""
 "it as a preconfiguration file. Here is an example of how to set it up in the "
 "dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
-msgstr "还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下载，并用作预置文件。这里有一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。"
+msgstr ""
+"还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 "
+"netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下"
+"载，并用作预置文件。这里有一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服"
+"务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。"
 
 #. Tag: screen
 #: preseed.xml:548
@@ -968,19 +957,16 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:557
 #, no-c-format
-#| msgid ""
-#| "A good way to use the DHCP preseeding is to only preseed values specific "
-#| "to your network, such as the Debian mirror to use. This way installs on "
-#| "your network will automatically get a good mirror selected, but the rest "
-#| "of the installation can be performed interactively. Using DHCP preseeding "
-#| "to fully automate Debian installs should only be done with care."
 msgid ""
 "A good way to use the DHCP preseeding is to only preseed values specific to "
 "your network, such as the &debian; mirror to use. This way installs on your "
 "network will automatically get a good mirror selected, but the rest of the "
 "installation can be performed interactively. Using DHCP preseeding to fully "
 "automate &debian; installs should only be done with care."
-msgstr "使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 &debian; 镜像。这种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互进行。使用 DHCP 预置进行完整的 &debian; 自动安装应该特别小心。"
+msgstr ""
+"使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 &debian; 镜像。"
+"这种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互"
+"进行。使用 DHCP 预置进行完整的 &debian; 自动安装应该特别小心。"
 
 #. Tag: title
 #: preseed.xml:571
@@ -1843,20 +1829,41 @@ msgstr "使用 RAID 分区"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
+msgstr ""
+"您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10，建立降级阵"
+"列(degraded arrays)和指定额外设备。如果使用了 RAID 1，您可以预置 grub 来安装"
+"阵列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
+
+#. Tag: para
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
 msgstr ""
 "您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10，建立降级阵"
 "列(degraded arrays)和指定额外设备。如果使用了 RAID 1，您可以预置 grub 来安装"
 "阵列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -1870,7 +1877,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>。"
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -1974,13 +1981,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "分区挂载控制"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -1996,7 +2003,7 @@ msgstr ""
 "系统仍然使用 UUID 方式挂载。"
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2006,7 +2013,7 @@ msgstr ""
 "挂载。"
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2020,7 +2027,7 @@ msgstr ""
 "后会出现一些随机的情况。"
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2038,13 +2045,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2053,7 +2060,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2085,13 +2092,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2102,7 +2109,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2115,7 +2122,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2173,7 +2180,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2190,26 +2197,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "下面的命令可用于生成密码的 MD5 值。"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2222,7 +2229,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2280,13 +2287,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2294,73 +2301,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括："
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2371,7 +2378,7 @@ msgstr ""
 "<userinput>standard</userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2385,7 +2392,7 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2423,22 +2430,26 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装 bootloader"
 
 #. Tag: screen
-#: preseed.xml:1084
-#, no-c-format
+#: preseed.xml:1087
+#, fuzzy, no-c-format
 #| msgid ""
-#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
 #| "# instead, uncomment this:\n"
 #| "#d-i grub-installer/skip boolean true\n"
 #| "# To also skip installing lilo, and install no bootloader, uncomment "
 #| "this\n"
 #| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
 #| "\n"
 #| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
 #| "the\n"
@@ -2509,6 +2520,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2521,13 +2534,15 @@ msgid ""
 "# Note: options passed to the installer will be added automatically.\n"
 "#d-i debian-installer/add-kernel-opts string nousb"
 msgstr ""
-"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If you want lilo installed\n"
+"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
+"you want lilo installed\n"
 "# instead, uncomment this:\n"
 "#d-i grub-installer/skip boolean true\n"
 "# To also skip installing lilo, and install no bootloader, uncomment this\n"
 "# too:\n"
 "#d-i lilo-installer/skip boolean true</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment this\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
+"this\n"
 "#d-i grub-installer/skip boolean true</phrase>\n"
 "\n"
 "# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
@@ -2535,11 +2550,13 @@ msgstr ""
 "# uncomment this:\n"
 "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
 "\n"
-"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
+"# This is fairly safe to set, it makes grub install automatically to the "
+"MBR\n"
 "# if no other operating system is detected on the machine.\n"
 "d-i grub-installer/only_debian boolean true\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some other\n"
+"# This one makes grub-installer install to the MBR if it also finds some "
+"other\n"
 "# OS, which is less safe as it might not be able to boot that other OS.\n"
 "d-i grub-installer/with_other_os boolean true\n"
 "\n"
@@ -2563,7 +2580,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2575,13 +2592,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2621,13 +2638,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2647,19 +2664,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2669,7 +2686,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2717,13 +2734,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2747,7 +2764,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2760,7 +2777,7 @@ msgstr ""
 "\"preseed-bootparms\"/> 的脚注。"
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2781,13 +2798,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2801,7 +2818,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2851,7 +2868,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 601b5ed75..edfb41e0e 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-26 19:11+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -800,8 +800,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS 服务器"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -814,23 +842,14 @@ msgstr ""
 "同；您应该留有 350MB 以上的空间用来下载和安装。"
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
-#| msgid ""
-#| "This section explains how to install &debian-gnu; from an existing Unix "
-#| "or Linux system, without using the menu-driven installer as explained in "
-#| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
-#| "SUSE. In this section some familiarity with entering *nix commands and "
-#| "navigating the file system is assumed. In this section, <prompt>$</"
-#| "prompt> symbolizes a command to be entered in the user's current system, "
-#| "while <prompt>#</prompt> refers to a command entered in the Debian chroot."
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
@@ -840,37 +859,33 @@ msgid ""
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
 "<prompt>#</prompt> refers to a command entered in the &debian; chroot."
-msgstr "本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册其余部分谈到的由菜单驱动的安装程序。这篇<quote>交叉安装(cross-install)</quote> HOWTO 是应那些原来使用 Redhat、Mandriva 和 SUSE，现转到 &debian-gnu; 的用户撰写的。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中穿梭移动并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当前使用的系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 &debian; chroot 环境中输入的。"
+msgstr ""
+"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册"
+"其余部分谈到的由菜单驱动的安装程序。这篇<quote>交叉安装(cross-install)</"
+"quote> HOWTO 是应那些原来使用 Redhat、Mandriva 和 SUSE，现转到 &debian-gnu; "
+"的用户撰写的。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中穿梭移动"
+"并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当前使用的"
+"系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 &debian; chroot 环境中"
+"输入的。"
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
-#| msgid ""
-#| "Once you've got the new Debian system configured to your preference, you "
-#| "can migrate your existing user data (if any) to it, and keep on rolling. "
-#| "This is therefore a <quote>zero downtime</quote> &debian-gnu; install. "
-#| "It's also a clever way for dealing with hardware that otherwise doesn't "
-#| "play friendly with various boot or installation media."
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
 "can migrate your existing user data (if any) to it, and keep on rolling. "
 "This is therefore a <quote>zero downtime</quote> &debian-gnu; install. It's "
 "also a clever way for dealing with hardware that otherwise doesn't play "
 "friendly with various boot or installation media."
-msgstr "一旦您根据自己的要求配置好了新的 &debian; 系统，就可以将您原来系统中的用户数据(如果有的话)悉数迁移到新系统里去。然后就能继续爽了。一言以蔽之，这是一次<quote>不停机</quote>的 &debian-gnu; 安装。同时，这也是处理那些因为硬件原因不能通过任何引导或者安装介质完成安装的权宜之计。"
+msgstr ""
+"一旦您根据自己的要求配置好了新的 &debian; 系统，就可以将您原来系统中的用户数"
+"据(如果有的话)悉数迁移到新系统里去。然后就能继续爽了。一言以蔽之，这是一次"
+"<quote>不停机</quote>的 &debian-gnu; 安装。同时，这也是处理那些因为硬件原因不"
+"能通过任何引导或者安装介质完成安装的权宜之计。"
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
-#| msgid ""
-#| "As this is a mostly manual procedure, you should bear in mind that you "
-#| "will need to do a lot of basic configuration of the system yourself, "
-#| "which will also require more knowledge of Debian and of &arch-kernel; in "
-#| "general than performing a regular installation. You cannot expect this "
-#| "procedure to result in a system that is identical to a system from a "
-#| "regular installation. You should also keep in mind that this procedure "
-#| "only gives the basic steps to set up a system. Additional installation "
-#| "and/or configuration steps may be needed."
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
 "need to do a lot of basic configuration of the system yourself, which will "
@@ -880,16 +895,20 @@ msgid ""
 "installation. You should also keep in mind that this procedure only gives "
 "the basic steps to set up a system. Additional installation and/or "
 "configuration steps may be needed."
-msgstr "由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，并且要具有比常规安装更多的 &debian; 和 &arch-kernel; 知识。不要期望这种执行的结果与常规安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能还需要额外的安装、或者配置步骤。"
+msgstr ""
+"由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，"
+"并且要具有比常规安装更多的 &debian; 和 &arch-kernel; 知识。不要期望这种执行的"
+"结果与常规安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能"
+"还需要额外的安装、或者配置步骤。"
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "准备开始"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -903,7 +922,7 @@ msgstr ""
 "空间了(安装 GNOME 或 KDE 这样的桌面环境，还要更多)。"
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -921,18 +940,8 @@ msgstr ""
 "userinput>。"
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
-#| msgid ""
-#| "Initialize and activate swap (substitute the partition number for your "
-#| "intended Debian swap partition): <informalexample><screen>\n"
-#| "# mkswap /dev/<replaceable>hda5</replaceable>\n"
-#| "# sync; sync; sync\n"
-#| "# swapon /dev/<replaceable>hda5</replaceable>\n"
-#| "</screen></informalexample> Mount one partition as <filename>/mnt/"
-#| "debinst</filename> (the installation point, to be the root (<filename>/</"
-#| "filename>) filesystem on your new system). The mount point name is "
-#| "strictly arbitrary, it is referenced later below."
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
 "intended &debian; swap partition): <informalexample><screen>\n"
@@ -944,14 +953,17 @@ msgid ""
 "filesystem on your new system). The mount point name is strictly arbitrary, "
 "it is referenced later below."
 msgstr ""
-"初始化并激活交换分区(请把分区号替换成您希望用作 &debian; 交换分区的分区号): <informalexample><screen>\n"
+"初始化并激活交换分区(请把分区号替换成您希望用作 &debian; 交换分区的分区号): "
+"<informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
-"</screen></informalexample> 把一个分区挂载到 <filename>/mnt/debinst</filename>(这是安装的位置，将来作为您新系统的根(<filename>/</filename>)文件系统)。挂载点的名称是任意的，后面的步骤将会用到。"
+"</screen></informalexample> 把一个分区挂载到 <filename>/mnt/debinst</"
+"filename>(这是安装的位置，将来作为您新系统的根(<filename>/</filename>)文件系"
+"统)。挂载点的名称是任意的，后面的步骤将会用到。"
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -961,7 +973,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -972,25 +984,14 @@ msgstr ""
 "手动创建和加载这些目录。"
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
-#| msgid ""
-#| "The utility used by the Debian installer, and recognized as the official "
-#| "way to install a Debian base system, is <command>debootstrap</command>. "
-#| "It uses <command>wget</command> and <command>ar</command>, but otherwise "
-#| "depends only on <classname>/bin/sh</classname> and basic Unix/Linux "
-#| "tools<footnote> <para> These include the GNU core utilities and commands "
-#| "like <command>sed</command>, <command>grep</command>, <command>tar</"
-#| "command> and <command>gzip</command>. </para> </footnote>. Install "
-#| "<command>wget</command> and <command>ar</command> if they aren't already "
-#| "on your current system, then download and install <command>debootstrap</"
-#| "command>."
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
 "way to install a &debian; base system, is <command>debootstrap</command>. It "
@@ -1001,22 +1002,19 @@ msgid ""
 "and <command>gzip</command>. </para> </footnote>. Install <command>wget</"
 "command> and <command>ar</command> if they aren't already on your current "
 "system, then download and install <command>debootstrap</command>."
-msgstr "&ebian; 安装程序使用的工具，同时也作为安装 &debian; 基本系统的正式方法，是 <command>debootstrap</command>。它调用了 <command>wget</command> 和 <command>ar</command>，而其他的仅依赖 <classname>/bin/sh</classname> 和基本的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令，像 <command>sed</command>、<command>grep</command>、<command>tar</command> 和 <command>gzip</command>。</para> </footnote>。如果您的系统里还没有 <command>wget</command> 和 <command>ar</command>，首先安装它们，然后下载并安装 <command>debootstrap</command>。"
+msgstr ""
+"&ebian; 安装程序使用的工具，同时也作为安装 &debian; 基本系统的正式方法，是 "
+"<command>debootstrap</command>。它调用了 <command>wget</command> 和 "
+"<command>ar</command>，而其他的仅依赖 <classname>/bin/sh</classname> 和基本"
+"的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令，像 "
+"<command>sed</command>、<command>grep</command>、<command>tar</command> 和 "
+"<command>gzip</command>。</para> </footnote>。如果您的系统里还没有 "
+"<command>wget</command> 和 <command>ar</command>，首先安装它们，然后下载并安"
+"装 <command>debootstrap</command>。"
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
-#| msgid ""
-#| "Or, you can use the following procedure to install it manually. Make a "
-#| "work folder for extracting the .deb into: <informalexample><screen>\n"
-#| "# mkdir work\n"
-#| "# cd work\n"
-#| "</screen></informalexample> The <command>debootstrap</command> binary is "
-#| "located in the Debian archive (be sure to select the proper file for your "
-#| "architecture). Download the <command>debootstrap</command> .deb from the "
-#| "<ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> "
-#| "pool</ulink>, copy the package to the work folder, and extract the files "
-#| "from it. You will need to have root privileges to install the files."
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
 "folder for extracting the .deb into: <informalexample><screen>\n"
@@ -1029,13 +1027,18 @@ msgid ""
 "ulink>, copy the package to the work folder, and extract the files from it. "
 "You will need to have root privileges to install the files."
 msgstr ""
-"或者您也可以通过下面的步骤手动安装。先新建一个 work 目录，用于解压 .deb 文件： <informalexample><screen>\n"
+"或者您也可以通过下面的步骤手动安装。先新建一个 work 目录，用于解压 .deb 文"
+"件： <informalexample><screen>\n"
 "# mkdir work\n"
 "# cd work\n"
-"</screen></informalexample> <command>debootstrap</command> 的二进制文件位于 &debian; archive (请确保选择了合适的架构文件)。下载 <command>debootstrap</command> .deb，它位于 <ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> pool</ulink>，把软件包拷贝到 work 目录，并解压该文件。要将这些文件安装到系统，您需要 root 权限。"
+"</screen></informalexample> <command>debootstrap</command> 的二进制文件位于 "
+"&debian; archive (请确保选择了合适的架构文件)。下载 <command>debootstrap</"
+"command> .deb，它位于 <ulink url=\"http://ftp.debian.org/debian/pool/main/d/"
+"debootstrap/\"> pool</ulink>，把软件包拷贝到 work 目录，并解压该文件。要将这"
+"些文件安装到系统，您需要 root 权限。"
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1047,30 +1050,28 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
-#| msgid ""
-#| "<command>debootstrap</command> can download the needed files directly "
-#| "from the archive when you run it. You can substitute any Debian archive "
-#| "mirror for <userinput>&archive-mirror;/debian</userinput> in the command "
-#| "example below, preferably a mirror close to you network-wise. Mirrors are "
-#| "listed at <ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
 "the archive when you run it. You can substitute any &debian; archive mirror "
 "for <userinput>&archive-mirror;/debian</userinput> in the command example "
 "below, preferably a mirror close to you network-wise. Mirrors are listed at "
 "<ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
-msgstr "运行 <command>debootstrap</command> 后，它会从 archive 直接下载所需的文件。在下面的命令示例中，您可以根据自己的网络情况，选择一个较近的 &debian; archive 镜像，替换 <userinput>&archive-mirror;/debian</userinput>。镜像列表位于 <ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
+msgstr ""
+"运行 <command>debootstrap</command> 后，它会从 archive 直接下载所需的文件。在"
+"下面的命令示例中，您可以根据自己的网络情况，选择一个较近的 &debian; archive "
+"镜像，替换 <userinput>&archive-mirror;/debian</userinput>。镜像列表位于 "
+"<ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1082,7 +1083,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1102,7 +1103,7 @@ msgstr ""
 "<userinput>s390</userinput>, or <userinput>sparc</userinput>。"
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1112,21 +1113,14 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基本系统的配置"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
-#| msgid ""
-#| "Now you've got a real Debian system, though rather lean, on disk. "
-#| "<command>chroot</command> into it: <informalexample><screen>\n"
-#| "# LANG=C chroot /mnt/debinst /bin/bash\n"
-#| "</screen></informalexample> After chrooting you may need to set the "
-#| "terminal definition to be compatible with the Debian base system, for "
-#| "example:"
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
 "<command>chroot</command> into it: <informalexample><screen>\n"
@@ -1134,24 +1128,26 @@ msgid ""
 "</screen></informalexample> After chrooting you may need to set the terminal "
 "definition to be compatible with the &debian; base system, for example:"
 msgstr ""
-"现在您的磁盘上已经有了一个功能虽弱但却是真正的 &debian; 系统。键入 <command>chroot</command> 命令进入：<informalexample><screen>\n"
+"现在您的磁盘上已经有了一个功能虽弱但却是真正的 &debian; 系统。键入 "
+"<command>chroot</command> 命令进入：<informalexample><screen>\n"
 "# LANG=C chroot /mnt/debinst /bin/bash\n"
-"</screen></informalexample> 然后您需要设置与 &debian; 基本系统兼容的终端定义，例如："
+"</screen></informalexample> 然后您需要设置与 &debian; 基本系统兼容的终端定"
+"义，例如："
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "创建设备文件"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1168,19 +1164,19 @@ msgstr ""
 "静态设备文件。"
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "可以使用的选项有："
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr "创建默认的静态设备文件，使用"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1190,14 +1186,14 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr "手动创建指定的设备文件，使用 <command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1208,55 +1204,14 @@ msgstr ""
 "postinst 脚本会创建设备文件，所以要小心使用改选项。"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分区的挂载"
 
 #. Tag: para
-#: random-bits.xml:591
-#, no-c-format
-#| msgid ""
-#| "You need to create <filename>/etc/fstab</filename>. "
-#| "<informalexample><screen>\n"
-#| "# editor /etc/fstab\n"
-#| "</screen></informalexample> Here is a sample you can modify to suit: "
-#| "<informalexample><screen>\n"
-#| "# /etc/fstab: static file system information.\n"
-#| "#\n"
-#| "# file system    mount point   type    options                  dump "
-#| "pass\n"
-#| "/dev/XXX         /             ext3    defaults                 0    1\n"
-#| "/dev/XXX         /boot         ext3    ro,nosuid,nodev          0    2\n"
-#| "\n"
-#| "/dev/XXX         none          swap    sw                       0    0\n"
-#| "proc             /proc         proc    defaults                 0    0\n"
-#| "\n"
-#| "/dev/fd0         /media/floppy auto    noauto,rw,sync,user,exec 0    0\n"
-#| "/dev/cdrom       /media/cdrom  iso9660 noauto,ro,user,exec      0    0\n"
-#| "\n"
-#| "/dev/XXX         /tmp          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /var          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /usr          ext3    rw,nodev                 0    2\n"
-#| "/dev/XXX         /home         ext3    rw,nosuid,nodev          0    2\n"
-#| "</screen></informalexample> Use <userinput>mount -a</userinput> to mount "
-#| "all the file systems you have specified in your <filename>/etc/fstab</"
-#| "filename>, or, to mount file systems individually, use: "
-#| "<informalexample><screen>\n"
-#| "# mount /path   # e.g.: mount /usr\n"
-#| "</screen></informalexample> Current Debian systems have mountpoints for "
-#| "removable media under <filename>/media</filename>, but keep compatibility "
-#| "symlinks in <filename>/</filename>. Create these as as needed, for "
-#| "example: <informalexample><screen>\n"
-#| "# cd /media\n"
-#| "# mkdir cdrom0\n"
-#| "# ln -s cdrom0 cdrom\n"
-#| "# cd /\n"
-#| "# ln -s media/cdrom\n"
-#| "</screen></informalexample> You can mount the proc file system multiple "
-#| "times and to arbitrary locations, though <filename>/proc</filename> is "
-#| "customary. If you didn't use <userinput>mount -a</userinput>, be sure to "
-#| "mount proc before continuing:"
+#: random-bits.xml:598
+#, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1299,7 +1254,8 @@ msgid ""
 msgstr ""
 "您需要新建 <filename>/etc/fstab</filename>。<informalexample><screen>\n"
 "# editor /etc/fstab\n"
-"</screen></informalexample> 这里有个样板，您可以根据自己的情况对它进行修改：<informalexample><screen>\n"
+"</screen></informalexample> 这里有个样板，您可以根据自己的情况对它进行修改："
+"<informalexample><screen>\n"
 "# /etc/fstab: static file system information.\n"
 "#\n"
 "# file system    mount point   type    options                  dump pass\n"
@@ -1316,24 +1272,31 @@ msgstr ""
 "/dev/XXX         /var          ext3    rw,nosuid,nodev          0    2\n"
 "/dev/XXX         /usr          ext3    rw,nodev                 0    2\n"
 "/dev/XXX         /home         ext3    rw,nosuid,nodev          0    2\n"
-"</screen></informalexample> 可以通过 <userinput>mount -a</userinput> 来挂载 <filename>/etc/fstab</filename> 中所标明的所有文件系统，您也可以逐个分别地挂载这些文件系统，像：<informalexample><screen>\n"
+"</screen></informalexample> 可以通过 <userinput>mount -a</userinput> 来挂载 "
+"<filename>/etc/fstab</filename> 中所标明的所有文件系统，您也可以逐个分别地挂"
+"载这些文件系统，像：<informalexample><screen>\n"
 "# mount /path   # e.g.: mount /usr\n"
-"</screen></informalexample> 当前的 &debian; 系统为可移动介质创建的挂载点位于 <filename>/media</filename>, 但为了保持兼容，仍有符号链接处于 <filename>/</filename> 目录下面。 如果需要，可以像下面这样创建这些挂载点: <informalexample><screen>\n"
+"</screen></informalexample> 当前的 &debian; 系统为可移动介质创建的挂载点位于 "
+"<filename>/media</filename>, 但为了保持兼容，仍有符号链接处于 <filename>/</"
+"filename> 目录下面。 如果需要，可以像下面这样创建这些挂载点: "
+"<informalexample><screen>\n"
 "# cd /media\n"
 "# mkdir cdrom0\n"
 "# ln -s cdrom0 cdrom\n"
 "# cd /\n"
 "# ln -s media/cdrom\n"
-"</screen></informalexample> 您可以多次挂载 proc 文件系统，通常是在 <filename>/proc</filename> 位置，但也可以选择任意的地方。如果没有使用 <userinput>mount -a</userinput>，请在进入下一步前先将 proc 挂载："
+"</screen></informalexample> 您可以多次挂载 proc 文件系统，通常是在 "
+"<filename>/proc</filename> 位置，但也可以选择任意的地方。如果没有使用 "
+"<userinput>mount -a</userinput>，请在进入下一步前先将 proc 挂载："
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1344,19 +1307,19 @@ msgstr ""
 "chroot: 以外加载 proc。"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "设置时区"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1368,7 +1331,7 @@ msgstr ""
 "间解释硬件时钟。下面命令可以让您设定和选择时区。"
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1378,13 +1341,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "网络的配置"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1506,13 +1469,13 @@ msgstr ""
 "with the interface name (eth0, eth1, etc.) that you expect."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "配置 Apt"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1537,13 +1500,13 @@ msgstr ""
 "update</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "本地化和键盘的配置"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1561,7 +1524,7 @@ msgstr ""
 "</screen></informalexample> 配置您的键盘(如果需要)："
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1571,7 +1534,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1579,13 +1542,13 @@ msgid ""
 msgstr "注意，在 chroot 里面不能设置键盘，但重新启动以后可以。"
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "内核的安装"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1595,58 +1558,50 @@ msgstr ""
 "以用下面指令找到那些预先打包的内核："
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "然后根据所选取的软件包名称安装内核软件包。"
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
 "replaceable>"
-msgstr "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable>"
+msgstr ""
+"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
+"replaceable>"
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, no-c-format
-#| msgid ""
-#| "To make your &debian-gnu; system bootable, set up your boot loader to "
-#| "load the installed kernel with your new root partition. Note that "
-#| "<command>debootstrap</command> does not install a boot loader, though you "
-#| "can use <command>aptitude</command> inside your Debian chroot to do so."
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
 "the installed kernel with your new root partition. Note that "
 "<command>debootstrap</command> does not install a boot loader, though you "
 "can use <command>aptitude</command> inside your &debian; chroot to do so."
-msgstr "要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot loader，因此您要在 &debian; 的 chroot 中使用 <command>aptitude</command> 完成。"
+msgstr ""
+"要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的"
+"内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
+"loader，因此您要在 &debian; 的 chroot 中使用 <command>aptitude</command> 完"
+"成。"
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, no-c-format
-#| msgid ""
-#| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
-#| "userinput> for instructions on setting up the bootloader. If you are "
-#| "keeping the system you used to install Debian, just add an entry for the "
-#| "Debian install to your existing grub <filename>menu.lst</filename> or "
-#| "<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
-#| "could also copy it to the new system and edit it there. After you are "
-#| "done editing, call <command>lilo</command> (remember it will use "
-#| "<filename>lilo.conf</filename> relative to the system you call it from)."
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
 "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
@@ -1657,10 +1612,18 @@ msgid ""
 "new system and edit it there. After you are done editing, call "
 "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> "
 "relative to the system you call it from)</phrase>."
-msgstr "通过 <userinput>info grub</userinput> <phrase arch=\"x86\"> 或 <userinput>man lilo.conf</userinput></phrase> 可以看到有关设置 bootloader 的指导。如果希望保留用来安装 &debian; 的系统，只需要为 &debian; 系统添加一条配置信息到在现有的 grub <filename>menu.lst</filename><phrase arch=\"x86\"> 或 <filename>lilo.conf</filename>。对于 <filename>lilo.conf</filename>，您也可以把这个文件拷贝到新的系统里，然后在新的系统里编辑它。修改好配置，运行 <command>lilo</command>(请记住，在哪个系统里运行 lilo，它就会用哪个系统里的 <filename>lilo.conf</filename>)</phrase>。"
+msgstr ""
+"通过 <userinput>info grub</userinput> <phrase arch=\"x86\"> 或 "
+"<userinput>man lilo.conf</userinput></phrase> 可以看到有关设置 bootloader 的"
+"指导。如果希望保留用来安装 &debian; 的系统，只需要为 &debian; 系统添加一条配"
+"置信息到在现有的 grub <filename>menu.lst</filename><phrase arch=\"x86\"> 或 "
+"<filename>lilo.conf</filename>。对于 <filename>lilo.conf</filename>，您也可以"
+"把这个文件拷贝到新的系统里，然后在新的系统里编辑它。修改好配置，运行 "
+"<command>lilo</command>(请记住，在哪个系统里运行 lilo，它就会用哪个系统里的 "
+"<filename>lilo.conf</filename>)</phrase>。"
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1682,7 +1645,7 @@ msgstr ""
 "boot/grub/menu.lst</filename>。"
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1693,13 +1656,13 @@ msgstr ""
 "是安装 <command>grub</command>，但本附录中不讨论。"
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "下面有一个简单的<filename>/etc/lilo.conf</filename> 作为例子："
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1721,16 +1684,8 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
-#| msgid ""
-#| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
-#| "up the bootloader. If you are keeping the system you used to install "
-#| "Debian, just add an entry for the Debian install to your existing "
-#| "<filename>yaboot.conf</filename>. You could also copy it to the new "
-#| "system and edit it there. After you are done editing, call ybin (remember "
-#| "it will use <filename>yaboot.conf</filename> relative to the system you "
-#| "call it from)."
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
 "the bootloader. If you are keeping the system you used to install &debian;, "
@@ -1738,10 +1693,15 @@ msgid ""
 "conf</filename>. You could also copy it to the new system and edit it there. "
 "After you are done editing, call ybin (remember it will use <filename>yaboot."
 "conf</filename> relative to the system you call it from)."
-msgstr "通过查阅 <userinput>man yaboot.conf</userinput> 可以得到一些有关设置 bootloader 的提示。如果您希望继续保留用来安装 &debian; 的系统，那么在 <filename>yaboot.conf</filename> 里为 &debian; 系统添加一条配置就可以了。您也可以把这个文件拷贝到新的系统里，然后在新的系统里编辑它。当您修改完毕配置，运行 ybin (请记住，您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
+msgstr ""
+"通过查阅 <userinput>man yaboot.conf</userinput> 可以得到一些有关设置 "
+"bootloader 的提示。如果您希望继续保留用来安装 &debian; 的系统，那么在 "
+"<filename>yaboot.conf</filename> 里为 &debian; 系统添加一条配置就可以了。您也"
+"可以把这个文件拷贝到新的系统里，然后在新的系统里编辑它。当您修改完毕配置，运"
+"行 ybin (请记住，您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1771,13 +1731,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1796,7 +1756,7 @@ msgstr ""
 "装单独的软件包。"
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1807,36 +1767,33 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
-#| msgid ""
-#| "This section explains how to install &debian-gnu; on a computer without "
-#| "an Ethernet card, but with just a remote gateway computer attached via a "
-#| "Null-Modem cable (also called Null-Printer cable). The gateway computer "
-#| "should be connected to a network that has a Debian mirror on it (e.g. to "
-#| "the Internet)."
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
 "Ethernet card, but with just a remote gateway computer attached via a Null-"
 "Modem cable (also called Null-Printer cable). The gateway computer should be "
 "connected to a network that has a &debian; mirror on it (e.g. to the "
 "Internet)."
-msgstr "本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连接到具有 &debian; 镜像的网络(比如，互联网)。"
+msgstr ""
+"本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-"
+"Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连"
+"接到具有 &debian; 镜像的网络(比如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1850,7 +1807,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1861,7 +1818,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1873,30 +1830,27 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
-#| msgid ""
-#| "A target computer, called <emphasis>target</emphasis>, where Debian will "
-#| "be installed."
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
 "be installed."
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 &debian;。"
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1905,7 +1859,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1916,13 +1870,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1932,7 +1886,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1974,13 +1928,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2004,13 +1958,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2020,13 +1974,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2039,7 +1993,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2050,19 +2004,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2070,7 +2024,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2080,7 +2034,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2090,13 +2044,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2110,7 +2064,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2121,7 +2075,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2134,7 +2088,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2142,7 +2096,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2157,7 +2111,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2175,7 +2129,7 @@ msgstr ""
 "footnote>)。"
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2183,7 +2137,7 @@ msgid ""
 msgstr "下一步是侦测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2194,7 +2148,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2208,7 +2162,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2216,7 +2170,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息(PPPoE 用户名和密码)。"
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2233,13 +2187,13 @@ msgstr ""
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2252,7 +2206,7 @@ msgstr ""
 "前端。"
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2267,7 +2221,7 @@ msgstr ""
 "有一些优点，比如可以使用鼠标，以及在一个屏幕下显示多个问题。"
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2287,15 +2241,8 @@ msgstr ""
 "<quote>Help</quote> 选项选取后看到。"
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
-#| msgid ""
-#| "There is also a graphical installer image that can be netbooted. And "
-#| "there is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso"
-#| "\"> <para> The mini ISO image can be downloaded from a Debian mirror as "
-#| "described in <xref linkend=\"downloading-files\"/>. Look for "
-#| "<filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is "
-#| "mainly useful for testing."
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
 "is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso\"> "
@@ -2303,19 +2250,15 @@ msgid ""
 "described in <xref linkend=\"downloading-files\"/>. Look for "
 "<filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is "
 "mainly useful for testing."
-msgstr "图形安装程序的映象也可用于网络引导。有一个特殊的 <quote>mini</quote> ISO 映象<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映象可在 &debian; 镜像的 <xref linkend=\"downloading-files\"/> 里下载。名字是 <filename>netboot/gtk/mini.iso</filename>。</para> </footnote>，主要用于测试。"
+msgstr ""
+"图形安装程序的映象也可用于网络引导。有一个特殊的 <quote>mini</quote> ISO 映象"
+"<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映象可在 &debian; 镜像的 "
+"<xref linkend=\"downloading-files\"/> 里下载。名字是 <filename>netboot/gtk/"
+"mini.iso</filename>。</para> </footnote>，主要用于测试。"
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
-#| msgid ""
-#| "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
-#| "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
-#| "can be downloaded from a Debian mirror as described in <xref linkend="
-#| "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</"
-#| "filename>. </para> </footnote>. It should work on almost all PowerPC "
-#| "systems that have an ATI graphical card, but is unlikely to work on other "
-#| "systems."
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
 "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
@@ -2323,10 +2266,15 @@ msgid ""
 "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. "
 "</para> </footnote>. It should work on almost all PowerPC systems that have "
 "an ATI graphical card, but is unlikely to work on other systems."
-msgstr "对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 中的一个 &debian; 镜像下载，名为 <filename>netboot/gtk/mini.iso</filename>。</para> </footnote>。它可以工作在所有使用 ATI 图形卡的 PowerPC 系统上，但其它的不行。"
+msgstr ""
+"对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用"
+"<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend="
+"\"downloading-files\"/> 中的一个 &debian; 镜像下载，名为 <filename>netboot/"
+"gtk/mini.iso</filename>。</para> </footnote>。它可以工作在所有使用 ATI 图形卡"
+"的 PowerPC 系统上，但其它的不行。"
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2334,7 +2282,7 @@ msgid ""
 msgstr "如同一般安装程序，它也可以在启动图形安装界面时添加引导参数。"
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2346,7 +2294,7 @@ msgstr ""
 "内存条件，它将自动回到普通的 <quote>newt</quote> 前端。"
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2358,13 +2306,13 @@ msgstr ""
 "程序可能根本无法启动。因此建议在较少内存的系统上使用普通安装程序。"
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "使用图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2375,7 +2323,7 @@ msgstr ""
 "用来给您的安装过程进行指导。"
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2392,7 +2340,7 @@ msgstr ""
 "换选择，而不是激活 &BTN-CONT; 。"
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2403,7 +2351,7 @@ msgstr ""
 "帮助信息可以通过该按钮或者按下 <keycap>F1</keycap> 键。"
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index e30a0ddc7..36d16099d 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:56+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -15,7 +15,6 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:5
 #, no-c-format
-#| msgid "Using the Debian Installer"
 msgid "Using the &debian; Installer"
 msgstr "使用 &debian; 安装程序"
 
@@ -28,19 +27,16 @@ msgstr "安装程序如何工作"
 #. Tag: para
 #: using-d-i.xml:8
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer consists of a number of special-purpose components "
-#| "to perform each installation task. Each component performs its task, "
-#| "asking the user questions as necessary to do its job. The questions "
-#| "themselves are given priorities, and the priority of questions to be "
-#| "asked is set when the installer is started."
 msgid ""
 "The &debian; Installer consists of a number of special-purpose components to "
 "perform each installation task. Each component performs its task, asking the "
 "user questions as necessary to do its job. The questions themselves are "
 "given priorities, and the priority of questions to be asked is set when the "
 "installer is started."
-msgstr "&debian; 安装程序由一些特定功能的组件组成，它们完成各自的安装任务。每一组件执行任务时，会询问一些任务相关的问题。每个任务又有各自的优先级，在安装程序开始时可以设置优先级以决定哪些问题会被询问。"
+msgstr ""
+"&debian; 安装程序由一些特定功能的组件组成，它们完成各自的安装任务。每一组件执"
+"行任务时，会询问一些任务相关的问题。每个任务又有各自的优先级，在安装程序开始"
+"时可以设置优先级以决定哪些问题会被询问。"
 
 #. Tag: para
 #: using-d-i.xml:16
@@ -320,7 +316,6 @@ msgstr "cdrom-detect"
 #. Tag: para
 #: using-d-i.xml:185
 #, no-c-format
-#| msgid "Looks for and mounts a Debian installation CD."
 msgid "Looks for and mounts a &debian; installation CD."
 msgstr "寻找并挂载 &debian; 安装光盘。"
 
@@ -360,9 +355,6 @@ msgstr "choose-mirror"
 #. Tag: para
 #: using-d-i.xml:210
 #, no-c-format
-#| msgid ""
-#| "Presents a list of Debian archive mirrors. The user may choose the source "
-#| "of his installation packages."
 msgid ""
 "Presents a list of &debian; archive mirrors. The user may choose the source "
 "of his installation packages."
@@ -416,11 +408,23 @@ msgstr "Anna's Not Nearly APT。安装从选择的镜像或 CD 获取的软件�
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "建立 root 密码，然后添加一个非 root 用户。"
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -428,46 +432,43 @@ msgid ""
 msgstr "更新系统时钟，并决定时钟是否使用 UTC。"
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "选择时区，并基于前面选择的地点。"
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
-#| msgid ""
-#| "Allows the user to partition disks attached to the system, create file "
-#| "systems on the selected partitions, and attach them to the mountpoints. "
-#| "Included are also interesting features like a fully automatic mode or LVM "
-#| "support. This is the preferred partitioning tool in Debian."
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
 "systems on the selected partitions, and attach them to the mountpoints. "
 "Included are also interesting features like a fully automatic mode or LVM "
 "support. This is the preferred partitioning tool in &debian;."
-msgstr "让用户为系统中的磁盘分区，在分区上创建文件系统，并分配挂载点。它包括一些有趣的特性，如完全自动模式或 LVM 支持。&debian; 里它是推荐使用的分区工具。"
+msgstr ""
+"让用户为系统中的磁盘分区，在分区上创建文件系统，并分配挂载点。它包括一些有趣"
+"的特性，如完全自动模式或 LVM 支持。&debian; 里它是推荐使用的分区工具。"
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -475,13 +476,13 @@ msgid ""
 msgstr "允许用户为系统中的磁盘分区。根据用户计算机的体系选择适合的分区工具。"
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -489,13 +490,13 @@ msgid ""
 msgstr "显示分区列表，按用户指令为选择的分区创建文件系统。"
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -503,13 +504,13 @@ msgid ""
 msgstr "协助用户配置 <firstterm>LVM</firstterm> (Logical Volume Manager)。"
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -521,13 +522,13 @@ msgstr ""
 "器的高级管理。"
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -535,18 +536,6 @@ msgid ""
 msgstr "安装一些基本的包，让计算机重启后能在 &debian-gnu; 下运行。"
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "建立 root 密码，然后添加一个非 root 用户。"
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -635,16 +624,13 @@ msgstr "save-logs"
 #. Tag: para
 #: using-d-i.xml:381
 #, no-c-format
-#| msgid ""
-#| "Provides a way for the user to record information on a floppy disk, "
-#| "network, hard disk, or other media when trouble is encountered, in order "
-#| "to accurately report installer software problems to Debian developers "
-#| "later."
 msgid ""
 "Provides a way for the user to record information on a floppy disk, network, "
 "hard disk, or other media when trouble is encountered, in order to "
 "accurately report installer software problems to &debian; developers later."
-msgstr "当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后精确地给 &debian; 开发人员报告安装程序的问题。"
+msgstr ""
+"当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后"
+"精确地给 &debian; 开发人员报告安装程序的问题。"
 
 #. Tag: title
 #: using-d-i.xml:399
@@ -670,23 +656,12 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:412
 #, no-c-format
-#| msgid "Setting up Debian Installer and Hardware Configuration"
 msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "启动 &debian; 安装程序与配置硬件"
 
 #. Tag: para
 #: using-d-i.xml:413
 #, no-c-format
-#| msgid ""
-#| "Let's assume the Debian Installer has booted and you are facing its first "
-#| "screen. At this time, the capabilities of &d-i; are still quite limited. "
-#| "It doesn't know much about your hardware, preferred language, or even the "
-#| "task it should perform. Don't worry. Because &d-i; is quite clever, it "
-#| "can automatically probe your hardware, locate the rest of its components "
-#| "and upgrade itself to a capable installation system. However, you still "
-#| "need to help &d-i; with some information it can't determine automatically "
-#| "(like selecting your preferred language, keyboard layout or desired "
-#| "network mirror)."
 msgid ""
 "Let's assume the &debian; Installer has booted and you are facing its first "
 "screen. At this time, the capabilities of &d-i; are still quite limited. It "
@@ -697,7 +672,12 @@ msgid ""
 "help &d-i; with some information it can't determine automatically (like "
 "selecting your preferred language, keyboard layout or desired network "
 "mirror)."
-msgstr "假设 &debian; 安装程序已经启动，然后您看到了初始画面。此时，&d-i; 的能力还很有限。它还不了解您的硬件，首选的语言，甚至不知道要执行什么任务。不必担心，因为 &d-i; 相当聪明，它能自动探测您的硬件，定位其余的组件，并更新自己以具备安装系统的能力。但您仍然要协助 &d-i;，提供给它不能自动决定的内容(比如选择您首选的语言、键盘布局或网络镜像)。"
+msgstr ""
+"假设 &debian; 安装程序已经启动，然后您看到了初始画面。此时，&d-i; 的能力还很"
+"有限。它还不了解您的硬件，首选的语言，甚至不知道要执行什么任务。不必担心，因"
+"为 &d-i; 相当聪明，它能自动探测您的硬件，定位其余的组件，并更新自己以具备安装"
+"系统的能力。但您仍然要协助 &d-i;，提供给它不能自动决定的内容(比如选择您首选的"
+"语言、键盘布局或网络镜像)。"
 
 #. Tag: para
 #: using-d-i.xml:426
@@ -858,19 +838,16 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:530
 #, no-c-format
-#| msgid ""
-#| "The selected geographic location (in most cases a country) will be used "
-#| "later in the installation process to select the correct time zone and a "
-#| "Debian mirror appropriate for that country. Language and country together "
-#| "will help determine the default locale for your system and select the "
-#| "correct keyboard layout."
 msgid ""
 "The selected geographic location (in most cases a country) will be used "
 "later in the installation process to select the correct time zone and a "
 "&debian; mirror appropriate for that country. Language and country together "
 "will help determine the default locale for your system and select the "
 "correct keyboard layout."
-msgstr "在之后的安装过程中，所选择的地理位置(多数情况下是国家)还会被用于选择正确的时区和该国对应的 &debian; 镜像。语言和国家合起来还有助于确定您系统默认的 locale，以及键盘布局。"
+msgstr ""
+"在之后的安装过程中，所选择的地理位置(多数情况下是国家)还会被用于选择正确的时"
+"区和该国对应的 &debian; 镜像。语言和国家合起来还有助于确定您系统默认的 "
+"locale，以及键盘布局。"
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -994,12 +971,13 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "键盘经常按照不同语言使用的字符裁剪。为您使用的键盘选择一个合适布局，如果没有"
 "合适的布局，就选择一个近似的。一旦系统安装完毕，您可以从更大范围内选择键盘的"
-"布局(在安装完之后以 root 身份执行 <command>dpkg-reconfigure keyboard-configuration</command>)。"
+"布局(在安装完之后以 root 身份执行 <command>dpkg-reconfigure keyboard-"
+"configuration</command>)。"
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1036,42 +1014,25 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:675
 #, no-c-format
-#| msgid "Looking for the Debian Installer ISO Image"
 msgid "Looking for the &debian; Installer ISO Image"
 msgstr "寻找 &debian; 安装程序 ISO 映像"
 
 #. Tag: para
 #: using-d-i.xml:676
 #, no-c-format
-#| msgid ""
-#| "When installing via the <emphasis>hd-media</emphasis> method, there will "
-#| "be a moment where you need to find and mount the Debian Installer iso "
-#| "image in order to get the rest of the installation files. The component "
-#| "<command>iso-scan</command> does exactly this."
 msgid ""
 "When installing via the <emphasis>hd-media</emphasis> method, there will be "
 "a moment where you need to find and mount the &debian; Installer iso image "
 "in order to get the rest of the installation files. The component "
 "<command>iso-scan</command> does exactly this."
-msgstr "当安装是使用 <emphasis>hd-media</emphasis> 方式，将会有一个动作，是寻找和挂载 &debian; 安装程序 iso 映像，用于获取其它的安装文件。组件 <command>iso-scan</command> 正是用来完成此任务。"
+msgstr ""
+"当安装是使用 <emphasis>hd-media</emphasis> 方式，将会有一个动作，是寻找和挂"
+"载 &debian; 安装程序 iso 映像，用于获取其它的安装文件。组件 <command>iso-"
+"scan</command> 正是用来完成此任务。"
 
 #. Tag: para
 #: using-d-i.xml:683
 #, no-c-format
-#| msgid ""
-#| "At first, <command>iso-scan</command> automatically mounts all block "
-#| "devices (e.g. partitions) which have some known filesystem on them and "
-#| "sequentially searches for filenames ending with <filename>.iso</filename> "
-#| "(or <filename>.ISO</filename> for that matter). Beware that the first "
-#| "attempt scans only files in the root directory and in the first level of "
-#| "subdirectories (i.e. it finds <filename>/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, <filename>/data/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, but not <filename>/data/tmp/"
-#| "<replaceable>whatever</replaceable>.iso</filename>). After an iso image "
-#| "has been found, <command>iso-scan</command> checks its content to "
-#| "determine if the image is a valid Debian iso image or not. In the former "
-#| "case we are done, in the latter <command>iso-scan</command> seeks for "
-#| "another image."
 msgid ""
 "At first, <command>iso-scan</command> automatically mounts all block devices "
 "(e.g. partitions) which have some known filesystem on them and sequentially "
@@ -1085,7 +1046,16 @@ msgid ""
 "content to determine if the image is a valid &debian; iso image or not. In "
 "the former case we are done, in the latter <command>iso-scan</command> seeks "
 "for another image."
-msgstr "首先，<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如，分区)，然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>.ISO</filename> 之类)。注意，首次只扫描位于根目录的文件，和第一层子目录 (例如，它找到 <filename>/<replaceable>whatever</replaceable>.iso</filename>，<filename>/data/<replaceable>whatever</replaceable>.iso</filename>，而不是 <filename>/data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 iso 映象文件找到后，<command>iso-scan</command> 检查它包含的内容，确定该映象文件是不是有效的 &debian; iso 映象。如为前者，任务结束；若是后者，<command>iso-scan</command> 搜索其它的映象。"
+msgstr ""
+"首先，<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如，分"
+"区)，然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>.ISO</"
+"filename> 之类)。注意，首次只扫描位于根目录的文件，和第一层子目录 (例如，它找"
+"到 <filename>/<replaceable>whatever</replaceable>.iso</filename>，<filename>/"
+"data/<replaceable>whatever</replaceable>.iso</filename>，而不是 <filename>/"
+"data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 iso 映象文件"
+"找到后，<command>iso-scan</command> 检查它包含的内容，确定该映象文件是不是有"
+"效的 &debian; iso 映象。如为前者，任务结束；若是后者，<command>iso-scan</"
+"command> 搜索其它的映象。"
 
 #. Tag: para
 #: using-d-i.xml:700
@@ -1304,11 +1274,135 @@ msgstr "自动安装可以通过预置设置任何所需的时区。"
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "设置用户和密码"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"系统安装之后，安装程序要求您创建 <quote>root</quote> 帐号和/或第一个用户帐"
+"号。其他的用户帐号可以在安装完成之后创建。"
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "设置 root 密码"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"<emphasis>root</emphasis> 帐户也被称为<emphasis>超级用户</emphasis>；系统中的"
+"所有的安全防护措施对以该身份登录的都是无效的。root 帐户应该仅用来进行系统管"
+"理，而且使用时间应该尽可能短。"
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"您所创建的任何密码都应该包含至少 6 个字符，同时包含大小写字母，并且最好带有标"
+"点符号等特殊字符。因为超级用户具有最高权限，因此在您设置 root 密码时尤其需要"
+"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"如果他人向您索取您的 root 密码，也需要特别谨慎。除非您所管理的系统有多位管理"
+"员，否则通常不应该将超级用户密码交给别人。"
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "创建一个普通用户"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"系统会询问您现在是否希望创建一个普通帐户。您将使用该帐户进行日常登录操作。切"
+"记，平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"为什么呢？避免使用 root 特权帐户的一个原因是，它很容易对系统造成无法挽回的破"
+"坏。另一个原因是，您有可能被恶意诱使运行<emphasis>特洛伊木马</emphasis>程序 "
+"&mdash; 这是一种利用超级用户权限在您未知的情况下损害系统安全的程序。任何合格"
+"的 Unix 系统管理书籍中都会涉及到这一主题 &mdash; 如果您不是很了解这方面的内"
+"容，建议找一本进行学习。"
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"您首先会被要求输入用户的全名。然后要求输入用户帐号名；通常您的名字或者类似的"
+"便满足要求，并为缺省值。最后，您将要求输入该帐号的密码。"
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"如果在安装完毕后还希望建立其它新帐户，请使用 <command>adduser</command> 命"
+"令。"
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "分区与选择挂载点"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1323,7 +1417,7 @@ msgstr ""
 "排挂载点，还可以选择为 RAID、LVM 或加密设备这组选项进行配置。"
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1333,7 +1427,7 @@ msgstr ""
 "\"partitioning\"/>。"
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1353,7 +1447,7 @@ msgstr ""
 "</screen></informalexample> 注意，这会是磁盘上已有的数据无法访问。"
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1366,13 +1460,13 @@ msgstr ""
 "<guimenuitem>Manual</guimenuitem> 手动分区。"
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "支持的分区选项"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1383,7 +1477,7 @@ msgstr ""
 "块设备创建多种分区方案。"
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1400,7 +1494,7 @@ msgstr ""
 "装下改变；高优先级下会采用默认值。"
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1408,31 +1502,31 @@ msgid ""
 msgstr "安装程序支持多种高级分区和存储设备，很多情况下可以组合使用。"
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "逻辑卷管理(LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "Software RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "支持 RAID levels 0, 1, 4, 5, 6 和 10。"
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "加密"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1440,7 +1534,7 @@ msgstr ""
 "<emphasis>Serial ATA RAID</emphasis> (采用 <classname>dmraid</classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1453,13 +1547,13 @@ msgstr ""
 "sataraid;\">我们的 Wiki</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>Multipath</emphasis> (experimental)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1470,13 +1564,13 @@ msgstr ""
 "于 multipath 只在安装程序启动时打开才支持。"
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "支持下列的文件系统。"
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1488,7 +1582,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1499,26 +1593,26 @@ msgstr ""
 "filename> 分区选择 ext2 作为默认值。"
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>jfs</emphasis> (并不是所有架构都支持)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>xfs</emphasis> (并不是所有架构都支持)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr "<emphasis>reiserfs</emphasis> (选项；并不是所有架构都支持)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1531,13 +1625,13 @@ msgstr ""
 "版本 3。"
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1545,13 +1639,13 @@ msgid ""
 msgstr "在一些系统上用于读取闪存。不可以创建新的 jffs2 分区。"
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1559,19 +1653,19 @@ msgid ""
 msgstr "识别已存在的分区并挂载它们。不可以创建新的 qnx4 分区。"
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (只读)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1579,13 +1673,13 @@ msgid ""
 msgstr "已存在的 NTFS 分区可以调整大小，并挂载它们。不能创建新的 NTFS 分区。"
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "导引式分区"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1601,14 +1695,14 @@ msgstr ""
 "footnote>"
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1622,7 +1716,7 @@ msgstr ""
 "大分区将无法读取，对您的(私有)数据提供了额外的安全性。"
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1636,7 +1730,7 @@ msgstr ""
 "时间。"
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1651,7 +1745,7 @@ msgstr ""
 "安装程序会在写入磁盘之前让您确认。"
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1666,7 +1760,7 @@ msgstr ""
 "的那块。排列的次序可能与以前的不同。磁盘的尺寸将会帮助您识别它们。"
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1680,7 +1774,7 @@ msgstr ""
 "销。"
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1696,73 +1790,73 @@ msgstr ""
 "1GB 以上的空间(具体大小视所选的方式而不同)，那么导引式分区将以失败告终。"
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "分区方式"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "所需最小空间"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "所新建的分区"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "所有文件在同一分区"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "建立 /home 分区"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1772,7 +1866,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1784,7 +1878,7 @@ msgstr ""
 "boot</filename> 分区。其他的分区，除了交换分区，都会建在 LVM 分区之内。"
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1797,7 +1891,7 @@ msgstr ""
 "手动把某个分区作为 EFI 引导分区。"
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1808,7 +1902,7 @@ msgstr ""
 "区是否将被格式化，将以何种方式格式化，以及它们将被挂载到哪里的相关信息。"
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -1856,7 +1950,7 @@ msgstr ""
 "置，但使用手动方式分区的结果会有所不同。"
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -1874,30 +1968,28 @@ msgstr ""
 "后再次运行导引式分区，或者按照下面的介绍进行手动分区。"
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "手动分区"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
-#| msgid ""
-#| "A similar screen to the one shown just above will be displayed if you "
-#| "choose manual partitioning except that your existing partition table will "
-#| "be shown and without the mount points. How to manually set up your "
-#| "partition table and the usage of partitions by your new Debian system "
-#| "will be covered in the remainder of this section."
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
 "manual partitioning except that your existing partition table will be shown "
 "and without the mount points. How to manually set up your partition table "
 "and the usage of partitions by your new &debian; system will be covered in "
 "the remainder of this section."
-msgstr "如果您选择手动分区的话，它的界面和上面介绍的导引式分区大体上相同。不同之处在于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动设置您的分区表，以及新安装的 &debian; 系统将如何使用这些分区，将会在本节的后面谈到。"
+msgstr ""
+"如果您选择手动分区的话，它的界面和上面介绍的导引式分区大体上相同。不同之处在"
+"于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动"
+"设置您的分区表，以及新安装的 &debian; 系统将如何使用这些分区，将会在本节的后"
+"面谈到。"
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -1910,7 +2002,7 @@ msgstr ""
 "的磁盘条目下出现一个新行，上面写着 <quote>FREE SPACE</quote>。"
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -1945,7 +2037,7 @@ msgstr ""
 "动退回到 <command>partman</command> 的主界面。"
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -1964,7 +2056,7 @@ msgstr ""
 "这个菜单中，您还可以删除分区。"
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -1979,7 +2071,7 @@ msgstr ""
 "面的步骤，直到您纠正了这个错误。"
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -1990,7 +2082,7 @@ msgstr ""
 "点，不让您继续操作，直到您划分出这样一个分区。"
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2006,7 +2098,7 @@ msgstr ""
 "filename> 或者 <filename>partman-lvm</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2020,13 +2112,13 @@ msgstr ""
 "此分区。"
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "配置多磁盘设备(软 RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2044,7 +2136,7 @@ msgstr ""
 "<firstterm>软 RAID</firstterm>)。"
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2057,7 +2149,7 @@ msgstr ""
 "command> 格式化，分配挂载点，等等)。"
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2149,101 +2241,101 @@ msgstr ""
 "listitem> </varlistentry></variablelist> 总结："
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "类型"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "最少设备"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "备用设备"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "幸免于磁盘损坏？"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "可用空间"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 # index.docbook:1106, index.docbook:1107
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>否</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "容量为最小分区乘以 RAID 设备数"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 # index.docbook:1114, index.docbook:1122
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "可选"
 
 # index.docbook:1115, index.docbook:1123
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>是</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "容量为 RAID 最小分区"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2251,20 +2343,20 @@ msgid ""
 msgstr "容量为最小分区乘以(RAID 设备数量减一)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2272,13 +2364,13 @@ msgid ""
 msgstr "容量为最小分区乘以(RAID 设备数量减二)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2286,7 +2378,7 @@ msgid ""
 msgstr "所有的分区数除以 chunk 拷贝数(默认为二)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2296,7 +2388,7 @@ msgstr ""
 "\">Software RAID HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2311,7 +2403,7 @@ msgstr ""
 "volume for RAID</guimenuitem> </menuchoice>。)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2329,7 +2421,7 @@ msgstr ""
 "<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2344,7 +2436,7 @@ msgstr ""
 "验的用户，从 shell 手动地处理一些配置和安装步骤，也许会绕开这些问题。"
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2364,7 +2456,7 @@ msgstr ""
 "RAID1)。后续操作会根据您选择的 MD 类型而定。"
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2375,7 +2467,7 @@ msgstr ""
 "组成 MD 的分区。"
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2392,7 +2484,7 @@ msgstr ""
 "将不会允许您继续下去，直到纠正错误。"
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2402,7 +2494,7 @@ msgstr ""
 "区。"
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2412,7 +2504,7 @@ msgstr ""
 "区。"
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2430,7 +2522,7 @@ msgstr ""
 "贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2446,7 +2538,7 @@ msgstr ""
 "RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2459,13 +2551,13 @@ msgstr ""
 "您的新 MD 设备，并分配挂载点这样的属性。"
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "配置逻辑卷管理(LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2479,7 +2571,7 @@ msgstr ""
 "或符号链接等方法来折腾。"
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2497,7 +2589,7 @@ msgstr ""
 "点在于它可以跨越多个物理磁盘。"
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2515,7 +2607,7 @@ msgstr ""
 "阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2530,7 +2622,7 @@ msgstr ""
 "<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2547,7 +2639,7 @@ msgstr ""
 "了 LVM 配置的小结。菜单项本身是与内容相关，只显示可用的操作。可能的操作有："
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2557,43 +2649,43 @@ msgstr ""
 "名称和逻辑卷尺寸等"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Create volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Create logical volume"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Delete volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Delete logical volume"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Extend volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Reduce volume group"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2602,7 +2694,7 @@ msgstr ""
 "<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2610,7 +2702,7 @@ msgid ""
 msgstr "使用该菜单内的选项首先创建卷组，然后在里面创建逻辑卷。"
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2621,13 +2713,13 @@ msgstr ""
 "通的分区一样(您也应该这样对待它们)。"
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "配置加密卷"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2645,7 +2737,7 @@ msgstr ""
 "许可以访问硬盘，但是没有正确的口令，硬盘上的数据看起来就像是随机的字符。"
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2668,7 +2760,7 @@ msgstr ""
 "加载内核。"
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2680,7 +2772,7 @@ msgstr ""
 "密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2698,7 +2790,7 @@ msgstr ""
 "guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2713,7 +2805,7 @@ msgstr ""
 "使用默认的方法。"
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2726,13 +2818,13 @@ msgstr ""
 "的安全考虑的选择。"
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Encryption: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2755,13 +2847,13 @@ msgstr ""
 "纪的敏感信息。"
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Key size: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2773,13 +2865,13 @@ msgstr ""
 "加长度自然会降低性能。cipher 决定可用的密钥长度。"
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2795,7 +2887,7 @@ msgstr ""
 "复模板推断信息。"
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2808,25 +2900,25 @@ msgstr ""
 "法时，才使用其他的算法。"
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Encryption key: <userinput>Passphrase</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "这里您可以为分区选择所使用的加密密钥类型。"
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -2839,13 +2931,13 @@ msgstr ""
 "使用时要求输入。"
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Random key"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -2860,7 +2952,7 @@ msgstr ""
 "面临暴力破解，但是除非加密算法中有未知的弱点，这辈子也不会被攻破。)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -2877,13 +2969,13 @@ msgstr ""
 "写入到交换分区的数据。"
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Erase data: <userinput>yes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -2901,7 +2993,7 @@ msgstr ""
 "备上的数据。</para></footnote>。"
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -2913,13 +3005,13 @@ msgstr ""
 "下面内容："
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Encryption: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -2930,25 +3022,25 @@ msgstr ""
 "时选取。请查阅前面关于 cipher 和密钥长度的章节了解更多信息。"
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "这里您可以为分区选择加密密钥的类型。"
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Keyfile (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -2960,19 +3052,19 @@ msgstr ""
 "application> 加密。要使用它，您需要输入正确的 passphrase (在以后会要求提供)。"
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "请查阅前面有关随机密钥的章节。"
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "请查阅前面有关删除数据的章节。"
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -2987,7 +3079,7 @@ msgstr ""
 "标记分区上的数据，以及写新分区表等动作。对于大的分区，这会花一些时间。"
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3001,7 +3093,7 @@ msgstr ""
 "(比如生日、爱好、宠物的名字、以及家里其他成员的名字，等等)。"
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3021,7 +3113,7 @@ msgstr ""
 "所选择的键盘布局未能正确建立，而且是在为根文件系统输入 passphrase 的时候。"
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3040,7 +3132,7 @@ msgstr ""
 "程在每个要加密的分区重复进行。"
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3071,7 +3163,7 @@ msgstr ""
 "您不合适，可以进行修改。"
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3087,7 +3179,7 @@ msgstr ""
 "面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3095,13 +3187,13 @@ msgid ""
 msgstr "当您满意分区之后，可以继续安装过程。"
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "安装基本系统"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3113,7 +3205,7 @@ msgstr ""
 "果您用较慢的计算机或网络，这要花费好一会儿时间。"
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3128,7 +3220,7 @@ msgstr ""
 "Alt</keycap><keycap>F1</keycap></keycombo>。"
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3139,7 +3231,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3152,7 +3244,7 @@ msgstr ""
 "核。"
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3167,7 +3259,7 @@ msgstr ""
 "看，正常情况下应该安装这些软件。"
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3179,125 +3271,6 @@ msgstr ""
 "</quote>。上面提到的原则只适用于之后的安装过程。"
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "设置用户和密码"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"系统安装之后，安装程序要求您创建 <quote>root</quote> 帐号和/或第一个用户帐"
-"号。其他的用户帐号可以在安装完成之后创建。"
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "设置 root 密码"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"<emphasis>root</emphasis> 帐户也被称为<emphasis>超级用户</emphasis>；系统中的"
-"所有的安全防护措施对以该身份登录的都是无效的。root 帐户应该仅用来进行系统管"
-"理，而且使用时间应该尽可能短。"
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"您所创建的任何密码都应该包含至少 6 个字符，同时包含大小写字母，并且最好带有标"
-"点符号等特殊字符。因为超级用户具有最高权限，因此在您设置 root 密码时尤其需要"
-"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"如果他人向您索取您的 root 密码，也需要特别谨慎。除非您所管理的系统有多位管理"
-"员，否则通常不应该将超级用户密码交给别人。"
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "创建一个普通用户"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"系统会询问您现在是否希望创建一个普通帐户。您将使用该帐户进行日常登录操作。切"
-"记，平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"为什么呢？避免使用 root 特权帐户的一个原因是，它很容易对系统造成无法挽回的破"
-"坏。另一个原因是，您有可能被恶意诱使运行<emphasis>特洛伊木马</emphasis>程序 "
-"&mdash; 这是一种利用超级用户权限在您未知的情况下损害系统安全的程序。任何合格"
-"的 Unix 系统管理书籍中都会涉及到这一主题 &mdash; 如果您不是很了解这方面的内"
-"容，建议找一本进行学习。"
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"您首先会被要求输入用户的全名。然后要求输入用户帐号名；通常您的名字或者类似的"
-"便满足要求，并为缺省值。最后，您将要求输入该帐号的密码。"
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"如果在安装完毕后还希望建立其它新帐户，请使用 <command>adduser</command> 命"
-"令。"
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -3859,19 +3832,16 @@ msgstr "检测其他的操作系统"
 #. Tag: para
 #: using-d-i.xml:2595
 #, no-c-format
-#| msgid ""
-#| "Before a boot loader is installed, the installer will attempt to probe "
-#| "for other operating systems which are installed on the machine. If it "
-#| "finds a supported operating system, you will be informed of this during "
-#| "the boot loader installation step, and the computer will be configured to "
-#| "boot this other operating system in addition to Debian."
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
 "other operating systems which are installed on the machine. If it finds a "
 "supported operating system, you will be informed of this during the boot "
 "loader installation step, and the computer will be configured to boot this "
 "other operating system in addition to &debian;."
-msgstr "在 boot loader 安装之前，安装程序会试着侦测已经安装到计算机上的其他操作系统。如果它找到支持的操作系统，您将在启动 boot loader 安装步骤里得到提示。与 &debian; 一起，计算机也将配置为可以启动其他操作系统。"
+msgstr ""
+"在 boot loader 安装之前，安装程序会试着侦测已经安装到计算机上的其他操作系统。"
+"如果它找到支持的操作系统，您将在启动 boot loader 安装步骤里得到提示。与 "
+"&debian; 一起，计算机也将配置为可以启动其他操作系统。"
 
 #. Tag: para
 #: using-d-i.xml:2603
@@ -4014,22 +3984,19 @@ msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
 #. Tag: term
 #: using-d-i.xml:2704
 #, no-c-format
-#| msgid "new Debian partition"
 msgid "new &debian; partition"
 msgstr "新 &debian; 分区"
 
 #. Tag: para
 #: using-d-i.xml:2704
 #, no-c-format
-#| msgid ""
-#| "Choose this if you want to use another boot manager. <command>LILO</"
-#| "command> will install itself at the beginning of the new Debian partition "
-#| "and it will serve as a secondary boot loader."
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
 "will install itself at the beginning of the new &debian; partition and it "
 "will serve as a secondary boot loader."
-msgstr "如果您想使用其它启动管理，选择此方式。<command>LILO</command> 将它自己安装到新 &debian; 分区的起始位置，并能作为第二 boot loader。"
+msgstr ""
+"如果您想使用其它启动管理，选择此方式。<command>LILO</command> 将它自己安装到"
+"新 &debian; 分区的起始位置，并能作为第二 boot loader。"
 
 #. Tag: term
 #: using-d-i.xml:2713
@@ -4053,19 +4020,16 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2723
 #, no-c-format
-#| msgid ""
-#| "If you can no longer boot into Windows 9x (or DOS) after this step, "
-#| "you'll need to use a Windows 9x (MS-DOS) boot disk and use the "
-#| "<userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS master "
-#| "boot record &mdash; however, this means that you'll need to use some "
-#| "other way to get back into Debian!"
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
 "need to use a Windows 9x (MS-DOS) boot disk and use the <userinput>fdisk /"
 "mbr</userinput> command to reinstall the MS-DOS master boot record &mdash; "
 "however, this means that you'll need to use some other way to get back into "
 "&debian;!"
-msgstr "如果此步之后无法启动 Windows 9x (或 DOS)，您需要使用一个 Windows 9x (MS-DOS) 启动盘，并用 <userinput>fdisk /mbr</userinput> 命令重新安装 MS-DOS 主引导记录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;！"
+msgstr ""
+"如果此步之后无法启动 Windows 9x (或 DOS)，您需要使用一个 Windows 9x (MS-DOS) "
+"启动盘，并用 <userinput>fdisk /mbr</userinput> 命令重新安装 MS-DOS 主引导记"
+"录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;！"
 
 #. Tag: title
 #: using-d-i.xml:2739
@@ -4121,14 +4085,21 @@ msgstr "选择正确的分区！"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "选择分区的准则是格式化为 FAT 的文件系统并有 <emphasis>boot</emphasis> 标志。"
 "&d-i; 可能会显示多个选择，这取决于被扫描的包含 EFI 分区的磁盘和 EFI 诊断分"
@@ -4193,17 +4164,15 @@ msgstr "elilo.efi"
 #. Tag: para
 #: using-d-i.xml:2821
 #, no-c-format
-#| msgid ""
-#| "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
-#| "runs to boot the system. It is the program behind the <guimenuitem>Debian "
-#| "GNU/Linux</guimenuitem> menu item of the <quote>EFI Boot Manager</quote> "
-#| "command menu."
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
 "runs to boot the system. It is the program behind the <guimenuitem>&debian; "
 "GNU/Linux</guimenuitem> menu item of the <quote>EFI Boot Manager</quote> "
 "command menu."
-msgstr "这是用于启动系统的 <quote>EFI Boot Manager</quote> boot loader 程序。也是 <guimenuitem>&debian; GNU/Linux</guimenuitem> 菜单项背后的程序，位于 <quote>EFI Boot Manager</quote> 命令菜单。"
+msgstr ""
+"这是用于启动系统的 <quote>EFI Boot Manager</quote> boot loader 程序。也是 "
+"<guimenuitem>&debian; GNU/Linux</guimenuitem> 菜单项背后的程序，位于 "
+"<quote>EFI Boot Manager</quote> 命令菜单。"
 
 #. Tag: filename
 #: using-d-i.xml:2831
@@ -4214,18 +4183,15 @@ msgstr "initrd.img"
 #. Tag: para
 #: using-d-i.xml:2832
 #, no-c-format
-#| msgid ""
-#| "This is the initial root filesystem used to boot the kernel. It is a copy "
-#| "of the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
-#| "standard Debian installation it would be the file in <filename>/boot</"
-#| "filename> pointed to by the symbolic link <filename>/initrd.img</"
-#| "filename>."
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
 "the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
 "standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
-msgstr "这是用于启动内核最初的文件系统。它是引用 <filename>/etc/elilo.conf</filename> 的复制文件。在标准的 &debian; 安装程序程序中他是 <filename>/boot</filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
+msgstr ""
+"这是用于启动内核最初的文件系统。它是引用 <filename>/etc/elilo.conf</"
+"filename> 的复制文件。在标准的 &debian; 安装程序程序中他是 <filename>/boot</"
+"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
 
 #. Tag: filename
 #: using-d-i.xml:2844
@@ -4253,17 +4219,15 @@ msgstr "vmlinuz"
 #. Tag: para
 #: using-d-i.xml:2856
 #, no-c-format
-#| msgid ""
-#| "This is the compressed kernel itself. It is a copy of the file referenced "
-#| "in the <filename>/etc/elilo.conf</filename>. In a standard Debian "
-#| "installation it would be the file in <filename>/boot</filename> pointed "
-#| "to by the symbolic link <filename>/vmlinuz</filename>."
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
 "the <filename>/etc/elilo.conf</filename>. In a standard &debian; "
 "installation it would be the file in <filename>/boot</filename> pointed to "
 "by the symbolic link <filename>/vmlinuz</filename>."
-msgstr "此为压缩内核本身。它是引用 <filename>/etc/elilo.conf</filename> 的复制文件。在标准的 &debian; 安装程序程序中他是 <filename>/boot</filename> 符号链接 <filename>/vmlinuz</filename> 指向的文件。"
+msgstr ""
+"此为压缩内核本身。它是引用 <filename>/etc/elilo.conf</filename> 的复制文件。"
+"在标准的 &debian; 安装程序程序中他是 <filename>/boot</filename> 符号链接 "
+"<filename>/vmlinuz</filename> 指向的文件。"
 
 #. Tag: title
 #: using-d-i.xml:2876
@@ -4512,15 +4476,13 @@ msgstr "完成安装"
 #. Tag: para
 #: using-d-i.xml:3053
 #, no-c-format
-#| msgid ""
-#| "This is the last step in the Debian installation process during which the "
-#| "installer will do any last minute tasks. It mostly consists of tidying up "
-#| "after the &d-i;."
 msgid ""
 "This is the last step in the &debian; installation process during which the "
 "installer will do any last minute tasks. It mostly consists of tidying up "
 "after the &d-i;."
-msgstr "这是在您 &debian; 安装过程的最后一步。在这最后的几分钟工作里，主要进行一些 &d-i; 之后的清理。"
+msgstr ""
+"这是在您 &debian; 安装过程的最后一步。在这最后的几分钟工作里，主要进行一些 "
+"&d-i; 之后的清理。"
 
 #. Tag: title
 #: using-d-i.xml:3066
@@ -4576,15 +4538,13 @@ msgstr "重新启动系统"
 #. Tag: para
 #: using-d-i.xml:3103
 #, no-c-format
-#| msgid ""
-#| "You will be prompted to remove the boot media (CD, floppy, etc) that you "
-#| "used to boot the installer. After that the system will be rebooted into "
-#| "your new Debian system."
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
 "used to boot the installer. After that the system will be rebooted into your "
 "new &debian; system."
-msgstr "您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后，系统会启动到您的新 &debian; 系统。"
+msgstr ""
+"您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后，系统会启动到您的新 "
+"&debian; 系统。"
 
 #. Tag: para
 #: using-d-i.xml:3109
@@ -4624,15 +4584,13 @@ msgstr "保存安装记录"
 #. Tag: para
 #: using-d-i.xml:3138
 #, no-c-format
-#| msgid ""
-#| "If the installation is successful, the logfiles created during the "
-#| "installation process will be automatically saved to <filename>/var/log/"
-#| "installer/</filename> on your new Debian system."
 msgid ""
 "If the installation is successful, the logfiles created during the "
 "installation process will be automatically saved to <filename>/var/log/"
 "installer/</filename> on your new &debian; system."
-msgstr "如果安装成功，安装过程中创建的记录文件，会被自动保存在您的新 &debian; 系统上的 <filename>/var/log/installer/</filename>。"
+msgstr ""
+"如果安装成功，安装过程中创建的记录文件，会被自动保存在您的新 &debian; 系统上"
+"的 <filename>/var/log/installer/</filename>。"
 
 #. Tag: para
 #: using-d-i.xml:3145
@@ -5051,19 +5009,17 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:3429
 #, no-c-format
-#| msgid ""
-#| "Tarballs containing current packages for the most common firmware are "
-#| "available from: <itemizedlist> <listitem><para> <ulink url=\"&url-"
-#| "firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
-#| "download the tarball for the correct release and unpack it to the file "
-#| "system on the medium."
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
 "firmware are available from: <itemizedlist> <listitem><para> <ulink url="
 "\"&url-firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
 "download the tarball or zip file for the correct release and unpack it to "
 "the file system on the medium."
-msgstr "大多数固件的压缩包和 zip 文件可以从这里获得： <itemizedlist> <listitem><para> <ulink url=\"&url-firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> 下载对应版本的压缩包或 zip 文件，然后解压到介质的文件系统里面。"
+msgstr ""
+"大多数固件的压缩包和 zip 文件可以从这里获得： <itemizedlist> "
+"<listitem><para> <ulink url=\"&url-firmware-tarballs;\"></ulink> </para></"
+"listitem> </itemizedlist> 下载对应版本的压缩包或 zip 文件，然后解压到介质的文"
+"件系统里面。"
 
 #. Tag: para
 #: using-d-i.xml:3443
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 2171e232f..a3fde326e 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -15,22 +15,19 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:4
 #, no-c-format
-#| msgid "Welcome to Debian"
 msgid "Welcome to &debian;"
 msgstr "欢迎使用 &debian;"
 
 #. Tag: para
 #: welcome.xml:5
 #, no-c-format
-#| msgid ""
-#| "This chapter provides an overview of the Debian Project and &debian-gnu;. "
-#| "If you already know about the Debian Project's history and the &debian-"
-#| "gnu; distribution, feel free to skip to the next chapter."
 msgid ""
 "This chapter provides an overview of the &debian; Project and &debian-gnu;. "
 "If you already know about the &debian; Project's history and the &debian-"
 "gnu; distribution, feel free to skip to the next chapter."
-msgstr "本章将简要介绍 &debian; 计划和 &debian-gnu;。如果您已经对 &debian; 计划的历史和 &debian-gnu; 发行版有一定的了解，请略过本章。"
+msgstr ""
+"本章将简要介绍 &debian; 计划和 &debian-gnu;。如果您已经对 &debian; 计划的历史"
+"和 &debian-gnu; 发行版有一定的了解，请略过本章。"
 
 #. Tag: title
 #: welcome.xml:19
@@ -345,24 +342,12 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-#| msgid "What is Debian GNU/Linux?"
 msgid "What is &debian; GNU/Linux?"
 msgstr "什么是 &debian; GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
 #, no-c-format
-#| msgid ""
-#| "The combination of Debian's philosophy and methodology and the GNU tools, "
-#| "the Linux kernel, and other important free software, form a unique "
-#| "software distribution called Debian GNU/Linux. This distribution is made "
-#| "up of a large number of software <emphasis>packages</emphasis>. Each "
-#| "package in the distribution contains executables, scripts, documentation, "
-#| "and configuration information, and has a <emphasis>maintainer</emphasis> "
-#| "who is primarily responsible for keeping the package up-to-date, tracking "
-#| "bug reports, and communicating with the upstream author(s) of the "
-#| "packaged software. Our extremely large user base, combined with our bug "
-#| "tracking system ensures that problems are found and fixed quickly."
 msgid ""
 "The combination of &debian;'s philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
@@ -374,80 +359,67 @@ msgid ""
 "communicating with the upstream author(s) of the packaged software. Our "
 "extremely large user base, combined with our bug tracking system ensures "
 "that problems are found and fixed quickly."
-msgstr "将 &debian; 哲学与方法论，GNU 工具集、Linux 内核，以及其他重要的自由软件结合在一起所构成的独特的软件发行版称为 &ebian; GNU/Linux。该发行版由大量的软件<emphasis>包</emphasis>组成。发行版中的每个软件包都包含了执行文件、脚本、文档和配置信息，并拥有一位<emphasis>维护者</emphasis>，其职责是保持软件包更新、跟踪 bug 报告，并与软件源作者保持联络。我们巨大的用户群，结合 bug 跟踪系统可以确保问题被及时发现和修复。"
+msgstr ""
+"将 &debian; 哲学与方法论，GNU 工具集、Linux 内核，以及其他重要的自由软件结合"
+"在一起所构成的独特的软件发行版称为 &ebian; GNU/Linux。该发行版由大量的软件"
+"<emphasis>包</emphasis>组成。发行版中的每个软件包都包含了执行文件、脚本、文档"
+"和配置信息，并拥有一位<emphasis>维护者</emphasis>，其职责是保持软件包更新、跟"
+"踪 bug 报告，并与软件源作者保持联络。我们巨大的用户群，结合 bug 跟踪系统可以"
+"确保问题被及时发现和修复。"
 
 #. Tag: para
 #: welcome.xml:246
 #, no-c-format
-#| msgid ""
-#| "Debian's attention to detail allows us to produce a high-quality, stable, "
-#| "and scalable distribution. Installations can be easily configured to "
-#| "serve many roles, from stripped-down firewalls to desktop scientific "
-#| "workstations to high-end network servers."
 msgid ""
 "&debian;'s attention to detail allows us to produce a high-quality, stable, "
 "and scalable distribution. Installations can be easily configured to serve "
 "many roles, from stripped-down firewalls to desktop scientific workstations "
 "to high-end network servers."
-msgstr "&debian; 对细节的注重使我们可以生产出高质、稳定和灵活的发行版。安装程序可以方便地使之应用到各种场合，从精简的防火墙到桌面科学工作站，甚至高端网络服务器都可以轻松胜任。"
+msgstr ""
+"&debian; 对细节的注重使我们可以生产出高质、稳定和灵活的发行版。安装程序可以方"
+"便地使之应用到各种场合，从精简的防火墙到桌面科学工作站，甚至高端网络服务器都"
+"可以轻松胜任。"
 
 #. Tag: para
 #: welcome.xml:253
 #, no-c-format
-#| msgid ""
-#| "Debian is especially popular among advanced users because of its "
-#| "technical excellence and its deep commitment to the needs and "
-#| "expectations of the Linux community. Debian also introduced many features "
-#| "to Linux that are now commonplace."
 msgid ""
 "&debian; is especially popular among advanced users because of its technical "
 "excellence and its deep commitment to the needs and expectations of the "
 "Linux community. &debian; also introduced many features to Linux that are "
 "now commonplace."
-msgstr "&debian; 在高级用户中非常流行的原因在于它具有优秀的技术，而且它对 Linux 的深入贡献满足了社区的需求与期望。&debian; 为 Linux 引入的许多特性现在已经成为了非常通用的标准。"
+msgstr ""
+"&debian; 在高级用户中非常流行的原因在于它具有优秀的技术，而且它对 Linux 的深"
+"入贡献满足了社区的需求与期望。&debian; 为 Linux 引入的许多特性现在已经成为了"
+"非常通用的标准。"
 
 #. Tag: para
 #: welcome.xml:260
 #, no-c-format
-#| msgid ""
-#| "For example, Debian was the first Linux distribution to include a package "
-#| "management system for easy installation and removal of software. It was "
-#| "also the first Linux distribution that could be upgraded without "
-#| "requiring reinstallation."
 msgid ""
 "For example, &debian; was the first Linux distribution to include a package "
 "management system for easy installation and removal of software. It was also "
 "the first Linux distribution that could be upgraded without requiring "
 "reinstallation."
-msgstr "例如，&debian; 是第一种使用包管理系统的 Linux 发行版，它让安装和删除软件变得非常容易。而且它还是第一个可以不用重新安装就能升级的 Linux 发行版。"
+msgstr ""
+"例如，&debian; 是第一种使用包管理系统的 Linux 发行版，它让安装和删除软件变得"
+"非常容易。而且它还是第一个可以不用重新安装就能升级的 Linux 发行版。"
 
 #. Tag: para
 #: welcome.xml:267
 #, no-c-format
-#| msgid ""
-#| "Debian continues to be a leader in Linux development. Its development "
-#| "process is an example of just how well the Open Source development model "
-#| "can work &mdash; even for very complex tasks such as building and "
-#| "maintaining a complete operating system."
 msgid ""
 "&debian; continues to be a leader in Linux development. Its development "
 "process is an example of just how well the Open Source development model can "
 "work &mdash; even for very complex tasks such as building and maintaining a "
 "complete operating system."
-msgstr "&debian; 一直充当着 Linux 开发的带头人。它的开发过程是开源开发模式如何工作的范例 &mdash; 即使是用于创建和维护一个完整操作系统这样复杂的任务。"
+msgstr ""
+"&debian; 一直充当着 Linux 开发的带头人。它的开发过程是开源开发模式如何工作的"
+"范例 &mdash; 即使是用于创建和维护一个完整操作系统这样复杂的任务。"
 
 #. Tag: para
 #: welcome.xml:274
 #, no-c-format
-#| msgid ""
-#| "The feature that most distinguishes Debian from other Linux distributions "
-#| "is its package management system. These tools give the administrator of a "
-#| "Debian system complete control over the packages installed on that "
-#| "system, including the ability to install a single package or "
-#| "automatically update the entire operating system. Individual packages can "
-#| "also be protected from being updated. You can even tell the package "
-#| "management system about software you have compiled yourself and what "
-#| "dependencies it fulfills."
 msgid ""
 "The feature that most distinguishes &debian; from other Linux distributions "
 "is its package management system. These tools give the administrator of a "
@@ -456,19 +428,15 @@ msgid ""
 "the entire operating system. Individual packages can also be protected from "
 "being updated. You can even tell the package management system about "
 "software you have compiled yourself and what dependencies it fulfills."
-msgstr "&debian; 与其他 Linux 发行版最大的不同之处在于包管理系统的特性。这些工具给予 &debian; 系统管理员对安装到系统上的软件包的完全控制，包括安装单个软件包和自动升级整个操作系统。个别软件包也可以被保护不被升级。您甚至可以告诉包管理系统哪些软件是您自己编译的以及它们所需要的依赖关系。"
+msgstr ""
+"&debian; 与其他 Linux 发行版最大的不同之处在于包管理系统的特性。这些工具给予 "
+"&debian; 系统管理员对安装到系统上的软件包的完全控制，包括安装单个软件包和自动"
+"升级整个操作系统。个别软件包也可以被保护不被升级。您甚至可以告诉包管理系统哪"
+"些软件是您自己编译的以及它们所需要的依赖关系。"
 
 #. Tag: para
 #: welcome.xml:285
 #, no-c-format
-#| msgid ""
-#| "To protect your system against <quote>Trojan horses</quote> and other "
-#| "malevolent software, Debian's servers verify that uploaded packages come "
-#| "from their registered Debian maintainers. Debian packagers also take "
-#| "great care to configure their packages in a secure manner. When security "
-#| "problems in shipped packages do appear, fixes are usually available very "
-#| "quickly. With Debian's simple update options, security fixes can be "
-#| "downloaded and installed automatically across the Internet."
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
 "malevolent software, &debian;'s servers verify that uploaded packages come "
@@ -477,19 +445,16 @@ msgid ""
 "problems in shipped packages do appear, fixes are usually available very "
 "quickly. With &debian;'s simple update options, security fixes can be "
 "downloaded and installed automatically across the Internet."
-msgstr "为了提防<quote>特洛伊木马</quote>和其他恶意软件，更好地保护您的系统，&debian; 服务器会校验 &debian; 注册维护人员所上传的软件包。&debian; 的打包人员也会特别注意以安全的方式配置软件包。当发布出去的软件包有安全问题时，通常会很快被修复。依靠 &debian; 的简易更新选项，安全更新可以通过互联网自动下载和安装。"
+msgstr ""
+"为了提防<quote>特洛伊木马</quote>和其他恶意软件，更好地保护您的系统，"
+"&debian; 服务器会校验 &debian; 注册维护人员所上传的软件包。&debian; 的打包人"
+"员也会特别注意以安全的方式配置软件包。当发布出去的软件包有安全问题时，通常会"
+"很快被修复。依靠 &debian; 的简易更新选项，安全更新可以通过互联网自动下载和安"
+"装。"
 
 #. Tag: para
 #: welcome.xml:295
 #, no-c-format
-#| msgid ""
-#| "The primary, and best, method of getting support for your Debian GNU/"
-#| "Linux system and communicating with Debian Developers is through the many "
-#| "mailing lists maintained by the Debian Project (there are more than &num-"
-#| "of-debian-maillists; at this writing). The easiest way to subscribe to "
-#| "one or more of these lists is visit <ulink url=\"&url-debian-lists-"
-#| "subscribe;\"> Debian's mailing list subscription page</ulink> and fill "
-#| "out the form you'll find there."
 msgid ""
 "The primary, and best, method of getting support for your &debian; GNU/Linux "
 "system and communicating with &debian; Developers is through the many "
@@ -498,12 +463,16 @@ msgid ""
 "or more of these lists is visit <ulink url=\"&url-debian-lists-subscribe;\"> "
 "Debian's mailing list subscription page</ulink> and fill out the form you'll "
 "find there."
-msgstr "为您的 &debian; GNU/Linux 系统寻求技术支持和联络 &debian; 开发人员的主要的，也是最好的方法是通过 &debian; 计划的邮件列表(书写本文时已有 &num-of-debian-maillists; 个邮件列表)进行沟通。订阅这些列表的最简单方法是访问 <ulink url=\"&url-debian-lists-subscribe;\"> Debian 邮件列表订阅页</ulink>并填写相应表单。"
+msgstr ""
+"为您的 &debian; GNU/Linux 系统寻求技术支持和联络 &debian; 开发人员的主要的，"
+"也是最好的方法是通过 &debian; 计划的邮件列表(书写本文时已有 &num-of-debian-"
+"maillists; 个邮件列表)进行沟通。订阅这些列表的最简单方法是访问 <ulink url="
+"\"&url-debian-lists-subscribe;\"> Debian 邮件列表订阅页</ulink>并填写相应表"
+"单。"
 
 #. Tag: title
 #: welcome.xml:315
 #, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "什么是 &debian; GNU/Hurd?"
 
@@ -512,22 +481,18 @@ msgstr "什么是 &debian; GNU/Hurd?"
 #, no-c-format
 msgid ""
 "&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
-msgstr "&debian; GNU/kFreeBSD 是一种 &debian; GNU 系统，它采用了 kFreeBSD 内核。"
+msgstr ""
+"&debian; GNU/kFreeBSD 是一种 &debian; GNU 系统，它采用了 kFreeBSD 内核。"
 
 #. Tag: para
 #: welcome.xml:321
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
 "amd64 architectures, although ports to other architectures is possible."
-msgstr "此 &debian; 平台当前仅为 i386 和 amd64 体系开发，虽然它也可以移植到其他的体系。"
+msgstr ""
+"此 &debian; 平台当前仅为 i386 和 amd64 体系开发，虽然它也可以移植到其他的体"
+"系。"
 
 #. Tag: para
 #: welcome.xml:326
@@ -535,25 +500,25 @@ msgstr "此 &debian; 平台当前仅为 i386 和 amd64 体系开发，虽然它�
 msgid ""
 "Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
-msgstr "请留意 &debian; GNU/kFreeBSD 并不是一种 Linux 系统，因此很多 Linux 系统上的信息并不适用于它。"
+msgstr ""
+"请留意 &debian; GNU/kFreeBSD 并不是一种 Linux 系统，因此很多 Linux 系统上的信"
+"息并不适用于它。"
 
 #. Tag: para
 #: welcome.xml:331
 #, no-c-format
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
 "kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
-msgstr "要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> 以及 <email>debian-bsd@lists.debian.org</email> 邮件列表。"
+msgstr ""
+"要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/kfreebsd-gnu/"
+"\"> &debian; GNU/kFreeBSD ports page</ulink> 以及 <email>debian-bsd@lists."
+"debian.org</email> 邮件列表。"
 
 #. Tag: title
 #: welcome.xml:350
 #, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/Hurd?"
 msgstr "什么是 &debian; GNU/Hurd?"
 
@@ -563,24 +528,21 @@ msgstr "什么是 &debian; GNU/Hurd?"
 msgid ""
 "&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set "
 "of servers running on top of the GNU Mach microkernel."
-msgstr "&debian; GNU/Hurd 是一种 &debian; GNU 系统，包含 GNU Hurd &mdash; 一组运行在 GNU Mach 未内核上的服务。"
+msgstr ""
+"&debian; GNU/Hurd 是一种 &debian; GNU 系统，包含 GNU Hurd &mdash; 一组运行在 "
+"GNU Mach 未内核上的服务。"
 
 #. Tag: para
 #: welcome.xml:357
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
 "is continuing. The Hurd is currently only being developed for the i386 "
 "architecture, although ports to other architectures will be made once the "
 "system becomes more stable."
-msgstr "Hurd 还没有完成，不适合日常应用，但开发仍在继续。Hurd 当前仅为 i386 体系开发，当系统稳定之后也会移植到其他的体系。"
+msgstr ""
+"Hurd 还没有完成，不适合日常应用，但开发仍在继续。Hurd 当前仅为 i386 体系开"
+"发，当系统稳定之后也会移植到其他的体系。"
 
 #. Tag: para
 #: welcome.xml:365
@@ -588,57 +550,53 @@ msgstr "Hurd 还没有完成，不适合日常应用，但开发仍在继续。H
 msgid ""
 "Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
-msgstr "请留意 &debian; GNU/Hurd 并不是一种 Linux 系统，因此许多 Linux 系统上的信息并不适用于它。"
+msgstr ""
+"请留意 &debian; GNU/Hurd 并不是一种 Linux 系统，因此许多 Linux 系统上的信息并"
+"不适用于它。"
 
 #. Tag: para
 #: welcome.xml:370
 #, no-c-format
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
 "\"> &debian; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
-msgstr "要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/hurd/\"> &debian; GNU/Hurd ports page</ulink> 以及 <email>debian-hurd@lists.debian.org</email> 邮件列表。"
+msgstr ""
+"要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/hurd/\"> "
+"&debian; GNU/Hurd ports page</ulink> 以及 <email>debian-hurd@lists.debian."
+"org</email> 邮件列表。"
 
 #. Tag: title
 #: welcome.xml:387
 #, no-c-format
-#| msgid "Getting Debian"
 msgid "Getting &debian;"
 msgstr "获得 &debian;"
 
 #. Tag: para
 #: welcome.xml:389
 #, no-c-format
-#| msgid ""
-#| "For information on how to download &debian-gnu; from the Internet or from "
-#| "whom official Debian CDs can be purchased, see the <ulink url=\"&url-"
-#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-#| "debian-mirrors;\">list of Debian mirrors</ulink> contains a full set of "
-#| "official Debian mirrors, so you can easily find the nearest one."
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
 "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
 "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
 "debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
 "official &debian; mirrors, so you can easily find the nearest one."
-msgstr "关于如何从因特网上下载 &debian-gnu; 或者购买官方 &debian; 光盘的信息，请参阅 <ulink url=\"&url-debian-distrib;\">distribution web page</ulink>。<ulink url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> 包含完整的 &debian; 官方镜像，您可以很容易找到最近的一个。"
+msgstr ""
+"关于如何从因特网上下载 &debian-gnu; 或者购买官方 &debian; 光盘的信息，请参阅 "
+"<ulink url=\"&url-debian-distrib;\">distribution web page</ulink>。<ulink "
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> 包含完整的 "
+"&debian; 官方镜像，您可以很容易找到最近的一个。"
 
 #. Tag: para
 #: welcome.xml:398
 #, no-c-format
-#| msgid ""
-#| "Debian can be upgraded after installation very easily. The installation "
-#| "procedure will help set up the system so that you can make those upgrades "
-#| "once installation is complete, if need be."
 msgid ""
 "&debian; can be upgraded after installation very easily. The installation "
 "procedure will help set up the system so that you can make those upgrades "
 "once installation is complete, if need be."
-msgstr "&debian; 可以很容易地在安装之后升级。如果需要，安装步骤将帮助您建立系统，使您可以在安装之后立即进行升级。"
+msgstr ""
+"&debian; 可以很容易地在安装之后升级。如果需要，安装步骤将帮助您建立系统，使您"
+"可以在安装之后立即进行升级。"
 
 #. Tag: title
 #: welcome.xml:413
@@ -670,32 +628,26 @@ msgstr "文档的组织"
 #. Tag: para
 #: welcome.xml:435
 #, no-c-format
-#| msgid ""
-#| "This document is meant to serve as a manual for first-time Debian users. "
-#| "It tries to make as few assumptions as possible about your level of "
-#| "expertise. However, we do assume that you have a general understanding of "
-#| "how the hardware in your computer works."
 msgid ""
 "This document is meant to serve as a manual for first-time &debian; users. "
 "It tries to make as few assumptions as possible about your level of "
 "expertise. However, we do assume that you have a general understanding of "
 "how the hardware in your computer works."
-msgstr "本文意在成为 &debian; 的新手的使用手册。尽管它对用户的专业知识水平已经做了尽量少的假设，但我们还是设想您对计算机硬件如何工作有一个基本的了解。"
+msgstr ""
+"本文意在成为 &debian; 的新手的使用手册。尽管它对用户的专业知识水平已经做了尽"
+"量少的假设，但我们还是设想您对计算机硬件如何工作有一个基本的了解。"
 
 #. Tag: para
 #: welcome.xml:442
 #, no-c-format
-#| msgid ""
-#| "Expert users may also find interesting reference information in this "
-#| "document, including minimum installation sizes, details about the "
-#| "hardware supported by the Debian installation system, and so on. We "
-#| "encourage expert users to jump around in the document."
 msgid ""
 "Expert users may also find interesting reference information in this "
 "document, including minimum installation sizes, details about the hardware "
 "supported by the &debian; installation system, and so on. We encourage "
 "expert users to jump around in the document."
-msgstr "专业用户可以在本手册中找到一些有趣的参考信息，包括最小安装尺寸，&debian; 安装程序支持的硬件细节，等等。我们鼓励专业用户有选择性的浏览本文档。"
+msgstr ""
+"专业用户可以在本手册中找到一些有趣的参考信息，包括最小安装尺寸，&debian; 安装"
+"程序支持的硬件细节，等等。我们鼓励专业用户有选择性的浏览本文档。"
 
 #. Tag: para
 #: welcome.xml:449
@@ -721,17 +673,14 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:463
 #, no-c-format
-#| msgid ""
-#| "Backup your system, perform any necessary planning and hardware "
-#| "configuration prior to installing Debian, in <xref linkend=\"preparing\"/"
-#| ">. If you are preparing a multi-boot system, you may need to create "
-#| "partitionable space on your hard disk for Debian to use."
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
 "configuration prior to installing &debian;, in <xref linkend=\"preparing\"/"
 ">. If you are preparing a multi-boot system, you may need to create "
 "partitionable space on your hard disk for &debian; to use."
-msgstr "备份系统，在安装 &debian; 之前进行必要的规划和硬件配置，位于 <xref linkend=\"preparing\"/>。如果需要多重引导系统，您可能需要为 &debian; 创建分区空间。"
+msgstr ""
+"备份系统，在安装 &debian; 之前进行必要的规划和硬件配置，位于 <xref linkend="
+"\"preparing\"/>。如果需要多重引导系统，您可能需要为 &debian; 创建分区空间。"
 
 #. Tag: para
 #: welcome.xml:471
@@ -754,15 +703,6 @@ msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这
 #. Tag: para
 #: welcome.xml:484
 #, no-c-format
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a Debian server (if you "
-#| "are not installing from a CD), partitioning your hard drives and "
-#| "installation of a base system, then selection and installation of tasks. "
-#| "(Some background about setting up the partitions for your Debian system "
-#| "is explained in <xref linkend=\"partitioning\"/>.)"
 msgid ""
 "Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
 "This involves choosing your language, configuring peripheral driver modules, "
@@ -772,7 +712,11 @@ msgid ""
 "then selection and installation of tasks. (Some background about setting up "
 "the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
-msgstr "执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光盘方式安装)，给硬盘分区和安装基本系统。(有关如何为 &debian; 系统建立分区的背景知识位于 <xref linkend=\"partitioning\"/>。)"
+msgstr ""
+"执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边"
+"驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光"
+"盘方式安装)，给硬盘分区和安装基本系统。(有关如何为 &debian; 系统建立分区的背"
+"景知识位于 <xref linkend=\"partitioning\"/>。)"
 
 #. Tag: para
 #: welcome.xml:497
@@ -785,15 +729,13 @@ msgstr "从您新安装的基本系统启动，<xref linkend=\"boot-new\"/>。"
 #. Tag: para
 #: welcome.xml:505
 #, no-c-format
-#| msgid ""
-#| "Once you've got your system installed, you can read <xref linkend=\"post-"
-#| "install\"/>. That chapter explains where to look to find more information "
-#| "about Unix and Debian, and how to replace your kernel."
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
 "install\"/>. That chapter explains where to look to find more information "
 "about Unix and &debian;, and how to replace your kernel."
-msgstr "一旦您安装完系统，可以阅读 <xref linkend=\"post-install\"/>。该章将解释在哪里寻找更多有关 Unix 和 &debian; 的信息，以及如何替换您的内核。"
+msgstr ""
+"一旦您安装完系统，可以阅读 <xref linkend=\"post-install\"/>。该章将解释在哪里"
+"寻找更多有关 Unix 和 &debian; 的信息，以及如何替换您的内核。"
 
 #. Tag: para
 #: welcome.xml:515
@@ -848,17 +790,6 @@ msgstr "关于版权与软件协议"
 #. Tag: para
 #: welcome.xml:553
 #, no-c-format
-#| msgid ""
-#| "We're sure that you've read some of the licenses that come with most "
-#| "commercial software &mdash; they usually say that you can only use one "
-#| "copy of the software on a single computer. This system's license isn't "
-#| "like that at all. We encourage you to put a copy of &debian-gnu; on every "
-#| "computer in your school or place of business. Lend your installation "
-#| "media to your friends and help them install it on their computers! You "
-#| "can even make thousands of copies and <emphasis>sell</emphasis> them "
-#| "&mdash; albeit with a few restrictions. Your freedom to install and use "
-#| "the system comes directly from Debian being based on <emphasis>free "
-#| "software</emphasis>."
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
 "commercial software &mdash; they usually say that you can only use one copy "
@@ -869,7 +800,13 @@ msgid ""
 "thousands of copies and <emphasis>sell</emphasis> them &mdash; albeit with a "
 "few restrictions. Your freedom to install and use the system comes directly "
 "from &debian; being based on <emphasis>free software</emphasis>."
-msgstr "我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用到您的学校或商业机构的每台计算机上。将安装介质借给朋友，并帮助他们安装到他们的计算机上！您甚至可以制作上千份拷贝，然后<emphasis>出售</emphasis>它们 &mdash; 尽管有一些限制。您安装和使用系统的自由权利因为 &debian; 是基于<emphasis>自由软件</emphasis>。"
+msgstr ""
+"我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算"
+"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用"
+"到您的学校或商业机构的每台计算机上。将安装介质借给朋友，并帮助他们安装到他们"
+"的计算机上！您甚至可以制作上千份拷贝，然后<emphasis>出售</emphasis>它们 "
+"&mdash; 尽管有一些限制。您安装和使用系统的自由权利因为 &debian; 是基于"
+"<emphasis>自由软件</emphasis>。"
 
 #. Tag: para
 #: welcome.xml:566
@@ -882,20 +819,15 @@ msgid ""
 "of distributing or using those programs. Free software also means that not "
 "only may anyone extend, adapt, and modify the software, but that they may "
 "distribute the results of their work as well."
-msgstr "称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权，也不是指包含该软件的 CD 必须免费分派。自由软件，某种程度上意味着您不须为分发和使用这些程序付费。自由软件还是指任何人可以扩展、改写、修改该软件，并且他们工作的成果也这样发布。"
+msgstr ""
+"称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权，也不是指包含该软件"
+"的 CD 必须免费分派。自由软件，某种程度上意味着您不须为分发和使用这些程序付"
+"费。自由软件还是指任何人可以扩展、改写、修改该软件，并且他们工作的成果也这样"
+"发布。"
 
 #. Tag: para
 #: welcome.xml:577
 #, no-c-format
-#| msgid ""
-#| "The Debian project, as a pragmatic concession to its users, does make "
-#| "some packages available that do not meet our criteria for being free. "
-#| "These packages are not part of the official distribution, however, and "
-#| "are only available from the <userinput>contrib</userinput> or "
-#| "<userinput>non-free</userinput> areas of Debian mirrors or on third-party "
-#| "CD-ROMs; see the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, "
-#| "under <quote>The Debian FTP archives</quote>, for more information about "
-#| "the layout and contents of the archives."
 msgid ""
 "The &debian; project, as a pragmatic concession to its users, does make some "
 "packages available that do not meet our criteria for being free. These "
@@ -905,23 +837,16 @@ msgid ""
 "<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>The Debian "
 "FTP archives</quote>, for more information about the layout and contents of "
 "the archives."
-msgstr "注意，&debian; 计划因为考虑用户实用性，也有不符合我们自由规则的软件包存在。这些软件包不属于官方发行版，只存在于 <userinput>contrib</userinput> 或 <userinput>non-free</userinput> &debian; 镜像区域或者第三方的 CD-ROM 中，请参阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的 <quote>The Debian FTP archives</quote> 章节以了解档案布局和内容的更多信息。"
+msgstr ""
+"注意，&debian; 计划因为考虑用户实用性，也有不符合我们自由规则的软件包存在。这"
+"些软件包不属于官方发行版，只存在于 <userinput>contrib</userinput> 或 "
+"<userinput>non-free</userinput> &debian; 镜像区域或者第三方的 CD-ROM 中，请参"
+"阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的 <quote>The Debian "
+"FTP archives</quote> 章节以了解档案布局和内容的更多信息。"
 
 #. Tag: para
 #: welcome.xml:591
 #, no-c-format
-#| msgid ""
-#| "Many of the programs in the system are licensed under the <emphasis>GNU</"
-#| "emphasis> <emphasis>General Public License</emphasis>, often simply "
-#| "referred to as <quote>the GPL</quote>. The GPL requires you to make the "
-#| "<emphasis>source code</emphasis> of the programs available whenever you "
-#| "distribute a binary copy of the program; that provision of the license "
-#| "ensures that any user will be able to modify the software. Because of "
-#| "this provision, the source code<footnote> <para> For information on how "
-#| "to locate, unpack, and build binaries from Debian source packages, see "
-#| "the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under "
-#| "<quote>Basics of the Debian Package Management System</quote>. </para> </"
-#| "footnote> for all such programs is available in the Debian system."
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
 "emphasis> <emphasis>General Public License</emphasis>, often simply referred "
@@ -934,37 +859,41 @@ msgid ""
 "<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>Basics of "
 "the Debian Package Management System</quote>. </para> </footnote> for all "
 "such programs is available in the &debian; system."
-msgstr "系统中很多软件所使用的许可证都是 <emphasis>GNU</emphasis> <emphasis>General Public License (通用公共授权)</emphasis>，通常简称为 <quote>the GPL</quote>。GPL 要求您将程序的<emphasis>源码</emphasis>随您发布的二进制拷贝一起提供；许可证的这项规定确保任何用户都可以修改软件。正是由于此规定，所有这些程序的源码<footnote> <para>对于如何根据 &debian; 源码包寻找、解包和创建二进制软件包，请查阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的<quote>Basics of the Debian Package Management System</quote>章节。</para> </footnote>都可以在 &debian; 系统中得到。"
+msgstr ""
+"系统中很多软件所使用的许可证都是 <emphasis>GNU</emphasis> <emphasis>General "
+"Public License (通用公共授权)</emphasis>，通常简称为 <quote>the GPL</quote>。"
+"GPL 要求您将程序的<emphasis>源码</emphasis>随您发布的二进制拷贝一起提供；许可"
+"证的这项规定确保任何用户都可以修改软件。正是由于此规定，所有这些程序的源码"
+"<footnote> <para>对于如何根据 &debian; 源码包寻找、解包和创建二进制软件包，请"
+"查阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的<quote>Basics of "
+"the Debian Package Management System</quote>章节。</para> </footnote>都可以"
+"在 &debian; 系统中得到。"
 
 #. Tag: para
 #: welcome.xml:610
 #, no-c-format
-#| msgid ""
-#| "There are several other forms of copyright statements and software "
-#| "licenses used on the programs in Debian. You can find the copyrights and "
-#| "licenses for every package installed on your system by looking in the "
-#| "file <filename>/usr/share/doc/<replaceable>package-name</replaceable>/"
-#| "copyright </filename> once you've installed a package on your system."
 msgid ""
 "There are several other forms of copyright statements and software licenses "
 "used on the programs in &debian;. You can find the copyrights and licenses "
 "for every package installed on your system by looking in the file <filename>/"
 "usr/share/doc/<replaceable>package-name</replaceable>/copyright </filename> "
 "once you've installed a package on your system."
-msgstr "&debian; 中的程序还有许多其他形式的版权声明和软件许可证。您可以在您的系统中找到每个软件包相关的版权和许可证，它们位于 <filename>/usr/share/doc/<replaceable>软件包名</replaceable>/copyright </filename>，这些文件在您将软件包安装到系统后就存在了。"
+msgstr ""
+"&debian; 中的程序还有许多其他形式的版权声明和软件许可证。您可以在您的系统中找"
+"到每个软件包相关的版权和许可证，它们位于 <filename>/usr/share/doc/"
+"<replaceable>软件包名</replaceable>/copyright </filename>，这些文件在您将软件"
+"包安装到系统后就存在了。"
 
 #. Tag: para
 #: welcome.xml:620
 #, no-c-format
-#| msgid ""
-#| "For more information about licenses and how Debian determines whether "
-#| "software is free enough to be included in the main distribution, see the "
-#| "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgid ""
 "For more information about licenses and how &debian; determines whether "
 "software is free enough to be included in the main distribution, see the "
 "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
-msgstr "关于 &debian; 如何判断软件是否足够自由到可以包括在主发行版中的信息，请参阅 <ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>。"
+msgstr ""
+"关于 &debian; 如何判断软件是否足够自由到可以包括在主发行版中的信息，请参阅 "
+"<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>。"
 
 #. Tag: para
 #: welcome.xml:626
@@ -977,4 +906,8 @@ msgid ""
 "the software is free, you are empowered to modify that software to suit your "
 "needs &mdash; and to enjoy the benefits of the changes made by others who "
 "have extended the software in this way."
-msgstr "在此，最重要的法律声明是此软件<emphasis>无担保</emphasis>。程序员创造此软件为的是使社群受益，而不能保证软件适用于任何特定用途。但是，因为软件是自由的，您可以修改此软件以使其能适用于您的需要 &mdash; 并享用其他人采用这种途径扩展后的修改成果。"
+msgstr ""
+"在此，最重要的法律声明是此软件<emphasis>无担保</emphasis>。程序员创造此软件为"
+"的是使社群受益，而不能保证软件适用于任何特定用途。但是，因为软件是自由的，您"
+"可以修改此软件以使其能适用于您的需要 &mdash; 并享用其他人采用这种途径扩展后的"
+"修改成果。"
diff --git a/po/zh_TW/administrivia.po b/po/zh_TW/administrivia.po
index 2fdd799c2..0a133f6f4 100644
--- a/po/zh_TW/administrivia.po
+++ b/po/zh_TW/administrivia.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-06-10 01:57+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -34,7 +34,7 @@ msgstr "關於本文件"
 #| "released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
 msgstr ""
@@ -192,7 +192,7 @@ msgstr ""
 #| "Kuře has documented a lot of the new functionality in Sarge's debian-"
 #| "installer."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
diff --git a/po/zh_TW/bookinfo.po b/po/zh_TW/bookinfo.po
index 4c6909240..ba2bd2397 100644
--- a/po/zh_TW/bookinfo.po
+++ b/po/zh_TW/bookinfo.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-06-10 01:57+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -48,14 +48,14 @@ msgstr ""
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
 msgstr ""
 "本安裝指南是基於一份舊版 Debian 安裝系統 (\"boot-floppies\") 手冊而撰寫的，並"
 "且針對新的 Debian 安裝系統進行了增補和修訂。但是，在 &architecture; 架構下，"
diff --git a/po/zh_TW/hardware.po b/po/zh_TW/hardware.po
index 08a54a19c..db847b61a 100644
--- a/po/zh_TW/hardware.po
+++ b/po/zh_TW/hardware.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-07-18 12:00+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -738,9 +738,9 @@ msgstr "I/O 匯流排"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
+"the VL bus). Essentially all personal computers sold in recent years use one "
+"of these."
 msgstr ""
 "系統匯流排為主機板的一部分，功能為使 CPU 和周邊設備，如儲存裝置通訊。您的電腦"
 "必須使用 ISA、EISA、PCI、微通道架構 (MCA，用於 IBM's PS/2 排線) 或者 VESA "
@@ -1451,36 +1451,28 @@ msgstr "S/390 與 zSeries 機器類型"
 
 #. Tag: para
 #: hardware.xml:1025
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
-msgstr ""
-"關於 S/390 和 zSeries 機器的完整支援資訊請參閱 IBM 的 Redbook <ulink url="
-"\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\">Linux for "
-"IBM eServer zSeries and S/390: Distributions</ulink> 第 2.1 章節，或者源於 "
-"<ulink url=\"http://oss.software.ibm.com/developerworks/opensource/linux390/"
-"index.shtml\">developerWorks 網站</ulink>的<ulink url=\"http://oss.software."
-"ibm.com/developerworks/opensource/linux390/documentation-2.4.shtml\">技術細節"
-"網頁</ulink>。簡而言之，G5、Multiprise 3000、G6 以及所有的 zSeries 都可以得到"
-"完整的支援﹔Multiprise 2000、G3 和 G4 機器使用 IEEE 浮點模擬來支援，因此會降"
-"低性能。"
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 development stream. The most current information about "
+"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink>."
+msgstr ""
 
 # index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, fuzzy, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "中央處理器，主機板和顯示的支援"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1490,13 +1482,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1506,7 +1498,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1515,13 +1507,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, fuzzy, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>apus</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1533,13 +1525,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, fuzzy, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>apus</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1549,7 +1541,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1557,13 +1549,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "筆記型電腦"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Laptops are also supported. Laptops are often specialized or contain "
@@ -1583,13 +1575,13 @@ msgstr ""
 
 # index.docbook:1624, index.docbook:1649, index.docbook:1672
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "多處理器"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, fuzzy, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1605,7 +1597,7 @@ msgstr ""
 "擔，所以這並不會影響安裝。"
 
 #. Tag: para
-#: hardware.xml:1138
+#: hardware.xml:1139
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1629,7 +1621,7 @@ msgstr ""
 "</phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, fuzzy, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1645,7 +1637,7 @@ msgstr ""
 "擔，所以這並不會影響安裝。"
 
 #. Tag: para
-#: hardware.xml:1162
+#: hardware.xml:1163
 #, no-c-format
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1653,7 +1645,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, fuzzy, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1668,7 +1660,7 @@ msgstr ""
 "用第一個處理器。"
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order to take advantage of multiple processors, you'll have to replace "
@@ -1691,7 +1683,7 @@ msgstr ""
 "</quote> 小節中選擇 <quote>&smp-config-option;</quote> 選項。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, fuzzy, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1708,7 +1700,7 @@ msgstr ""
 "器。"
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1717,7 +1709,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, fuzzy, no-c-format
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
@@ -1732,34 +1724,41 @@ msgstr ""
 "</quote> 小節中選擇 <quote>&smp-config-option;</quote> 選項。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, fuzzy, no-c-format
 msgid "Graphics Card Support"
 msgstr "圖形介面卡"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "您應該讓終端控制台使用 VGA 相容的顯示介面。幾乎所有的新顯卡都相容 VGA。在不使"
 "用 X11 支援的情況下，您也可以用古老的 CGA, MDA 或 HGA 工作。 注意，在本文所述"
 "的安裝過程中並不會使用 X11 圖形界面。"
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, fuzzy, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI and PCIe video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "Debian 對顯示卡的支援決定於 XFree86 的 X11 系統。大多數 AGP，PCI 和 PCI 顯示"
 "卡都能在 XFree86 下工作。更多的關於圖形匯流排、顯示卡、顯示器和指點設備的支援"
@@ -1767,13 +1766,13 @@ msgstr ""
 "XFree86 &x11ver; 版。"
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1786,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1803,13 +1802,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "網路連接硬體"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, fuzzy, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1823,7 +1822,7 @@ msgstr ""
 "ulink> 以瞭解詳細資訊。"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1831,61 +1830,61 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) 和 ESCON connection (實際或模擬)"
 
 #. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1332
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet 和 OSA-Express Fast Ethernet (non-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "QDIO 模式的 OSA-Express，HiperSockets 和 Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -1898,19 +1897,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -1922,7 +1921,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -1931,7 +1930,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -1940,7 +1939,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -1952,7 +1951,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -1964,13 +1963,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -1978,13 +1977,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -1996,7 +1995,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2006,7 +2005,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2018,13 +2017,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2032,13 +2031,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2050,13 +2049,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2070,13 +2069,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "周邊設備與其他硬體"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2087,7 +2086,7 @@ msgstr ""
 "設備。然而，在安裝系統的時候並不需要其中的大部分設備。"
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, fuzzy, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2097,7 +2096,7 @@ msgstr ""
 "linkend=\"usb-keyboard-config\"/>)。"
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2108,7 +2107,7 @@ msgstr ""
 "Compatibility HOWTO</ulink> 來判斷您的硬體是否由 Linux 支援。"
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2119,7 +2118,7 @@ msgstr ""
 "DASD 上或者透過 NFS、HTTP、FTP 從網路上取得。"
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2127,13 +2126,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2145,7 +2144,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2157,7 +2156,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2169,13 +2168,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "特別為 GNU/&arch-kernel; 採購硬體"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, fuzzy, no-c-format
 #| msgid ""
 #| "There are several vendors, who ship systems with Debian or other "
@@ -2195,7 +2194,7 @@ msgstr ""
 "為這些硬體都已經確保能被 GNU/Linux 很好地支援。"
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, fuzzy, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2209,7 +2208,7 @@ msgstr ""
 "url=\"&url-windows-refund;\"></ulink> 以瞭解更多的資訊。"
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2225,13 +2224,13 @@ msgstr ""
 "支援對 &arch-kernel; 友好的硬體銷售商。"
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "避免專有或封閉的硬體"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2243,7 +2242,7 @@ msgstr ""
 "開的協議才能取用文件，以阻止我們發佈 &arch-kernel; 驅動程式原始碼。"
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2257,13 +2256,13 @@ msgstr ""
 "識到自由軟體社群也是一個重要的市場。"
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Windows 專用硬體"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2285,7 +2284,7 @@ msgstr ""
 "還會與相同功能但保留內嵌處理器的設備昂貴。"
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, fuzzy, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2317,7 +2316,7 @@ msgstr ""
 "嵌處理器而造成的性能下降。"
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, fuzzy, no-c-format
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
@@ -2332,13 +2331,13 @@ msgstr ""
 "hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink> 為止。"
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "安裝媒介"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, fuzzy, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2354,13 +2353,13 @@ msgstr ""
 "要返回來參考本頁。"
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "軟碟"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2371,19 +2370,19 @@ msgstr ""
 "(1440kB)軟碟。"
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "對於 CHRP，軟碟已經被停止支援。"
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2396,7 +2395,7 @@ msgstr ""
 "IDE/ATAPI 的老式非標準 CD-ROM 光碟機。"
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2414,7 +2413,7 @@ msgstr ""
 "\"boot-installer\"/>。"
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2423,7 +2422,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2433,13 +2432,13 @@ msgstr ""
 "援。"
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, fuzzy, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2456,13 +2455,13 @@ msgstr ""
 "<quote>Unix</quote> 或 <quote>512</quote> 的位置上。"
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "硬碟"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2473,7 +2472,7 @@ msgstr ""
 "載入安裝程式。"
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2483,13 +2482,13 @@ msgstr ""
 "區 (UFS slices) 進行安裝。"
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB 隨身碟"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Many Debian boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2511,13 +2510,13 @@ msgstr ""
 "系統。這對那些沒有足夠空間容納不必要設備的小型系統非常有用。"
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "網路"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2530,7 +2529,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, fuzzy, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2541,7 +2540,7 @@ msgstr ""
 "這是在 Mips 下的推薦安裝方式</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2551,13 +2550,13 @@ msgstr ""
 "選擇。"
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x 或 GNU 系統"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, fuzzy, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2572,13 +2571,13 @@ msgstr ""
 "upgrade\"/>。"
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "支援的儲存系統"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The Debian boot disks contain a kernel which is built to maximize the "
@@ -2604,7 +2603,7 @@ msgstr ""
 "的硬體上安裝。"
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, fuzzy, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for floppies, "
@@ -2617,7 +2616,7 @@ msgstr ""
 "extensions (VFAT)、 NTFS、以及其他一些格式。"
 
 #. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
 #, fuzzy, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2632,7 +2631,7 @@ msgstr ""
 "howto;\">Linux Hardware Compatibility HOWTO</ulink> 以取得更詳細資訊。"
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2654,7 +2653,7 @@ msgstr ""
 "ulink>以瞭解更多關於 Linux 核心支援 SPARC 硬體的情況。"
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2665,7 +2664,7 @@ msgstr ""
 "援 CHRP 系統上的軟碟。"
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2676,7 +2675,7 @@ msgstr ""
 "援軟碟機。"
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2684,7 +2683,7 @@ msgid ""
 msgstr "所有 Linux 核心支援的儲存系統也都被開機系統所支援。"
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2696,13 +2695,13 @@ msgstr ""
 "援。"
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "記憶體與硬碟空間的需求"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2712,7 +2711,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2724,6 +2723,28 @@ msgid ""
 "is only advised for experienced users."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "關於 S/390 和 zSeries 機器的完整支援資訊請參閱 IBM 的 Redbook <ulink url="
+#~ "\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\">Linux for "
+#~ "IBM eServer zSeries and S/390: Distributions</ulink> 第 2.1 章節，或者源"
+#~ "於 <ulink url=\"http://oss.software.ibm.com/developerworks/opensource/"
+#~ "linux390/index.shtml\">developerWorks 網站</ulink>的<ulink url=\"http://"
+#~ "oss.software.ibm.com/developerworks/opensource/linux390/documentation-2.4."
+#~ "shtml\">技術細節網頁</ulink>。簡而言之，G5、Multiprise 3000、G6 以及所有"
+#~ "的 zSeries 都可以得到完整的支援﹔Multiprise 2000、G3 和 G4 機器使用 IEEE "
+#~ "浮點模擬來支援，因此會降低性能。"
+
 #~ msgid "DEC Alpha"
 #~ msgstr "DEC Alpha"
 
diff --git a/po/zh_TW/install-methods.po b/po/zh_TW/install-methods.po
index b2abd264b..8603a33fc 100644
--- a/po/zh_TW/install-methods.po
+++ b/po/zh_TW/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-07-18 12:10+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -1106,7 +1106,7 @@ msgid ""
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
 "</screen></informalexample> For the graphical installer you should add "
-"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+"<userinput>vga=788</userinput> to the second line."
 msgstr ""
 "<filename>syslinux.cfg</filename> 設定檔案應該含有下列兩行： "
 "<informalexample><screen>\n"
@@ -1501,7 +1501,7 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr ""
 "將以下檔案從 Debian 檔案庫中拷貝到硬碟中比較方便的地方，例如 <filename>/boot/"
diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po
index 9177727e7..c9fce1850 100644
--- a/po/zh_TW/preparing.po
+++ b/po/zh_TW/preparing.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-07-18 13:49+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -432,20 +432,18 @@ msgstr "&arch-title; Hardware References"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"在 &arch-title; 上使用Linux 2.4 版核心的安裝指示和設備驅動程式 (DASD, XPRAM, "
-"Console, tape, z90 crypto, chandev, network)"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "設備驅動程式與安裝指令"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -454,13 +452,13 @@ msgstr ""
 "IBM Redbook 描述如何將 Linux 與 zSeries 的 z/VM 和 &arch-title; 硬體結合。"
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "用於 &arch-title; 的 Linux"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, fuzzy, no-c-format
 #| msgid ""
 #| "IBM Redbook describing the Linux distributions available for the "
@@ -475,19 +473,19 @@ msgstr ""
 "但對於所有的 &arch-title; 發行套件，基本的安裝概念是相同的。"
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "IBM eServer zSeries and &arch-title; 的發行套件："
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "尋找硬體資訊來源"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -498,19 +496,19 @@ msgstr ""
 "熟悉一下您的硬體比較好。"
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "取得硬體資料的途徑有："
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "每個硬體附帶的手冊。"
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -521,19 +519,19 @@ msgstr ""
 "手冊確認按鍵。通常，它是 <keycap>Delete</keycap> 鍵。"
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "每個硬體的包裝盒。"
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Windows 控制台裡面的系統視窗。"
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -544,7 +542,7 @@ msgstr ""
 "記憶體和硬碟特別有用。"
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -554,179 +552,179 @@ msgstr ""
 "的相關資料。"
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "安裝所需的硬體資料"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "硬體"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "您需要瞭解的資料"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "硬碟"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "您擁有的容量"
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "它們在系統上的順序"
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr ""
 
 # index.docbook:445, index.docbook:497
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "可用空間"
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "分割區。"
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "安裝有其他作業系統的分割區。"
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "顯示器"
 
 # index.docbook:453, index.docbook:473, index.docbook:479, index.docbook:485
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "型號與製造商。"
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "支援的解析度。"
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "水平掃瞄頻率。"
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "垂直掃瞄頻率。"
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "支援的顏色深度(顏色數)"
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "螢幕大小。"
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "滑鼠"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "類型：序列、PS/2 或 USB。"
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "埠。"
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "製造商。"
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "按鍵數。"
 
 # index.docbook:472, index.docbook:500
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "網路"
 
 # index.docbook:475, index.docbook:501
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "適配器類型。"
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "印表機"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "支援的印表機解析度。"
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "顯示卡"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "可用顯示記憶體"
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -734,37 +732,37 @@ msgid ""
 msgstr "支援的解析度和顏色數 (還需檢驗您顯示器的能力)。"
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "設備編號。"
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "設備編號。"
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "OSA 卡的相對應適配器編號。"
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "硬體相容性"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, fuzzy, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -777,7 +775,7 @@ msgstr ""
 "種不同的硬體上運行。"
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -787,7 +785,7 @@ msgstr ""
 "體。"
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -800,7 +798,7 @@ msgstr ""
 "上。 因此，它們很快就會被廢棄。"
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -810,19 +808,19 @@ msgstr ""
 "的。"
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "您可以透過以下方式檢驗硬體相容性："
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "檢查製造商的網站來得到新的驅動程式。"
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -832,7 +830,7 @@ msgstr ""
 "式或設定。"
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -840,19 +838,19 @@ msgid ""
 msgstr "檢查您電腦架構的 &arch-kernel; 相容性列表網站。"
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "搜索網際網路尋找其他使用者的經驗。"
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "網路設置"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -863,31 +861,31 @@ msgstr ""
 "連接)，您需要向您的網路系統管理員咨詢這項資料。"
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "您的主機名(也許可以自己決定)。"
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "您的網網域名稱。"
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "您電腦的 IP 位址。"
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "您網路的網路遮罩。"
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -896,7 +894,7 @@ msgstr ""
 "預設路由閘道的 IP 位址，如果您的網路<emphasis>有</emphasis>閘道器的話。"
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -904,7 +902,7 @@ msgid ""
 msgstr "您的網路中作為 DNS (網域名稱稱服務) 伺服器的系統。"
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -916,31 +914,31 @@ msgstr ""
 "需瞭解這項資料，因為 DHCP 伺服器會在安裝過程中直接提供。"
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "如果您有一個無線網路，您應該找出："
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "您無線網路的 ESSID。"
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEP 安全金鑰 (如果可用)。"
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "滿足最低的硬體要求"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -951,7 +949,7 @@ msgstr ""
 "償的安裝系統。"
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -962,7 +960,7 @@ msgstr ""
 "建議的話，多數使用者會安裝失敗。"
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
@@ -971,7 +969,7 @@ msgstr ""
 "建議配備。"
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, fuzzy, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr ""
@@ -979,91 +977,97 @@ msgstr ""
 "伺服器的話，建議至少要 132 Mhz 的機器才行。"
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "建議的最低系統需求"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "安裝類別"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr ""
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "硬碟"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "無桌面系統"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 MB"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, fuzzy, no-c-format
 msgid "256 megabytes"
 msgstr "24 MB"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 GB"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "有桌面系統"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+msgid "128 megabytes"
+msgstr "128 MB"
+
+#. Tag: entry
+#: preparing.xml:682
 #, fuzzy, no-c-format
 msgid "512 megabytes"
 msgstr "128 MB"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, fuzzy, no-c-format
 msgid "5 gigabytes"
 msgstr "1 GB"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
 msgid ""
 "The actual minimum memory requirements are a lot less then the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for "
-"amd64). The same goes for the disk space requirements, especially if you "
-"pick and choose which applications to install; see <xref linkend=\"tasksel-"
-"size-list\"/> for additional information on disk space requirements."
+"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
+"same goes for the disk space requirements, especially if you pick and choose "
+"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"additional information on disk space requirements."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1075,7 +1079,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1084,7 +1088,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1093,7 +1097,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, fuzzy, no-c-format
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
@@ -1115,13 +1119,13 @@ msgstr ""
 "給 <filename>/var</filename>。"
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "為多重開機系統事先分割磁碟"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1134,7 +1138,7 @@ msgstr ""
 "傢俱，不會對其它房間有任何影響。"
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1146,28 +1150,29 @@ msgstr ""
 "客。"
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, fuzzy, no-c-format
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
-"phrase> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &debian; requires its own hard disk partitions. It "
-"cannot be installed on Windows or MacOS partitions. It may be able to share "
-"some partitions with other Unix systems, but that's not covered here. At the "
-"very least you will need a dedicated partition for the &debian; root."
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &debian; requires its own hard disk "
+"partitions. It cannot be installed on Windows or MacOS partitions. It may be "
+"able to share some partitions with other Unix systems, but that's not "
+"covered here. At the very least you will need a dedicated partition for the "
+"&debian; root."
 msgstr ""
 "如果您已經在您的機器中安裝作業系統 <phrase arch=\"i386\"> (Windows 9x, "
-"Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
-"<phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> ，同時也希望把 "
-"Linux 裝在同一顆硬碟上，那麼您就必須重新對硬碟進行分割。Debian 需要它自己專用"
-"的硬碟分割區。它不能被安裝在 Windows 或者 MacOS 的分割區上。它可以與其它 "
-"Linux 系統共享一些分割區，但是我們在這裡不會對此進行說明。最起碼，您要為 "
-"Debian 的根目錄準備一個專用的分割區。"
+"Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
+"phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> ，同時"
+"也希望把 Linux 裝在同一顆硬碟上，那麼您就必須重新對硬碟進行分割。Debian 需要"
+"它自己專用的硬碟分割區。它不能被安裝在 Windows 或者 MacOS 的分割區上。它可以"
+"與其它 Linux 系統共享一些分割區，但是我們在這裡不會對此進行說明。最起碼，您要"
+"為 Debian 的根目錄準備一個專用的分割區。"
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, fuzzy, no-c-format
 msgid ""
 "You can find information about your current partition setup by using a "
@@ -1184,7 +1189,7 @@ msgstr ""
 "任何改動。"
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1198,13 +1203,13 @@ msgstr ""
 "最好在把擋路的傢俱都移開，否則就要冒著傢俱被破壞的危險。"
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your computer has more than one hard disk, you may want to dedicate "
@@ -1222,7 +1227,7 @@ msgstr ""
 "建的分割區程式會漂亮地完成這個任務。"
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1246,7 +1251,7 @@ msgstr ""
 "還可以有幾個辦法可選，例如原先系統的安裝磁帶或光碟。"
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your machine already has multiple partitions, and enough space can be "
@@ -1270,7 +1275,7 @@ msgstr ""
 "先切割好分割區。"
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1285,7 +1290,7 @@ msgstr ""
 "Debian 安裝程式中的分割工具來重新調整檔案系統的大小。"
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If none of the above apply, you'll need to partition your hard disk "
@@ -1313,7 +1318,7 @@ msgstr ""
 "自身的分割區。"
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are going to install more than one operating system on the same "
@@ -1333,7 +1338,7 @@ msgstr ""
 "可能會慫恿您重新格式化不屬於它們自己的分割區。"
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1343,7 +1348,7 @@ msgstr ""
 "夠幫您免除這些煩惱。"
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, fuzzy, no-c-format
 #| msgid ""
 #| "In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
@@ -1372,7 +1377,7 @@ msgstr ""
 "而代之。"
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you currently have one hard disk with one partition (a common setup "
@@ -1387,13 +1392,13 @@ msgstr ""
 "您希望能多重開機原有的作業系統和 Debian，那麼您就需要："
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "備份電腦裡所有的資料。"
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1406,7 +1411,7 @@ msgstr ""
 "的 MacOS 系統。</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1416,13 +1421,13 @@ msgstr ""
 "個分割區，或者騰出一塊空間。"
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "把原有作業系統安裝到屬於它的新分割區上。"
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Boot back into the native system to verify everything's OK, and to "
@@ -1433,20 +1438,20 @@ msgid ""
 msgstr "開機到原有作業系統，以確保一切正常，再下載 Debian 安裝程式的開機檔案。"
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, fuzzy, no-c-format
 #| msgid "Boot the Debian installer to continue installing Debian."
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "啟動 Debian 安裝程式，並繼續安裝 Debian。"
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "DOS 或 Windows 下的分割"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are manipulating existing FAT or NTFS partitions, it is "
@@ -1464,7 +1469,7 @@ msgstr ""
 "Windows 分割，一般來說，Debian 的分割軟體會做得更好。"
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, fuzzy, no-c-format
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1482,34 +1487,35 @@ msgstr ""
 "524 MB)。為此，您可能需要移動硬碟上的 FAT 或 NTFS 分割區。"
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "在 DOS、Win-32 或者 OS/2 下的無害分割"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, fuzzy, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
 msgstr ""
 "各常見的安裝中，其中有一種就是希望在已經安裝有 DOS (含 Windows 3.1)、 Win32 "
-"(如 Windows 95、98、Me、NT、2000、XP、2003、Vista、7) 或者 OS/2 的系統上加裝 Debian 到同一顆"
-"硬碟的同時，還保留原有系統。注意，安裝程式支援重新設定被 DOS 和 Windows 使用"
-"的 FAT 和 NTFS 檔案系統的容量大小。您只需開機安裝程式，選擇 <menuchoice> "
-"<guimenuitem> 手動修改分割區表 </guimenuitem> </menuchoice> 選項，並選擇需要"
-"調整大小的分割區，指定新的大小。在多數情況下您毋須使用下面說明的方法。"
+"(如 Windows 95、98、Me、NT、2000、XP、2003、Vista、7) 或者 OS/2 的系統上加裝 "
+"Debian 到同一顆硬碟的同時，還保留原有系統。注意，安裝程式支援重新設定被 DOS "
+"和 Windows 使用的 FAT 和 NTFS 檔案系統的容量大小。您只需開機安裝程式，選擇 "
+"<menuchoice> <guimenuitem> 手動修改分割區表 </guimenuitem> </menuchoice> 選"
+"項，並選擇需要調整大小的分割區，指定新的大小。在多數情況下您毋須使用下面說明"
+"的方法。"
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Before going any further, you should have decided how you will be "
@@ -1532,7 +1538,7 @@ msgstr ""
 "置換分割區或者放置檔案系統。"
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1548,7 +1554,7 @@ msgstr ""
 "空間大小。"
 
 #. Tag: para
-#: preparing.xml:984
+#: preparing.xml:983
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The first thing needed is a copy of <command>fips</command> which is "
@@ -1562,16 +1568,14 @@ msgstr ""
 #| "compression driver or a disk manager. Create the disk and read the "
 #| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
 msgstr ""
 "第一件需要的東西是一份 <command>fips</command> 的拷貝。您可以從離您最近的 "
 "Debian 鏡像裡的 <filename>tools/</filename> 目錄下載它。解開這個 zip 壓縮檔"
@@ -1583,7 +1587,7 @@ msgstr ""
 "emphasis>請先做一張開機片並好好閱讀該文件。"
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1602,7 +1606,7 @@ msgstr ""
 "VFAT 分割區。"
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1614,7 +1618,7 @@ msgstr ""
 "<filename>a:\\fips</filename> 然後按照提示操作。"
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1624,13 +1628,13 @@ msgstr ""
 "遣。"
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "DOS 下的分割"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1652,7 +1656,7 @@ msgstr ""
 "DOS 或 Windows 中發現的各種古怪的錯誤。"
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, fuzzy, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1665,19 +1669,19 @@ msgstr ""
 "請這麼做："
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "SunOS 下的分割"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, fuzzy, no-c-format
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
@@ -1695,13 +1699,13 @@ msgstr ""
 "(CDROM) 分割區開機 Linux 和 SunOS。"
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "Linux 或其他 OS 下的分割"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1722,7 +1726,7 @@ msgstr ""
 "現。"
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1735,13 +1739,13 @@ msgstr ""
 "linkend=\"partitioning\"/>。"
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "MacOS/OSX 下的分割"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1756,7 +1760,7 @@ msgstr ""
 "<application>Drive Setup</application> 中。"
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1767,7 +1771,7 @@ msgstr ""
 "類型無關緊要，在後面的 &debian-gnu; 安裝程式中，它會被刪除並替換。"
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1791,7 +1795,7 @@ msgstr ""
 "X 分割區。"
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1808,13 +1812,13 @@ msgstr ""
 "援。"
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "安裝前硬體和作業系統的相關設定"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -1840,13 +1844,13 @@ msgstr ""
 "些硬體問題，您系統上這些硬體問題在將會影響到 &debian-gnu; 的可靠性。"
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "使用 BIOS 設定選單"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -1869,7 +1873,7 @@ msgstr ""
 "常性的系統當機或者根本無法安裝 Debian。"
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1882,25 +1886,25 @@ msgstr ""
 "quote>) 設定選單取決於 BIOS 軟體的作者是誰："
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "在 POST (開機自檢) 過程中按 <keycap>Delete</keycap> 鍵"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1910,25 +1914,25 @@ msgstr ""
 "keycap><keycap>Esc</keycap> </keycombo>，或 <keycap>Delete</keycap>鍵"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "在 POST 過程中按 <keycap>Esc</keycap>鍵"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -1940,13 +1944,13 @@ msgstr ""
 "keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1958,7 +1962,7 @@ msgstr ""
 "keycap> </keycombo> 或 <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -1968,7 +1972,7 @@ msgstr ""
 "invoking-bios-info;\"></ulink>。"
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -1984,13 +1988,13 @@ msgstr ""
 
 # index.docbook:1522, index.docbook:1865
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "選擇開機設備"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Many BIOS setup menus allow you to select the devices that will be used "
@@ -2017,7 +2021,7 @@ msgstr ""
 "從軟碟或者光碟機開機。這是安裝 Debian 最常用的兩個開機設備。"
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2029,7 +2033,7 @@ msgstr ""
 "碟機啟動系統。"
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, fuzzy, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2044,7 +2048,7 @@ msgstr ""
 "<quote>USB-ZIP</quote> 開機。"
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2055,13 +2059,13 @@ msgstr ""
 "要恢復原來的開機順序，這樣，您就能像以前一樣從硬碟開機了。"
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "修改 IDE 介面電腦的開機順序"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2073,7 +2077,7 @@ msgstr ""
 "關文件。"
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2083,19 +2087,19 @@ msgstr ""
 "關。不管如何，您要找的是列有設備的欄位。"
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "對 IDE 機器而言，列表裡常見的選項是 C、A、cdrom 或者 A、C、cdrom。"
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C 就是硬碟，而 A 則是軟碟機。"
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2106,7 +2110,7 @@ msgstr ""
 "keycap> 或者 <keycap>Page Down</keycap> 鍵能夠循環地切換可能的選項。"
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2114,20 +2118,20 @@ msgid ""
 msgstr "然後，儲存您對設定的修改。螢幕上的提示會告訴您如何才能儲存您的設定。"
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "修改 SCSI 介面電腦的開機順序"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr "當您的電腦開機時，可以按某些鍵進入 SCSI 的設定軟體。"
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2137,7 +2141,7 @@ msgstr ""
 "提示的時候啟動 SCSI 設定軟體。"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2149,20 +2153,20 @@ msgstr ""
 "的相關文件。"
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "尋找用來修改開機順序的工具軟體。"
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
 msgstr "透過這個工具軟體修改設定，讓光碟機的 SCSI ID 排在列表的首位。"
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2172,19 +2176,19 @@ msgstr ""
 "需要按 <keycap>F10</keycap>。"
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "其餘的 BIOS 設定項目"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "CD-ROM 的設定"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2197,13 +2201,13 @@ msgstr ""
 "userinput> 的錯誤提示，那麼就有可能是您的設定有問題。"
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "延伸記憶體與擴充記憶體"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2216,13 +2220,13 @@ msgstr ""
 "體設定得盡量小。&arch-kernel; 需要使用延伸記憶體，但無法利用擴充記憶體。"
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "病毒保護"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2245,13 +2249,13 @@ msgstr ""
 "後，您不需要再去修改主開機磁區 (MBR) </para> </footnote>"
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "記憶體映像"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2275,13 +2279,13 @@ msgstr ""
 "能妨礙 &arch-kernel; 存取硬體設備。"
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "記憶體空洞"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2293,7 +2297,7 @@ msgstr ""
 "塊。"
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2312,13 +2316,13 @@ msgstr ""
 "定，則一切正常，否則就不行。"
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "進階電源管理"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2333,13 +2337,13 @@ msgstr ""
 "更好。"
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "使用 OpenFireware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2353,7 +2357,7 @@ msgstr ""
 "電腦手冊中相關的硬體文件。"
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, fuzzy, no-c-format
 #| msgid ""
 #| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2377,7 +2381,7 @@ msgstr ""
 "powerpc-faq;\"></ulink> 取得更多提示。"
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2399,7 +2403,7 @@ msgstr ""
 "器連接埠連接到另外一台電腦上的終端程式來與 OpenFirmware 交互。"
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, fuzzy, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2419,13 +2423,13 @@ msgstr ""
 "nvram。"
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "使用 OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, fuzzy, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2439,7 +2443,7 @@ msgstr ""
 "做很多事情如診斷，簡單腳本，等等。"
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2458,7 +2462,7 @@ msgstr ""
 "下 <keycap>n</keycap> 鍵得到新風格的提示符號。"
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2472,7 +2476,7 @@ msgstr ""
 "件。"
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, fuzzy, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2490,7 +2494,7 @@ msgstr ""
 "Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, fuzzy, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2529,7 +2533,7 @@ msgstr ""
 "OpenBoot Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2558,19 +2562,19 @@ msgstr ""
 "</screen></informalexample> 或在 Solaris下執行："
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 設置"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2590,7 +2594,7 @@ msgstr ""
 "的方式使用。這歸因於該系統上的 3215/3270 控制台是線性，而不是字元型的。"
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2608,7 +2612,7 @@ msgstr ""
 "機。"
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, fuzzy, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2629,13 +2633,13 @@ msgstr ""
 "本文件查看 Debian 規格的安裝步驟。"
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "本地的 (Native) 和 LPAR 安裝"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2651,13 +2655,13 @@ msgstr ""
 "如何為 Linux 建立 LPAR 的部分。"
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "以一個 VM guest 安裝"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2673,26 +2677,34 @@ msgstr ""
 "如何為運行 Linux 建立 VM guest 的部分。"
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "您需要從 <filename>generic</filename> 子目錄複製所有的文件到您的 CMS 磁碟。請"
 "確認 <filename>kernel.debian</filename> 和 <filename>initrd.debian</"
 "filename> 是以固定 80 個字元長度的二進位形式進行傳輸。"
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "設置安裝伺服器"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2705,7 +2717,7 @@ msgstr ""
 "NFS，HTTP 或 FTP 存取。"
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, fuzzy, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2717,25 +2729,25 @@ msgstr ""
 "相關和一些獨立於架構的檔案。您也可以複製所有的安裝光碟片到這樣的目錄樹中。"
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "需要留意的硬體問題"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS 支援與鍵盤"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2753,13 +2765,13 @@ msgstr ""
 "<quote>USB keyboard support</quote> 選項。"
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2772,6 +2784,16 @@ msgid ""
 "<quote>thousands</quote> or <quote>millions</quote>."
 msgstr ""
 
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "在 &arch-title; 上使用Linux 2.4 版核心的安裝指示和設備驅動程式 (DASD, "
+#~ "XPRAM, Console, tape, z90 crypto, chandev, network)"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "設備驅動程式與安裝指令"
+
 #~ msgid "Linux/Alpha FAQ"
 #~ msgstr "Linux/Alpha 常見問答集"
 
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index 20b1a277f..6b2efe81c 100644
--- a/po/zh_TW/random-bits.po
+++ b/po/zh_TW/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-07-18 14:20+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -778,9 +778,37 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS 伺服器"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
 #, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
+#, fuzzy, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
 "may automatically install a <firstterm>localization task</firstterm>, if one "
@@ -792,13 +820,13 @@ msgstr ""
 "不同﹔您應該給 200MB 以上的空間用於下載和安裝。"
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section explains how to install &debian-gnu; from an existing Unix "
@@ -828,7 +856,7 @@ msgstr ""
 "個指令是在 Debian chroot 環境中輸入的。"
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Once you've got the new Debian system configured to your preference, you "
@@ -849,7 +877,7 @@ msgstr ""
 "不能透過任何開機或者安裝媒介完成安裝的權宜之計。"
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -863,13 +891,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "準備開始"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, fuzzy, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -883,7 +911,7 @@ msgstr ""
 "想要裝 X， 就需要至少 300MB 的空間了。"
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, fuzzy, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -901,7 +929,7 @@ msgstr ""
 "<userinput>-j</userinput>。"
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, fuzzy, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -924,7 +952,7 @@ msgstr ""
 "filename>)檔案系統)。掛載點的名稱是任意的，後面的步驟將會用到它。"
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, fuzzy, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -934,7 +962,7 @@ msgstr ""
 "# mount /dev/hda6 /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -943,13 +971,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "安裝 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, fuzzy, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -969,7 +997,7 @@ msgstr ""
 "下載並安裝 <command>debootstrap</command>。"
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, fuzzy, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -994,7 +1022,7 @@ msgstr ""
 "些二進位檔。要把二進位檔安裝到系統中，您必須要擁有 root 的權限。"
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, fuzzy, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1006,13 +1034,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "執行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, fuzzy, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -1028,7 +1056,7 @@ msgstr ""
 "ulink>。"
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1040,7 +1068,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, fuzzy, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1060,7 +1088,7 @@ msgstr ""
 "<userinput>sparc</userinput>。"
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, fuzzy, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1070,13 +1098,13 @@ msgstr ""
 "http://http.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基本系統的設定"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1087,19 +1115,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1112,19 +1140,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1132,14 +1160,14 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1148,13 +1176,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分割區的掛載"
 
 #. Tag: para
-#: random-bits.xml:591
+#: random-bits.xml:598
 #, fuzzy, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1225,13 +1253,13 @@ msgstr ""
 "a</userinput>，那麼請一定要在接著做之前先把 proc 掛載好："
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1240,19 +1268,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, fuzzy, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, fuzzy, no-c-format
 msgid "Setting Timezone"
 msgstr "設定您的滑鼠"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1262,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1270,13 +1298,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "網路的設定"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, fuzzy, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1385,13 +1413,13 @@ msgstr ""
 "在系統啟動時，每塊網卡就能取得您所預期的 interface 名稱了(eth0、eth1 等等)。"
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, fuzzy, no-c-format
 msgid "Configure Apt"
 msgstr "網路的設定"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1407,13 +1435,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, fuzzy, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "鍵盤的設定"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, fuzzy, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1433,7 +1461,7 @@ msgstr ""
 "參閱相應的本地化指南(localisation HOWTO)。"
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, fuzzy, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1441,7 +1469,7 @@ msgid ""
 msgstr "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1449,13 +1477,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "核心的安裝"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, fuzzy, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1469,19 +1497,19 @@ msgstr ""
 "參數來安裝它。"
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, fuzzy, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1490,13 +1518,13 @@ msgstr ""
 "# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的設定"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, fuzzy, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1509,7 +1537,7 @@ msgstr ""
 "Debian 的 chroot 中使用 apt-get 完成。"
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, fuzzy, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1531,7 +1559,7 @@ msgstr ""
 "lilo，它就會用哪個系統裡的 <filename>lilo.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1546,7 +1574,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1555,13 +1583,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "下面有一個簡單的 <filename>/etc/lilo.conf</filename> 例子："
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, fuzzy, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1582,7 +1610,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
@@ -1608,7 +1636,7 @@ msgstr ""
 "<filename>lilo.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1638,13 +1666,13 @@ msgstr ""
 "userinput> 換成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1657,7 +1685,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1666,19 +1694,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, fuzzy, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1689,7 +1717,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1700,7 +1728,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1709,7 +1737,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1719,13 +1747,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1733,13 +1761,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1747,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1756,13 +1784,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, fuzzy, no-c-format
 msgid "Setting up source"
 msgstr "設定您的滑鼠"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1770,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1794,13 +1822,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, fuzzy, no-c-format
 msgid "Installing target"
 msgstr "核心的安裝"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1816,13 +1844,13 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1830,13 +1858,13 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1846,7 +1874,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -1855,26 +1883,26 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, fuzzy, no-c-format
 msgid "Configure the network"
 msgstr "網路的設定"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -1882,7 +1910,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -1890,13 +1918,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, fuzzy, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -1907,7 +1935,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -1916,7 +1944,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -1926,7 +1954,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -1934,7 +1962,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -1945,7 +1973,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -1958,7 +1986,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -1966,7 +1994,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -1975,7 +2003,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -1986,7 +2014,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -1994,7 +2022,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2007,13 +2035,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2023,7 +2051,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2035,7 +2063,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2049,7 +2077,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2061,7 +2089,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2073,7 +2101,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2081,7 +2109,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2091,7 +2119,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2101,13 +2129,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2116,7 +2144,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2129,7 +2157,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2138,7 +2166,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/zh_TW/using-d-i.po b/po/zh_TW/using-d-i.po
index 830e8ecdb..e83cd29d3 100644
--- a/po/zh_TW/using-d-i.po
+++ b/po/zh_TW/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2005-07-18 14:26+0800\n"
 "Last-Translator: Jhang, Jia-Wei <dreamcrer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -431,37 +431,49 @@ msgstr "Anna's Not Nearly APT。從選擇的鏡像站或 CD 取得安裝軟體�
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
-msgid "clock-setup"
+msgid "user-setup"
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:247
 #, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr ""
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
+msgid "clock-setup"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:255
+#, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
 "not."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Allows the user to partition disks attached to the system, create file "
@@ -478,13 +490,13 @@ msgstr ""
 "能，如自動模式或 LVM 支援。在 Debian 裡這是建議的分割工具。"
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -493,13 +505,13 @@ msgstr ""
 "允許使用者為系統安排磁碟分割區。根據使用者電腦的架構選擇合適的分割工具。"
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -507,13 +519,13 @@ msgid ""
 msgstr "顯示分割區列表，按照使用者指令為選擇的分割區建立檔案系統。"
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -521,13 +533,13 @@ msgid ""
 msgstr "幫助使用者配置 <firstterm>LVM</firstterm> (Logical Volume Manager)。"
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -539,13 +551,13 @@ msgstr ""
 "RAID 控制器的高級。"
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -553,18 +565,6 @@ msgid ""
 msgstr "安裝一些基本的套件，讓電腦重起後能在 &debian-gnu; 下運行。"
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr ""
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -995,12 +995,13 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "鍵盤經常因不同語言使用的字元不同而有不同的配置。選擇一個適合您鍵盤的配置，或"
 "者為沒出現的配置選擇一個接近的。一旦系統安裝完畢，您可以從更大的範圍您選擇鍵"
-"盤配置 (在安裝完之後用 root 執行 <command>dpkg-reconfigure keyboard-configuration</command>)。"
+"盤配置 (在安裝完之後用 root 執行 <command>dpkg-reconfigure keyboard-"
+"configuration</command>)。"
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1304,11 +1305,128 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "設定使用者和密碼"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, no-c-format
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "設定 root 密碼"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"<emphasis>root</emphasis> 帳戶也被稱為<emphasis>超級使用者</emphasis>。系統中"
+"的所有安全防護措施對以超級使用者身份登陸者都是無效的。root 帳戶應該僅用來進行"
+"系統管理，而且使用時間應該盡可能短。"
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"您所建立的任何密碼都應該包含至少 6 個字元，同時包含大小寫字母，並且最好帶有標"
+"點符號等特殊字元。因為超級使用者具有最高權限，因此在您設定 root 密碼時尤其要"
+"小心。請避免採用能夠在字典中查到的單詞或者很容易猜測的個人資訊。"
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"如果他人向您索取您的 root 密碼，您也需要特別謹慎。除非您所管理的系統有多位管"
+"理員，否則您通常不應該將超級使用者密碼交給別人。"
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "建立一個普通使用者"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"系統會詢問您現在是否希望建立一個普通帳戶。您將使用該帳戶進行日常登陸操作。切"
+"記，平時<emphasis>不要</emphasis>使用 root 帳戶登陸或者將其作為個人帳號使用。"
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"為什麼呢？避免使用 root 特權帳戶的一個原因是，它很容易對系統造成無法挽回的破"
+"壞。另一個原因是，您有可能被惡意誘使執行<emphasis>特洛伊木馬</emphasis>程式 "
+"&mdash; 這是一種在您未知的情況下利用超級使用者權限損害系統安全的程式。任何合"
+"格的 Unix 系統管理書籍中都會涉及到這一主題 &mdash; 如果您不是很瞭解這方面的內"
+"容，建議您找一本書進行學習。"
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"您首先會被要求輸入使用者的全名。然後要求輸入使用者帳號名﹔通常為姓之類的即"
+"可，並且會成為預設值。最後，您將要求輸入該帳號的密碼。"
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"如果在安裝完畢後您還希望建立其它新帳戶，請使用 <command>adduser</command> 命"
+"令。"
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "分割區與選擇掛載點"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, fuzzy, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1323,7 +1441,7 @@ msgstr ""
 "載點，並為近似選項進行設定，例如 LVM 或 RAID 設備。"
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, fuzzy, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1333,7 +1451,7 @@ msgstr ""
 "的細節，請參閱 <xref linkend=\"partitioning\"/>。"
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1347,7 +1465,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, fuzzy, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1360,14 +1478,14 @@ msgstr ""
 "<guimenuitem>手動編輯磁碟分割表</guimenuitem> 。"
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, fuzzy, no-c-format
 #| msgid "Created partitions"
 msgid "Supported partitioning options"
 msgstr "所新建的分割區"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1376,7 +1494,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1389,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1397,38 +1515,38 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, fuzzy, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "配置邏輯容量管理(LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1438,13 +1556,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1453,13 +1571,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1468,7 +1586,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1477,26 +1595,26 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1506,13 +1624,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1520,13 +1638,13 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1534,19 +1652,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1554,13 +1672,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, fuzzy, no-c-format
 msgid "Guided Partitioning"
 msgstr "分割區方式"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1572,14 +1690,14 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1590,7 +1708,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1601,7 +1719,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1613,7 +1731,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1625,7 +1743,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1636,7 +1754,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, fuzzy, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1653,73 +1771,73 @@ msgstr ""
 "的方式而不同)，那麼嚮導式分割區將以失敗告終。"
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "分割區方式"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "所需最小空間"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "所新建的分割區"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "所有檔案在同一分割區"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, fuzzy, no-c-format
 msgid "Separate /home partition"
 msgstr "所新建的分割區"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1729,7 +1847,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1739,7 +1857,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, fuzzy, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1752,7 +1870,7 @@ msgstr ""
 "外的一項，可以讓您手動把某個分割區作為 EFI 開機分割區。"
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1764,7 +1882,7 @@ msgstr ""
 "訊。"
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, fuzzy, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -1811,7 +1929,7 @@ msgstr ""
 "區大小、可選的旗標、採用的檔案系統，及其掛載點 (如果有的話)。"
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, fuzzy, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -1830,13 +1948,13 @@ msgstr ""
 "區的辦法來完成自己所設想的分割規劃。"
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, fuzzy, no-c-format
 msgid "Manual Partitioning"
 msgstr "分割區方式"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, fuzzy, no-c-format
 #| msgid ""
 #| "A similar screen to the one shown just above will be displayed if you "
@@ -1857,7 +1975,7 @@ msgstr ""
 "內容將會在本節的後面談到。"
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, fuzzy, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -1870,7 +1988,7 @@ msgstr ""
 "後，在被選中的磁碟下會出現一個新行，上面寫著<quote>未使用空間</quote>。"
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, fuzzy, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -1903,7 +2021,7 @@ msgstr ""
 "自動退回到 <command>partman</command> 的主畫面。"
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, fuzzy, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -1922,7 +2040,7 @@ msgstr ""
 "swap。在這個選單中，您還可以刪除分割區。"
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -1937,7 +2055,7 @@ msgstr ""
 "下面的步驟，直到您改正了這個錯誤。"
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, fuzzy, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -1948,7 +2066,7 @@ msgstr ""
 "一點，不讓您繼續操作，直到您劃分出這樣一個分割區。"
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -1964,7 +2082,7 @@ msgstr ""
 "者 <filename>partman-lvm</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -1977,13 +2095,13 @@ msgstr ""
 "硬碟上進行的所有操作。此時，安裝程式會讓您確認是否就照此設定進行分割。"
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, fuzzy, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "配置多磁碟設備 (Software RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2009,7 +2127,7 @@ msgstr ""
 "(或者更有名的 <firstterm>software RAID</firstterm>)。"
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2022,7 +2140,7 @@ msgstr ""
 "<command>partman</command> 格式化，分配掛載點，等等)。"
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, fuzzy, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2103,101 +2221,101 @@ msgstr ""
 "訊。 </para></listitem> </varlistentry> </variablelist> 總結："
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "類型"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "最少設備"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "備用設備"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "倖免於磁碟損壞？"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "可用空間"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 # index.docbook:1106, index.docbook:1107
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>否</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "容量為最小分割區容量乘以 RAID 設備數"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 # index.docbook:1114, index.docbook:1122
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "可選"
 
 # index.docbook:1115, index.docbook:1123
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>是</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "容量為 RAID 中的最小分割區"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2205,7 +2323,7 @@ msgid ""
 msgstr "容量為最小分割區乘以 (RAID 設備數量減一)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, fuzzy, no-c-format
 #| msgid "RAID0"
 msgid "RAID6"
@@ -2213,14 +2331,14 @@ msgstr "RAID0"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, fuzzy, no-c-format
 #| msgid "<entry>2</entry>"
 msgid "<entry>4</entry>"
 msgstr "<entry>2</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2231,14 +2349,14 @@ msgid ""
 msgstr "容量為最小分割區乘以 (RAID 設備數量減一)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, fuzzy, no-c-format
 #| msgid "RAID0"
 msgid "RAID10"
 msgstr "RAID0"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2246,7 +2364,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, fuzzy, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2256,7 +2374,7 @@ msgstr ""
 "howto;\">Software RAID HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2271,7 +2389,7 @@ msgstr ""
 "理容量 </guimenuitem> </menuchoice>。)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2284,7 +2402,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Support for MD is a relatively new addition to the installer. You may "
@@ -2306,7 +2424,7 @@ msgstr ""
 "於有經驗的使用者，從介殼手動地處理一些配置和安裝步驟，也許能避開這些問題"
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, fuzzy, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2324,7 +2442,7 @@ msgstr ""
 "從其中選擇一項 (如 RAID1)。後續操作會根據您選擇的 MD 類型而定。"
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2335,7 +2453,7 @@ msgstr ""
 "要組成 MD 的分割區。"
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, fuzzy, no-c-format
 #| msgid ""
 #| "RAID1 is a bit more tricky. First, you will be asked to enter the number "
@@ -2360,7 +2478,7 @@ msgstr ""
 "&d-i; 將不會允許您繼續下去，直到錯誤被改正為止。"
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, fuzzy, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2370,7 +2488,7 @@ msgstr ""
 "區。"
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, fuzzy, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2380,7 +2498,7 @@ msgstr ""
 "區。"
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2393,7 +2511,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, fuzzy, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2409,7 +2527,7 @@ msgstr ""
 "RAID1 (相當可靠的 100 GB 分割區用於 <filename>/home</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2422,13 +2540,13 @@ msgstr ""
 "案系統並分配掛載點。"
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, fuzzy, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "配置邏輯容量管理(LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2442,7 +2560,7 @@ msgstr ""
 "移動檔案或符號鏈結等方法所困擾。"
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, fuzzy, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2460,7 +2578,7 @@ msgstr ""
 "優點在於它可以跨越多個物理磁碟。"
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, fuzzy, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2478,7 +2596,7 @@ msgstr ""
 "果您還沒有讀過，您應該查閱 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, fuzzy, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2493,7 +2611,7 @@ msgstr ""
 "理容量 </guimenuitem> </menuchoice>。)"
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2506,7 +2624,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2514,43 +2632,43 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2558,7 +2676,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2566,7 +2684,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, fuzzy, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2577,13 +2695,13 @@ msgstr ""
 "與其他普通分割區一樣的新建的邏輯容量 (您也應該這樣看待它們)。"
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, fuzzy, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "設定網路"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2597,7 +2715,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2614,7 +2732,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2624,7 +2742,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2637,7 +2755,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2648,7 +2766,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2658,13 +2776,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2680,13 +2798,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2696,13 +2814,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2714,7 +2832,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2724,25 +2842,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -2752,13 +2870,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -2770,7 +2888,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -2783,13 +2901,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -2803,7 +2921,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -2812,13 +2930,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -2827,25 +2945,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -2855,19 +2973,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -2879,7 +2997,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -2890,7 +3008,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -2905,7 +3023,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -2919,7 +3037,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -2939,7 +3057,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -2951,7 +3069,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -2959,13 +3077,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "安裝基本系統"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, fuzzy, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -2977,7 +3095,7 @@ msgstr ""
 "件。如果您用較慢的電腦或網路連接，這要花費好一會兒時間。"
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, fuzzy, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -2992,7 +3110,7 @@ msgstr ""
 "左 Alt</keycap><keycap>F1</keycap></keycombo>。"
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, fuzzy, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3003,7 +3121,7 @@ msgstr ""
 "<filename>/var/log/messages</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3016,7 +3134,7 @@ msgstr ""
 "的核心。"
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3028,7 +3146,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3038,123 +3156,6 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "設定使用者和密碼"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "設定 root 密碼"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"<emphasis>root</emphasis> 帳戶也被稱為<emphasis>超級使用者</emphasis>。系統中"
-"的所有安全防護措施對以超級使用者身份登陸者都是無效的。root 帳戶應該僅用來進行"
-"系統管理，而且使用時間應該盡可能短。"
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"您所建立的任何密碼都應該包含至少 6 個字元，同時包含大小寫字母，並且最好帶有標"
-"點符號等特殊字元。因為超級使用者具有最高權限，因此在您設定 root 密碼時尤其要"
-"小心。請避免採用能夠在字典中查到的單詞或者很容易猜測的個人資訊。"
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"如果他人向您索取您的 root 密碼，您也需要特別謹慎。除非您所管理的系統有多位管"
-"理員，否則您通常不應該將超級使用者密碼交給別人。"
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "建立一個普通使用者"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"系統會詢問您現在是否希望建立一個普通帳戶。您將使用該帳戶進行日常登陸操作。切"
-"記，平時<emphasis>不要</emphasis>使用 root 帳戶登陸或者將其作為個人帳號使用。"
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"為什麼呢？避免使用 root 特權帳戶的一個原因是，它很容易對系統造成無法挽回的破"
-"壞。另一個原因是，您有可能被惡意誘使執行<emphasis>特洛伊木馬</emphasis>程式 "
-"&mdash; 這是一種在您未知的情況下利用超級使用者權限損害系統安全的程式。任何合"
-"格的 Unix 系統管理書籍中都會涉及到這一主題 &mdash; 如果您不是很瞭解這方面的內"
-"容，建議您找一本書進行學習。"
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"您首先會被要求輸入使用者的全名。然後要求輸入使用者帳號名﹔通常為姓之類的即"
-"可，並且會成為預設值。最後，您將要求輸入該帳號的密碼。"
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"如果在安裝完畢後您還希望建立其它新帳戶，請使用 <command>adduser</command> 命"
-"令。"
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, fuzzy, no-c-format
 msgid "Installing Additional Software"
@@ -3879,12 +3880,12 @@ msgstr "選擇正確的分割區！"
 #: using-d-i.xml:2771
 #, fuzzy, no-c-format
 msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "選擇分割區的準則是格式化為 FAT 的檔案系統並有 <emphasis>boot</emphasis> 旗"
 "標。&d-i; 可能會顯示多個選擇，這取決於所有磁碟上被掃瞄到的分割區，包含 EFI 分"